[llvm-readelf] Elf e_machine description fix for EM_CR16

[sperezglz]

Summary

The textual description for EM_CR16 machine type says "Xilinx MicroBlaze", this doesn't seem right and/or intentional. I created this patch to add the right description if desired.

[MaskRay]

Thanks!

[sperezglz]

@MaskRay I do not have commit access, I will need help, if possible, to get the patch committed. Thanks!

[sperezglz]

Adding a couple of reviewers more, also I want to point out that I do not have commit access. If reviews go well, kindly asking if someone could commit this on my behalf :) .

[MaskRay]

In D101133#2732265, @sperezglz wrote:

Adding a couple of reviewers more, also I want to point out that I do not have commit access. If reviews go well, kindly asking if someone could commit this on my behalf :) .

Can you provide your name and email so that we can attribute the contribution properly?

[sperezglz]

Author: Sergio Perez Gonzalez <[e-mail]>

Kind regards,
Sergio

llvm/include/llvm/BinaryFormat/ELF.h

enum {
   EM_SLE9X = 179,         // Infineon Technologies SLE9X core
   EM_L10M = 180,          // Intel L10M
   EM_K10M = 181,          // Intel K10M
   EM_AARCH64 = 183,       // ARM AArch64
   EM_AVR32 = 185,         // Atmel Corporation 32-bit microprocessor family
   EM_STM8 = 186,          // STMicroeletronics STM8 8-bit microcontroller
   EM_TILE64 = 187,        // Tilera TILE64 multicore architecture family
   EM_TILEPRO = 188,       // Tilera TILEPro multicore architecture family
+  EM_MICROBLAZE = 189,    // Xilinx MicroBlaze 32-bit RISC soft processor core
   EM_CUDA = 190,          // NVIDIA CUDA architecture
   EM_TILEGX = 191,        // Tilera TILE-Gx multicore architecture family
   EM_CLOUDSHIELD = 192,   // CloudShield architecture family
   EM_COREA_1ST = 193,     // KIPO-KAIST Core-A 1st generation processor family
   EM_COREA_2ND = 194,     // KIPO-KAIST Core-A 2nd generation processor family
   EM_ARC_COMPACT2 = 195,  // Synopsys ARCompact V2
   EM_OPEN8 = 196,         // Open8 8-bit RISC soft processor core
   EM_RL78 = 197,          // Renesas RL78 family

llvm/lib/ObjectYAML/ELFYAML.cpp

#define ECase(X) IO.enumCase(Value, #X, ELF::X)
   ECase(EM_SLE9X);
   ECase(EM_L10M);
   ECase(EM_K10M);
   ECase(EM_AARCH64);
   ECase(EM_AVR32);
   ECase(EM_STM8);
   ECase(EM_TILE64);
   ECase(EM_TILEPRO);
+  ECase(EM_MICROBLAZE);
   ECase(EM_CUDA);
   ECase(EM_TILEGX);
   ECase(EM_CLOUDSHIELD);
   ECase(EM_COREA_1ST);
   ECase(EM_COREA_2ND);
   ECase(EM_ARC_COMPACT2);
   ECase(EM_OPEN8);
   ECase(EM_RL78);

llvm/test/tools/llvm-readobj/ELF/file-header-machine-types.test

 
 # RUN: yaml2obj %s -o %t.mcst_elbrus.o -D MACHINE=EM_MCST_ELBRUS
 # RUN: llvm-readelf --file-headers %t.mcst_elbrus.o | FileCheck %s -DMACHINE="MCST Elbrus general purpose hardware architecture"
 
 # RUN: yaml2obj %s -o %t.ecog16.o -D MACHINE=EM_ECOG16
 # RUN: llvm-readelf --file-headers %t.ecog16.o | FileCheck %s -DMACHINE="Cyan Technology eCOG16 family"
 
 # RUN: yaml2obj %s -o %t.cr16.o -D MACHINE=EM_CR16
-# RUN: llvm-readelf --file-headers %t.cr16.o | FileCheck %s -DMACHINE="Xilinx MicroBlaze"
+# RUN: llvm-readelf --file-headers %t.cr16.o | FileCheck %s -DMACHINE="National Semiconductor CompactRISC 16-bit processor"
 
 # RUN: yaml2obj %s -o %t.etpu.o -D MACHINE=EM_ETPU
 # RUN: llvm-readelf --file-headers %t.etpu.o | FileCheck %s -DMACHINE="Freescale Extended Time Processing Unit"
 
 # RUN: yaml2obj %s -o %t.sle9x.o -D MACHINE=EM_SLE9X
 # RUN: llvm-readelf --file-headers %t.sle9x.o | FileCheck %s -DMACHINE="Infineon Technologies SLE9X core"
 
 # RUN: yaml2obj %s -o %t.l10m.o -D MACHINE=EM_L10M

 # RUN: llvm-readelf --file-headers %t.stm8.o | FileCheck %s -DMACHINE="STMicroeletronics STM8 8-bit microcontroller"
 
 # RUN: yaml2obj %s -o %t.tile64.o -D MACHINE=EM_TILE64
 # RUN: llvm-readelf --file-headers %t.tile64.o | FileCheck %s -DMACHINE="Tilera TILE64 multicore architecture family"
 
