wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-28 03:02:55 +03:00
Code Issues Projects Releases Wiki Activity

macho: add scalar.Hex mapper to addr fields

Browse Source
This commit is contained in:
siddik.acil 2022-01-05 22:34:45 +01:00
parent 90b94631bc
commit 333a3243f8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
format/macho/macho.go
View File

@ -251,7 +251,7 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
if archBits == 32 { if archBits == 32 {
d.FieldStruct("segment_command", func(d *decode.D) { d.FieldStruct("segment_command", func(d *decode.D) {
d.FieldRawLen("segname", 16*8) d.FieldRawLen("segname", 16*8)
d.FieldU32("vmaddr") d.FieldU32("vmaddr", scalar.Hex)
d.FieldU32("vmsize") d.FieldU32("vmsize")
d.FieldU32("fileoff") d.FieldU32("fileoff")
d.FieldU32("tfilesize") d.FieldU32("tfilesize")
@ -265,7 +265,7 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
d.FieldStrFn("segname", func(d *decode.D) string { d.FieldStrFn("segname", func(d *decode.D) string {
return string(d.BytesLen(16)) return string(d.BytesLen(16))
}) })
d.FieldU64("vmaddr") d.FieldU64("vmaddr", scalar.Hex)
d.FieldU64("vmsize") d.FieldU64("vmsize")
d.FieldU64("fileoff") d.FieldU64("fileoff")
d.FieldU64("tfilesize") d.FieldU64("tfilesize")
@ -287,10 +287,10 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
return string(d.BytesLen(16)) return string(d.BytesLen(16))
}) })
if archBits == 32 { if archBits == 32 {
d.FieldU32("address") d.FieldU32("address", scalar.Hex)
d.FieldU32("size") d.FieldU32("size")
} else { } else {
d.FieldU64("address") d.FieldU64("address", scalar.Hex)
d.FieldU64("size") d.FieldU64("size")
} }
d.FieldU32("offset") d.FieldU32("offset")
@ -338,7 +338,7 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
// better visualization needed for this specific for major architectures // better visualization needed for this specific for major architectures
case LC_ROUTINES, LC_ROUTINES_64: case LC_ROUTINES, LC_ROUTINES_64:
if archBits == 32 { if archBits == 32 {
d.FieldU32("init_address") d.FieldU32("init_address", scalar.Hex)
d.FieldU32("init_module") d.FieldU32("init_module")
d.FieldU32("reserved1", d.BitBufIsZero()) d.FieldU32("reserved1", d.BitBufIsZero())
d.FieldU32("reserved2", d.BitBufIsZero()) d.FieldU32("reserved2", d.BitBufIsZero())
@ -347,7 +347,7 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
d.FieldU32("reserved5", d.BitBufIsZero()) d.FieldU32("reserved5", d.BitBufIsZero())
d.FieldU32("reserved6", d.BitBufIsZero()) d.FieldU32("reserved6", d.BitBufIsZero())
} else { } else {
d.FieldU64("init_address") d.FieldU64("init_address", scalar.Hex)
d.FieldU64("init_module") d.FieldU64("init_module")
d.FieldU64("reserved1", d.BitBufIsZero()) d.FieldU64("reserved1", d.BitBufIsZero())
d.FieldU64("reserved2", d.BitBufIsZero()) d.FieldU64("reserved2", d.BitBufIsZero())
@ -463,7 +463,7 @@ func machoDecode(d *decode.D, in interface{}) interface{} {
d.FieldStruct("fvmlib", func(d *decode.D) { d.FieldStruct("fvmlib", func(d *decode.D) {
offset := d.FieldU32("offset") offset := d.FieldU32("offset")
d.FieldU32("minor_version") d.FieldU32("minor_version")
d.FieldU32("header_addr") d.FieldU32("header_addr", scalar.Hex)
d.FieldUTF8NullFixedLen("name", int(cmdsize)-int(offset)) d.FieldUTF8NullFixedLen("name", int(cmdsize)-int(offset))
}) })
default: default: