From: Nick Clifton Date: Fri, 10 Mar 2017 10:50:34 +0000 (+0000) Subject: Add basic recognition of new EM_ ELF machine numbers. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55e22ca83ae50d6fe422cd0542f2a1a5934b2dd2;p=binutils-gdb.git Add basic recognition of new EM_ ELF machine numbers. include * elf/common.h (EM_LANAI): New machine number. (EM_BPF): Likewise. (EM_WEBASSEMBLY): Likewise. Move low value, deprecated, numbers to their numerical equivalents. binutils * readelf.c (get_machine_name): Rearrange switch table in order of increasing machine number. Add missing entries. --- diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 56ca002105f..1abde2a3097 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2017-03-10 Nick Clifton + + * readelf.c (get_machine_name): Rearrange switch table in order of + increasing machine number. Add missing entries. + 2017-03-08 H.J. Lu PR binutils/21231 diff --git a/binutils/readelf.c b/binutils/readelf.c index bf5185a2060..a10ba19b5bb 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -2205,11 +2205,11 @@ get_machine_name (unsigned e_machine) switch (e_machine) { + /* Please keep this switch table sorted by increasing EM_ value. */ + /* 0 */ case EM_NONE: return _("None"); - case EM_AARCH64: return "AArch64"; case EM_M32: return "WE32100"; case EM_SPARC: return "Sparc"; - case EM_SPU: return "SPU"; case EM_386: return "Intel 80386"; case EM_68K: return "MC68000"; case EM_88K: return "MC88000"; @@ -2217,61 +2217,50 @@ get_machine_name (unsigned e_machine) case EM_860: return "Intel 80860"; case EM_MIPS: return "MIPS R3000"; case EM_S370: return "IBM System/370"; + /* 10 */ case EM_MIPS_RS3_LE: return "MIPS R4000 big-endian"; case EM_OLD_SPARCV9: return "Sparc v9 (old)"; case EM_PARISC: return "HPPA"; - case EM_PPC_OLD: return "Power PC (old)"; + case EM_VPP550: return "Fujitsu VPP500"; case EM_SPARC32PLUS: return "Sparc v8+" ; case EM_960: return "Intel 90860"; case EM_PPC: return "PowerPC"; + /* 20 */ case EM_PPC64: return "PowerPC64"; + case EM_S390_OLD: + case EM_S390: return "IBM S/390"; + case EM_SPU: return "SPU"; + /* 30 */ + case EM_V800: return "Renesas V850 (using RH850 ABI)"; case EM_FR20: return "Fujitsu FR20"; - case EM_FT32: return "FTDI FT32"; case EM_RH32: return "TRW RH32"; case EM_MCORE: return "MCORE"; + /* 40 */ case EM_ARM: return "ARM"; case EM_OLD_ALPHA: return "Digital Alpha (old)"; case EM_SH: return "Renesas / SuperH SH"; case EM_SPARCV9: return "Sparc v9"; case EM_TRICORE: return "Siemens Tricore"; case EM_ARC: return "ARC"; - case EM_ARC_COMPACT: return "ARCompact"; - case EM_ARC_COMPACT2: return "ARCv2"; case EM_H8_300: return "Renesas H8/300"; case EM_H8_300H: return "Renesas H8/300H"; case EM_H8S: return "Renesas H8S"; case EM_H8_500: return "Renesas H8/500"; + /* 50 */ case EM_IA_64: return "Intel IA-64"; case EM_MIPS_X: return "Stanford MIPS-X"; case EM_COLDFIRE: return "Motorola Coldfire"; - case EM_ALPHA: return "Alpha"; - case EM_CYGNUS_D10V: - case EM_D10V: return "d10v"; - case EM_CYGNUS_D30V: - case EM_D30V: return "d30v"; - case EM_CYGNUS_M32R: - case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; - case EM_CYGNUS_V850: - case EM_V800: return "Renesas V850 (using RH850 ABI)"; - case EM_V850: return "Renesas V850"; - case EM_CYGNUS_MN10300: - case EM_MN10300: return "mn10300"; - case EM_CYGNUS_MN10200: - case EM_MN10200: return "mn10200"; - case EM_MOXIE: return "Moxie"; - case EM_CYGNUS_FR30: - case EM_FR30: return "Fujitsu FR30"; - case EM_CYGNUS_FRV: return "Fujitsu FR-V"; - case EM_PJ_OLD: - case EM_PJ: return "picoJava"; + case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; case EM_MMA: return "Fujitsu Multimedia Accelerator"; case EM_PCP: return "Siemens PCP"; case EM_NCPU: return "Sony nCPU embedded RISC processor"; case EM_NDR1: return "Denso NDR1 microprocesspr"; case EM_STARCORE: return "Motorola Star*Core processor"; case EM_ME16: return "Toyota ME16 processor"; + /* 60 */ case EM_ST100: return "STMicroelectronics ST100 processor"; case EM_TINYJ: return "Advanced Logic Corp. TinyJ embedded processor"; + case EM_X86_64: return "Advanced Micro Devices X86-64"; case EM_PDSP: return "Sony DSP processor"; case EM_PDP10: return "Digital Equipment Corp. PDP-10"; case EM_PDP11: return "Digital Equipment Corp. PDP-11"; @@ -2279,75 +2268,89 @@ get_machine_name (unsigned e_machine) case EM_ST9PLUS: return "STMicroelectronics ST9+ 8/16 bit microcontroller"; case EM_ST7: return "STMicroelectronics ST7 8-bit microcontroller"; case EM_68HC16: return "Motorola MC68HC16 Microcontroller"; - case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; + /* 70 */ case EM_68HC11: return "Motorola MC68HC11 Microcontroller"; case EM_68HC08: return "Motorola MC68HC08 Microcontroller"; case EM_68HC05: return "Motorola MC68HC05 Microcontroller"; case EM_SVX: return "Silicon Graphics SVx"; case EM_ST19: return "STMicroelectronics ST19 8-bit microcontroller"; case EM_VAX: return "Digital VAX"; - case EM_VISIUM: return "CDS VISIUMcore processor"; - case EM_AVR_OLD: - case EM_AVR: return "Atmel AVR 8-bit microcontroller"; case EM_CRIS: return "Axis Communications 32-bit embedded processor"; case EM_JAVELIN: return "Infineon Technologies 32-bit embedded cpu"; case EM_FIREPATH: return "Element 14 64-bit DSP processor"; case EM_ZSP: return "LSI Logic's 16-bit DSP processor"; + /* 80 */ case EM_MMIX: return "Donald Knuth's educational 64-bit processor"; case EM_HUANY: return "Harvard Universitys's machine-independent object format"; case EM_PRISM: return "Vitesse Prism"; - case EM_X86_64: return "Advanced Micro Devices X86-64"; - case EM_L1OM: return "Intel L1OM"; - case EM_K1OM: return "Intel K1OM"; - case EM_S390_OLD: - case EM_S390: return "IBM S/390"; - case EM_SCORE: return "SUNPLUS S+Core"; - case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; + case EM_AVR_OLD: + case EM_AVR: return "Atmel AVR 8-bit microcontroller"; + case EM_CYGNUS_FR30: + case EM_FR30: return "Fujitsu FR30"; + case EM_CYGNUS_D10V: + case EM_D10V: return "d10v"; + case EM_CYGNUS_D30V: + case EM_D30V: return "d30v"; + case EM_CYGNUS_V850: + case EM_V850: return "Renesas V850"; + case EM_CYGNUS_M32R: + case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; + case EM_CYGNUS_MN10300: + case EM_MN10300: return "mn10300"; + /* 90 */ + case EM_CYGNUS_MN10200: + case EM_MN10200: return "mn10200"; + case EM_PJ: return "picoJava"; case EM_OR1K: return "OpenRISC 1000"; - case EM_CRX: return "National Semiconductor CRX microprocessor"; - case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; - case EM_DLX: return "OpenDLX"; - case EM_IP2K_OLD: - case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; - case EM_IQ2000: return "Vitesse IQ2000"; + case EM_ARC_COMPACT: return "ARCompact"; case EM_XTENSA_OLD: case EM_XTENSA: return "Tensilica Xtensa Processor"; case EM_VIDEOCORE: return "Alphamosaic VideoCore processor"; case EM_TMM_GPP: return "Thompson Multimedia General Purpose Processor"; case EM_NS32K: return "National Semiconductor 32000 series"; case EM_TPC: return "Tenor Network TPC processor"; - case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_SNP1K: return "Trebia SNP 1000 processor"; + /* 100 */ + case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_IP2K_OLD: + case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; case EM_MAX: return "MAX Processor"; case EM_CR: return "National Semiconductor CompactRISC"; case EM_F2MC16: return "Fujitsu F2MC16"; case EM_MSP430: return "Texas Instruments msp430 microcontroller"; - case EM_LATTICEMICO32: return "Lattice Mico32"; - case EM_M32C_OLD: - case EM_M32C: return "Renesas M32c"; - case EM_MT: return "Morpho Techologies MT processor"; case EM_BLACKFIN: return "Analog Devices Blackfin"; case EM_SE_C33: return "S1C33 Family of Seiko Epson processors"; case EM_SEP: return "Sharp embedded microprocessor"; case EM_ARCA: return "Arca RISC microprocessor"; + /* 110 */ case EM_UNICORE: return "Unicore"; case EM_EXCESS: return "eXcess 16/32/64-bit configurable embedded CPU"; case EM_DXP: return "Icera Semiconductor Inc. Deep Execution Processor"; - case EM_NIOS32: return "Altera Nios"; case EM_ALTERA_NIOS2: return "Altera Nios II"; + case EM_CRX: return "National Semiconductor CRX microprocessor"; + case EM_XGATE: return "Motorola XGATE embedded processor"; case EM_C166: case EM_XC16X: return "Infineon Technologies xc16x"; case EM_M16C: return "Renesas M16C series microprocessors"; case EM_DSPIC30F: return "Microchip Technology dsPIC30F Digital Signal Controller"; case EM_CE: return "Freescale Communication Engine RISC core"; + /* 120 */ + case EM_M32C: return "Renesas M32c"; + /* 130 */ case EM_TSK3000: return "Altium TSK3000 core"; case EM_RS08: return "Freescale RS08 embedded processor"; case EM_ECOG2: return "Cyan Technology eCOG2 microprocessor"; + case EM_SCORE: return "SUNPLUS S+Core"; case EM_DSP24: return "New Japan Radio (NJR) 24-bit DSP Processor"; case EM_VIDEOCORE3: return "Broadcom VideoCore III processor"; + case EM_LATTICEMICO32: return "Lattice Mico32"; case EM_SE_C17: return "Seiko Epson C17 family"; + /* 140 */ case EM_TI_C6000: return "Texas Instruments TMS320C6000 DSP family"; case EM_TI_C2000: return "Texas Instruments TMS320C2000 DSP family"; case EM_TI_C5500: return "Texas Instruments TMS320C55x DSP family"; + case EM_TI_PRU: return "TI PRU I/O processor"; + /* 160 */ case EM_MMDSP_PLUS: return "STMicroelectronics 64bit VLIW Data Signal Processor"; case EM_CYPRESS_M8C: return "Cypress M8C microprocessor"; case EM_R32C: return "Renesas R32C series microprocessors"; @@ -2358,38 +2361,47 @@ get_machine_name (unsigned e_machine) case EM_NDS32: return "Andes Technology compact code size embedded RISC processor family"; case EM_ECOG1X: return "Cyan Technology eCOG1X family"; case EM_MAXQ30: return "Dallas Semiconductor MAXQ30 Core microcontrollers"; + /* 170 */ case EM_XIMO16: return "New Japan Radio (NJR) 16-bit DSP Processor"; case EM_MANIK: return "M2000 Reconfigurable RISC Microprocessor"; case EM_CRAYNV2: return "Cray Inc. NV2 vector architecture"; - case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; - case EM_CR16: - case EM_MICROBLAZE: - case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; - case EM_RISCV: return "RISC-V"; - case EM_RL78: return "Renesas RL78"; case EM_RX: return "Renesas RX"; case EM_METAG: return "Imagination Technologies Meta processor architecture"; case EM_MCST_ELBRUS: return "MCST Elbrus general purpose hardware architecture"; case EM_ECOG16: return "Cyan Technology eCOG16 family"; + case EM_CR16: + case EM_MICROBLAZE: + case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; case EM_ETPU: return "Freescale Extended Time Processing Unit"; case EM_SLE9X: return "Infineon Technologies SLE9X core"; - case EM_AVR32: return "Atmel Corporation 32-bit microprocessor family"; + /* 180 */ + case EM_L1OM: return "Intel L1OM"; + case EM_K1OM: return "Intel K1OM"; + case EM_INTEL182: return "Intel (reserved)"; + case EM_AARCH64: return "AArch64"; + case EM_ARM184: return "ARM (reserved)"; + case EM_AVR32: return "Atmel Corporation 32-bit microprocessor"; case EM_STM8: return "STMicroeletronics STM8 8-bit microcontroller"; case EM_TILE64: return "Tilera TILE64 multicore architecture family"; case EM_TILEPRO: return "Tilera TILEPro multicore architecture family"; - case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; + /* 190 */ case EM_CUDA: return "NVIDIA CUDA architecture"; - case EM_XGATE: return "Motorola XGATE embedded processor"; + case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; case EM_CLOUDSHIELD: return "CloudShield architecture family"; case EM_COREA_1ST: return "KIPO-KAIST Core-A 1st generation processor family"; case EM_COREA_2ND: return "KIPO-KAIST Core-A 2nd generation processor family"; + case EM_ARC_COMPACT2: return "ARCv2"; case EM_OPEN8: return "Open8 8-bit RISC soft processor core"; + case EM_RL78: return "Renesas RL78"; case EM_VIDEOCORE5: return "Broadcom VideoCore V processor"; + case EM_78K0R: return "Renesas 78K0R"; + /* 200 */ case EM_56800EX: return "Freescale 56800EX Digital Signal Controller (DSC)"; case EM_BA1: return "Beyond BA1 CPU architecture"; case EM_BA2: return "Beyond BA2 CPU architecture"; case EM_XCORE: return "XMOS xCORE processor family"; case EM_MCHP_PIC: return "Microchip 8-bit PIC(r) family"; + /* 210 */ case EM_KM32: return "KM211 KM32 32-bit processor"; case EM_KMX32: return "KM211 KMX32 32-bit processor"; case EM_KMX16: return "KM211 KMX16 16-bit processor"; @@ -2400,9 +2412,29 @@ get_machine_name (unsigned e_machine) case EM_COOL: return "Bluechip Systems CoolEngine"; case EM_NORC: return "Nanoradio Optimized RISC"; case EM_CSR_KALIMBA: return "CSR Kalimba architecture family"; + /* 220 */ case EM_Z80: return "Zilog Z80"; - case EM_AMDGPU: return "AMD GPU architecture"; - case EM_TI_PRU: return "TI PRU I/O processor"; + case EM_VISIUM: return "CDS VISIUMcore processor"; + case EM_FT32: return "FTDI Chip FT32"; + case EM_MOXIE: return "Moxie"; + case EM_AMDGPU: return "AMD GPU"; + case EM_RISCV: return "RISC-V"; + case EM_LANAI: return "Lanai 32-bit processor"; + case EM_BPF: return "Linux BPF"; + + /* Large numbers... */ + case EM_MT: return "Morpho Techologies MT processor"; + case EM_ALPHA: return "Alpha"; + case EM_WEBASSEMBLY: return "Web Assembly"; + case EM_DLX: return "OpenDLX"; + case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; + case EM_IQ2000: return "Vitesse IQ2000"; + case EM_M32C_OLD: + case EM_NIOS32: return "Altera Nios"; + case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; + case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; + case EM_CYGNUS_FRV: return "Fujitsu FR-V"; + default: snprintf (buff, sizeof (buff), _(": 0x%x"), e_machine); return buff; diff --git a/include/ChangeLog b/include/ChangeLog index 2cdad3f57fb..3b61930bfe1 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,11 @@ +2017-03-10 Nick Clifton + + * elf/common.h (EM_LANAI): New machine number. + (EM_BPF): Likewise. + (EM_WEBASSEMBLY): Likewise. + Move low value, deprecated, numbers to their numerical + equivalents. + 2017-03-08 H.J. Lu PR binutils/21231 diff --git a/include/elf/common.h b/include/elf/common.h index f45c256fe9c..8888a556132 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -112,13 +112,15 @@ #define EM_860 7 /* Intel 80860 */ #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ #define EM_S370 9 /* IBM System/370 */ -#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian (Oct 4 1999 Draft) Deprecated */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian (Oct 4 1999 Draft). Deprecated. */ +#define EM_OLD_SPARCV9 11 /* Old version of Sparc v9, from before the ABI. Deprecated. */ #define EM_res011 11 /* Reserved */ #define EM_res012 12 /* Reserved */ #define EM_res013 13 /* Reserved */ #define EM_res014 14 /* Reserved */ #define EM_PARISC 15 /* HPPA */ #define EM_res016 16 /* Reserved */ +#define EM_PPC_OLD 17 /* Old version of PowerPC. Deprecated. */ #define EM_VPP550 17 /* Fujitsu VPP500 */ #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ #define EM_960 19 /* Intel 80960 */ @@ -198,10 +200,12 @@ #define EM_OR1K 92 /* OpenRISC 1000 32-bit embedded processor */ #define EM_ARC_COMPACT 93 /* ARC International ARCompact processor */ #define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ +#define EM_SCORE_OLD 95 /* Old Sunplus S+core7 backend magic number. Written in the absence of an ABI. */ #define EM_VIDEOCORE 95 /* Alphamosaic VideoCore processor */ #define EM_TMM_GPP 96 /* Thompson Multimedia General Purpose Processor */ #define EM_NS32K 97 /* National Semiconductor 32000 series */ #define EM_TPC 98 /* Tenor Network TPC processor */ +#define EM_PJ_OLD 99 /* Old value for picoJava. Deprecated. */ #define EM_SNP1K 99 /* Trebia SNP 1000 processor */ #define EM_ST200 100 /* STMicroelectronics ST200 microcontroller */ #define EM_IP2K 101 /* Ubicom IP2022 micro controller */ @@ -218,6 +222,7 @@ #define EM_DXP 112 /* Icera Semiconductor Inc. Deep Execution Processor */ #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ #define EM_CRX 114 /* National Semiconductor CRX */ +#define EM_CR16_OLD 115 /* Old, value for National Semiconductor CompactRISC. Deprecated. */ #define EM_XGATE 115 /* Motorola XGATE embedded processor */ #define EM_C166 116 /* Infineon C16x/XC16x processor */ #define EM_M16C 117 /* Renesas M16C series microprocessors */ @@ -331,6 +336,8 @@ #define EM_MOXIE 223 /* Moxie processor family */ #define EM_AMDGPU 224 /* AMD GPU architecture */ #define EM_RISCV 243 /* RISC-V */ +#define EM_LANAI 244 /* Lanai 32-bit processor. */ +#define EM_BPF 247 /* Linux BPF – in-kernel virtual machine. */ /* If it is necessary to assign new unofficial EM_* values, please pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision @@ -344,19 +351,6 @@ unofficial e_machine number should eventually ask registry@sco.com for an officially blessed number to be added to the list above. */ -/* Old version of Sparc v9, from before the ABI; - This should be removed shortly. */ -#define EM_OLD_SPARCV9 11 - -/* Old version of PowerPC, this should be removed shortly. */ -#define EM_PPC_OLD 17 - -/* picoJava */ -#define EM_PJ_OLD 99 - -/* Old, unofficial value for National Semiconductor CompactRISC - CR16 */ -#define EM_CR16_OLD 115 - /* AVR magic number. Written in the absense of an ABI. */ #define EM_AVR_OLD 0x1057 @@ -369,6 +363,9 @@ /* FR30 magic number - no EABI available. */ #define EM_CYGNUS_FR30 0x3330 +/* Unofficial value for Web Assembly binaries, as used by LLVM. */ +#define EM_WEBASSEMBLY 0x4157 + /* DLX magic number. Written in the absense of an ABI. */ #define EM_DLX 0x5aa5 @@ -426,12 +423,9 @@ /* Old, unofficial value for Moxie. */ #define EM_MOXIE_OLD 0xFEED -/* Old Sunplus S+core7 backend magic number. Written in the absence of an ABI. */ -#define EM_SCORE_OLD 95 - #define EM_MICROBLAZE_OLD 0xbaab /* Old MicroBlaze */ -#define EM_ADAPTEVA_EPIPHANY 0x1223 /* Adapteva's Epiphany architecture. */ +#define EM_ADAPTEVA_EPIPHANY 0x1223 /* Adapteva's Epiphany architecture. */ /* Old constant that might be in use by some software. */ #define EM_OPENRISC EM_OR1K