 # RUN: yaml2obj %s -o %t.tilepro.o -D MACHINE=EM_TILEPRO
 # RUN: llvm-readelf --file-headers %t.tilepro.o | FileCheck %s -DMACHINE="Tilera TILEPro multicore architecture family"
 
+# RUN: yaml2obj %s -o %t.microblaze.o -D MACHINE=EM_MICROBLAZE
+# RUN: llvm-readelf --file-headers %t.microblaze.o | FileCheck %s -DMACHINE="Xilinx MicroBlaze 32-bit RISC soft processor core"
+
 # RUN: yaml2obj %s -o %t.cuda.o -D MACHINE=EM_CUDA
 # RUN: llvm-readelf --file-headers %t.cuda.o | FileCheck %s -DMACHINE="NVIDIA CUDA architecture"
 
 # RUN: yaml2obj %s -o %t.tilegx.o -D MACHINE=EM_TILEGX
 # RUN: llvm-readelf --file-headers %t.tilegx.o | FileCheck %s -DMACHINE="Tilera TILE-Gx multicore architecture family"
 
 # RUN: yaml2obj %s -o %t.cloudshield.o -D MACHINE=EM_CLOUDSHIELD
 # RUN: llvm-readelf --file-headers %t.cloudshield.o | FileCheck %s -DMACHINE="EM_CLOUDSHIELD"

llvm/tools/llvm-readobj/ELFDumper.cpp

 };
 
 static const EnumEntry<unsigned> C6000ElfOSABI[] = {
   {"C6000_ELFABI", "Bare-metal C6000", ELF::ELFOSABI_C6000_ELFABI},
   {"C6000_LINUX",  "Linux C6000",      ELF::ELFOSABI_C6000_LINUX}
 };
 
 static const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_NONE,          "None"),
   ENUM_ENT(EM_M32,           "WE32100"),
   ENUM_ENT(EM_SPARC,         "Sparc"),
   ENUM_ENT(EM_386,           "Intel 80386"),
   ENUM_ENT(EM_68K,           "MC68000"),
   ENUM_ENT(EM_88K,           "MC88000"),
   ENUM_ENT(EM_IAMCU,         "EM_IAMCU"),
   ENUM_ENT(EM_860,           "Intel 80860"),
   ENUM_ENT(EM_MIPS,          "MIPS R3000"),
static const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_MAXQ30,        "Dallas Semiconductor MAXQ30 Core microcontrollers"),
   ENUM_ENT(EM_XIMO16,        "New Japan Radio (NJR) 16-bit DSP Processor"),
   ENUM_ENT(EM_MANIK,         "M2000 Reconfigurable RISC Microprocessor"),
   ENUM_ENT(EM_CRAYNV2,       "Cray Inc. NV2 vector architecture"),
   ENUM_ENT(EM_RX,            "Renesas RX"),
   ENUM_ENT(EM_METAG,         "Imagination Technologies Meta processor architecture"),
   ENUM_ENT(EM_MCST_ELBRUS,   "MCST Elbrus general purpose hardware architecture"),
   ENUM_ENT(EM_ECOG16,        "Cyan Technology eCOG16 family"),
-  ENUM_ENT(EM_CR16,          "Xilinx MicroBlaze"),
+  ENUM_ENT(EM_CR16,          "National Semiconductor CompactRISC 16-bit processor"),
   ENUM_ENT(EM_ETPU,          "Freescale Extended Time Processing Unit"),
   ENUM_ENT(EM_SLE9X,         "Infineon Technologies SLE9X core"),
   ENUM_ENT(EM_L10M,          "EM_L10M"),
   ENUM_ENT(EM_K10M,          "EM_K10M"),
   ENUM_ENT(EM_AARCH64,       "AArch64"),
   ENUM_ENT(EM_AVR32,         "Atmel Corporation 32-bit microprocessor family"),
   ENUM_ENT(EM_STM8,          "STMicroeletronics STM8 8-bit microcontroller"),
   ENUM_ENT(EM_TILE64,        "Tilera TILE64 multicore architecture family"),
   ENUM_ENT(EM_TILEPRO,       "Tilera TILEPro multicore architecture family"),
+  ENUM_ENT(EM_MICROBLAZE,    "Xilinx MicroBlaze 32-bit RISC soft processor core"),
   ENUM_ENT(EM_CUDA,          "NVIDIA CUDA architecture"),
   ENUM_ENT(EM_TILEGX,        "Tilera TILE-Gx multicore architecture family"),
   ENUM_ENT(EM_CLOUDSHIELD,   "EM_CLOUDSHIELD"),
   ENUM_ENT(EM_COREA_1ST,     "EM_COREA_1ST"),
   ENUM_ENT(EM_COREA_2ND,     "EM_COREA_2ND"),
   ENUM_ENT(EM_ARC_COMPACT2,  "EM_ARC_COMPACT2"),
   ENUM_ENT(EM_OPEN8,         "EM_OPEN8"),
   ENUM_ENT(EM_RL78,          "Renesas RL78"),