diff options
| author | Nick Clifton <nickc@redhat.com> | 2023-05-30 11:42:16 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2023-05-30 11:42:16 +0100 |
| commit | 7b9e7db08340cb3934a5fa95503fda523e0917b7 (patch) | |
| tree | 52cce984a47b6ebff13357e16af422ddb38a3a78 /binutils | |
| parent | 796029320e75a141570220224731c8151311f8d9 (diff) | |
| download | fsf-binutils-gdb-7b9e7db08340cb3934a5fa95503fda523e0917b7.zip fsf-binutils-gdb-7b9e7db08340cb3934a5fa95503fda523e0917b7.tar.gz fsf-binutils-gdb-7b9e7db08340cb3934a5fa95503fda523e0917b7.tar.bz2 | |
Add support for an ARMMAGIC value of 0xa00 to the PE dumper.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/od-pe.c | 22 |
2 files changed, 21 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b041050..8831631 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2023-05-30 Nick Clifton <nickc@redhat.com> + + * od-pe.c (decode_machine_number): Add ARMMAGIC value of 0xa00. + (is_pe_object_magic): Likewise. + 2023-05-26 Nick Clifton <nickc@redhat.com> * od-pe.c: New file: Dumps fields in PE format headers. diff --git a/binutils/od-pe.c b/binutils/od-pe.c index 5a57a6e..28a64ff 100644 --- a/binutils/od-pe.c +++ b/binutils/od-pe.c @@ -202,15 +202,21 @@ decode_machine_number (unsigned int machine) case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARM64: return "ARM64"; + case IMAGE_FILE_MACHINE_ARMNT: return "ARM NT"; case IMAGE_FILE_MACHINE_I386: return "I386"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_LOONGARCH64: return "LOONGARCH64"; case IMAGE_FILE_MACHINE_POWERPC: return "POWERPC"; + + /* Note - when adding numbers here, also add them to + is_pe_object_magic() below. */ + case 0x0093: return "TI C4X"; case 0x0500: return "SH (big endian)"; case 0x0550: return "SH (little endian)"; + case 0x0a00: return "ARM"; case 0x0b00: return "MCore"; - case 0x0093: return "TI C4X"; // FIXME: Add more machine numbers. + default: return N_("unknown"); } } @@ -448,22 +454,26 @@ is_pe_object_magic (unsigned short magic) switch (magic) { case IMAGE_FILE_MACHINE_ALPHA: - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_AMD64: case IMAGE_FILE_MACHINE_ARM64: + case IMAGE_FILE_MACHINE_ARM: case IMAGE_FILE_MACHINE_ARMNT: case IMAGE_FILE_MACHINE_I386: case IMAGE_FILE_MACHINE_IA64: - case IMAGE_FILE_MACHINE_POWERPC: case IMAGE_FILE_MACHINE_LOONGARCH64: - case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_POWERPC: // FIXME: Add more machine numbers. return true; - case 0x0a00: /* ARMMAGIC */ + + /* Note - when adding numbers here, also add them to + decode_machine_number() above. */ + case 0x0093: /* TI C4x */ case 0x0500: /* SH_ARCH_MAGIC_BIG */ case 0x0550: /* SH_ARCH_MAGIC_LITTLE */ + case 0x0a00: /* ARMMAGIC */ case 0x0b00: /* MCore */ - case 0x0093: /* TI C4x */ return true; + default: return false; } |