[AAP] (2) Add AAP ELF definitions

[edward-jones]

Summary

This adds ELF defines and relocation for the AAP backend. This builds on D23664.

[rengolin]

This looks good to me, but I'll let other people review and approve, since I was the only one on the thread. :)

[edward-jones]

Added ELFYaml, llvm-objdump and llvm-readobj. This also adds some tests for AAP ELF object files and relocations using the yaml representation.

[edward-jones]

Update the patch after rebasing against master

[majnemer]

include/llvm/Support/ELF.h

319–322

This looks copy+pasted, has such a request been made?
Also, you could make it 0x504141 as it would then be AAP :)

[edward-jones]

include/llvm/Support/ELF.h

319–322

The comment was copied, but a request has also been made.

[edward-jones]

Rolled forward to top of tree

[joerg]

test/Object/AAP/lit.local.cfg

2 ↗

(On Diff #78192)

This part is only needed until after the disassembler is added/used, there is currently nothing here that depends on the not-yet-existing target?

[edward-jones]

Incorporate Joerg's suggestions and roll forward to top of tree.

[edward-jones]

Updated to reflect latest changes to LLVM

include/llvm/Object/ELFObjectFile.h

case ELF::EM_RISCV:
       return "ELF32-riscv";
     case ELF::EM_SPARC:
     case ELF::EM_SPARC32PLUS:
       return "ELF32-sparc";
     case ELF::EM_WEBASSEMBLY:
       return "ELF32-wasm";
     case ELF::EM_AMDGPU:
       return "ELF32-amdgpu";
+    case ELF::EM_AAP:
+      return "ELF32-aap";
     default:
       return "ELF32-unknown";
     }
   case ELF::ELFCLASS64:
     switch (EF.getHeader()->e_machine) {
     case ELF::EM_386:
       return "ELF64-i386";
     case ELF::EM_X86_64:

 unsigned ELFObjectFile<ELFT>::getArch() const {
   bool IsLittleEndian = ELFT::TargetEndianness == support::little;
   switch (EF.getHeader()->e_machine) {
   case ELF::EM_386:
   case ELF::EM_IAMCU:
     return Triple::x86;
   case ELF::EM_X86_64:
     return Triple::x86_64;
+  case ELF::EM_AAP:
+    return Triple::aap;
   case ELF::EM_AARCH64:
     return IsLittleEndian ? Triple::aarch64 : Triple::aarch64_be;
   case ELF::EM_ARM:
     return Triple::arm;
   case ELF::EM_AVR:
     return Triple::avr;
   case ELF::EM_HEXAGON:
     return Triple::hexagon;

include/llvm/Support/ELF.h

enum {
   EM_RISCV = 243,         // RISC-V
   EM_LANAI = 244,         // Lanai 32-bit processor
   EM_BPF = 247,           // Linux kernel bpf virtual machine
 
   // A request has been made to the maintainer of the official registry for
   // such numbers for an official value for WebAssembly. As soon as one is
   // allocated, this enum will be updated to use it.
   EM_WEBASSEMBLY = 0x4157, // WebAssembly architecture
+
+  // A request has been made to the maintainer of the official registry for
+  // such numbers for an official value for AAP. As soon as one is allocated,
+  // this enum will be updated to use it.
+  EM_AAP = 0x5343 // AAP
 };
 
 // Object file classes.
 enum {
   ELFCLASSNONE = 0,
   ELFCLASS32 = 1, // 32-bit object file
   ELFCLASS64 = 2  // 64-bit object file
 };

 #include "ELFRelocs/AMDGPU.def"
 };
 
 // ELF Relocation types for BPF
 enum {
 #include "ELFRelocs/BPF.def"
 };
 
+// ELF Relocation type for AAP.
+enum {
+#include "ELFRelocs/AAP.def"
+};
+
 #undef ELF_RELOC
 
 // Section header.
 struct Elf32_Shdr {
   Elf32_Word sh_name;      // Section name (index into string table)
   Elf32_Word sh_type;      // Section type (SHT_*)
   Elf32_Word sh_flags;     // Section flags (SHF_*)
   Elf32_Addr sh_addr;      // Address where section is to be loaded

include/llvm/Support/ELFRelocs/AAP.def

+
+#ifndef ELF_RELOC
+#error "ELF_RELOC must be defined"
+#endif
+
+ELF_RELOC(R_AAP_NONE,       0x00)
+ELF_RELOC(R_AAP_8,          0x01)
+ELF_RELOC(R_AAP_16,         0x02)
+ELF_RELOC(R_AAP_32,         0x03)
+ELF_RELOC(R_AAP_64,         0x04)
+ELF_RELOC(R_AAP_BR16,       0x05)
+ELF_RELOC(R_AAP_BR32,       0x06)
+ELF_RELOC(R_AAP_BRCC16,     0x07)
+ELF_RELOC(R_AAP_BRCC32,     0x08)
+ELF_RELOC(R_AAP_BAL16,      0x09)
+ELF_RELOC(R_AAP_BAL32,      0x0a)
+ELF_RELOC(R_AAP_ABS6,       0x0b)
+ELF_RELOC(R_AAP_ABS9,       0x0c)
+ELF_RELOC(R_AAP_ABS10,      0x0d)
+ELF_RELOC(R_AAP_ABS12,      0x0e)
+ELF_RELOC(R_AAP_ABS16,      0x0f)
+ELF_RELOC(R_AAP_OFF10,      0x10)
+ELF_RELOC(R_AAP_SHIFT6,     0x11)

include/llvm/module.modulemap

module Support {
     // Exclude this; it's fundamentally non-modular.
     exclude header "Support/PluginLoader.h"
 
     // These are intended for textual inclusion.
     textual header "Support/ARMTargetParser.def"
     textual header "Support/AArch64TargetParser.def"
     textual header "Support/Dwarf.def"
     textual header "Support/MachO.def"
+    textual header "Support/ELFRelocs/AAP.def"
     textual header "Support/ELFRelocs/AArch64.def"
     textual header "Support/ELFRelocs/AMDGPU.def"
     textual header "Support/ELFRelocs/ARM.def"
     textual header "Support/ELFRelocs/AVR.def"
     textual header "Support/ELFRelocs/BPF.def"
     textual header "Support/ELFRelocs/Hexagon.def"
     textual header "Support/ELFRelocs/i386.def"
     textual header "Support/ELFRelocs/Lanai.def"

lib/Object/ELF.cpp

#include "llvm/Support/ELFRelocs/i386.def"
     break;
   case ELF::EM_MIPS:
     switch (Type) {
 #include "llvm/Support/ELFRelocs/Mips.def"
     default:
       break;
     }
     break;
+  case ELF::EM_AAP:
+    switch (Type) {
+#include "llvm/Support/ELFRelocs/AAP.def"
+    default:
+      break;
+    }
+    break;
   case ELF::EM_AARCH64:
     switch (Type) {
 #include "llvm/Support/ELFRelocs/AArch64.def"
     default:
       break;
     }
     break;
   case ELF::EM_ARM:

lib/ObjectYAML/ELFYAML.cpp

#define ECase(X) IO.enumCase(Value, #X, ELF::X)
   ECase(EM_RL78);
   ECase(EM_VIDEOCORE5);
   ECase(EM_78KOR);
   ECase(EM_56800EX);
   ECase(EM_AMDGPU);
   ECase(EM_RISCV);
   ECase(EM_LANAI);
   ECase(EM_BPF);
+  ECase(EM_AAP);
 #undef ECase
 }
 
 void ScalarEnumerationTraits<ELFYAML::ELF_ELFCLASS>::enumeration(
     IO &IO, ELFYAML::ELF_ELFCLASS &Value) {
 #define ECase(X) IO.enumCase(Value, #X, ELF::X)
   // Since the semantics of ELFCLASSNONE is "invalid", just don't accept it
   // here.

 #include "llvm/Support/ELFRelocs/ARM.def"
     break;
   case ELF::EM_RISCV:
 #include "llvm/Support/ELFRelocs/RISCV.def"
     break;
   case ELF::EM_LANAI:
 #include "llvm/Support/ELFRelocs/Lanai.def"
     break;
+  case ELF::EM_AAP:
+#include "llvm/Support/ELFRelocs/AAP.def"
+    break;
   case ELF::EM_AMDGPU:
 #include "llvm/Support/ELFRelocs/AMDGPU.def"
     break;
   case ELF::EM_BPF:
 #include "llvm/Support/ELFRelocs/BPF.def"
     break;
   default:
     llvm_unreachable("Unsupported architecture");

test/Object/AAP/elf32-aap-rel.yaml

+# RUN: yaml2obj %s > %t
+# RUN: llvm-readobj -r %t | FileCheck %s
+
+#CHECK:      Relocations [
+#CHECK-NEXT:   Section (2) .rela.text {
+#CHECK-NEXT:     0x0 R_AAP_NONE - 0x0
+#CHECK-NEXT:     0x4 R_AAP_8 - 0x0
+#CHECK-NEXT:     0x6 R_AAP_16 - 0x0
+#CHECK-NEXT:     0x8 R_AAP_32 - 0x0
+#CHECK-NEXT:     0xC R_AAP_64 - 0x0
+#CHECK-NEXT:     0x14 R_AAP_BR16 - 0x0
+#CHECK-NEXT:     0x16 R_AAP_BR32 - 0x0
+#CHECK-NEXT:     0x1A R_AAP_BRCC16 - 0x0
+#CHECK-NEXT:     0x1C R_AAP_BRCC32 - 0x0
+#CHECK-NEXT:     0x20 R_AAP_BAL16 - 0x0
+#CHECK-NEXT:     0x22 R_AAP_BAL32 - 0x0
+#CHECK-NEXT:     0x26 R_AAP_ABS6 - 0x0
+#CHECK-NEXT:     0x2A R_AAP_ABS9 - 0x0
+#CHECK-NEXT:     0x2E R_AAP_ABS10 - 0x0
+#CHECK-NEXT:     0x32 R_AAP_ABS12 - 0x0
+#CHECK-NEXT:     0x36 R_AAP_ABS16 - 0x0
+#CHECK-NEXT:     0x3A R_AAP_SHIFT6 - 0x0
+#CHECK-NEXT:     0x3E R_AAP_OFF10 - 0x0
+#CHECK-NEXT:     0x42 R_AAP_OFF10 - 0x0
+#CHECK_NEXT:   }
+#CHECK_NEXT: ]
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_AAP
+Sections:
+  - Type:            SHT_PROGBITS
+    Name:            .text
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x04
+    Content:         00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  - Type:            SHT_RELA
+    Name:            .rela.text
+    Link:            .symtab
+    Info:            .text
+    AddressAlign:    0x04
+    Relocations:
+      - Offset:          0
+        Symbol:          apple
+        Type:            R_AAP_NONE
+      - Offset:          4
+        Symbol:          banana
+        Type:            R_AAP_8
+      - Offset:          6
+        Symbol:          carrot
+        Type:            R_AAP_16
+      - Offset:          8
+        Symbol:          dandelion
+        Type:            R_AAP_32
+      - Offset:          12
+        Symbol:          egg
+        Type:            R_AAP_64
+      - Offset:          20
+        Symbol:          fruit
+        Type:            R_AAP_BR16
+      - Offset:          22
+        Symbol:          golf
+        Type:            R_AAP_BR32
+      - Offset:          26
+        Symbol:          hello
+        Type:            R_AAP_BRCC16
+      - Offset:          28
+        Symbol:          igloo
+        Type:            R_AAP_BRCC32
+      - Offset:          32
+        Symbol:          joke
+        Type:            R_AAP_BAL16
+      - Offset:          34
+        Symbol:          kennel
+        Type:            R_AAP_BAL32
+      - Offset:          38
+        Symbol:          lemon
+        Type:            R_AAP_ABS6
+      - Offset:          42
+        Symbol:          money
+        Type:            R_AAP_ABS9
+      - Offset:          46
+        Symbol:          octopus
+        Type:            R_AAP_ABS10
+      - Offset:          50
+        Symbol:          pterodactyl
+        Type:            R_AAP_ABS12
+      - Offset:          54
+        Symbol:          qwerty
+        Type:            R_AAP_ABS16
+      - Offset:          58
+        Symbol:          risk
+        Type:            R_AAP_SHIFT6
+      - Offset:          62
+        Symbol:          staple
+        Type:            R_AAP_OFF10
+      - Offset:          66
+        Symbol:          tunnel
+        Type:            R_AAP_OFF10
+Symbols:
+  Local:
+    - Name:            .text
+      Type:            STT_SECTION
+      Section:         .text
+
+  Global:
+    - Name:            main
+      Type:            STT_FUNC
+      Section:         .text
+      Size:            68

test/Object/AAP/elf32-aap.yaml

+# RUN: yaml2obj %s > %t.o
+# RUN: llvm-readobj -s -file-headers %t.o | FileCheck %s
+
+# CHECK: Format: ELF32-aap
+# CHECK: Arch: aap
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_AAP

tools/llvm-objdump/llvm-objdump.cpp

static std::error_code getRelocationValueString(const ELFObjectFile<ELFT> *Obj,
   }
   case ELF::EM_386:
   case ELF::EM_IAMCU:
   case ELF::EM_ARM:
   case ELF::EM_HEXAGON:
   case ELF::EM_MIPS:
   case ELF::EM_BPF:
   case ELF::EM_RISCV:
+  case ELF::EM_AAP:
     res = Target;
     break;
   case ELF::EM_WEBASSEMBLY:
     switch (type) {
     case ELF::R_WEBASSEMBLY_DATA: {
       std::string fmtbuf;
       raw_string_ostream fmt(fmtbuf);
       fmt << Target << (addend < 0 ? "" : "+") << addend;

tools/llvm-readobj/ELFDumper.cpp

static const EnumEntry<unsigned> ElfMachineType[] = {
   ENUM_ENT(EM_VIDEOCORE5,    "Broadcom VideoCore V processor"),
   ENUM_ENT(EM_78KOR,         "EM_78KOR"),
   ENUM_ENT(EM_56800EX,       "EM_56800EX"),
   ENUM_ENT(EM_AMDGPU,        "EM_AMDGPU"),
   ENUM_ENT(EM_RISCV,         "RISC-V"),
   ENUM_ENT(EM_WEBASSEMBLY,   "EM_WEBASSEMBLY"),
   ENUM_ENT(EM_LANAI,         "EM_LANAI"),
   ENUM_ENT(EM_BPF,           "EM_BPF"),
+  ENUM_ENT(EM_AAP,           "AAP"),
 };
 
 static const EnumEntry<unsigned> ElfSymbolBindings[] = {
     {"Local",  "LOCAL",  ELF::STB_LOCAL},
     {"Global", "GLOBAL", ELF::STB_GLOBAL},
     {"Weak",   "WEAK",   ELF::STB_WEAK},
     {"Unique", "UNIQUE", ELF::STB_GNU_UNIQUE}};