[llvm] r357945 - [BinaryFormat] Update Mach-O ARM64E CPU subtype and dumping

[Shoaib Meenai via llvm-commits]

Author: smeenai
Date: Mon Apr  8 14:37:08 2019
New Revision: 357945

URL: http://llvm.org/viewvc/llvm-project?rev=357945&view=rev
Log:
[BinaryFormat] Update Mach-O ARM64E CPU subtype and dumping

The new value is taken from <mach/machine.h> in the MacOSX10.14 SDK from
Xcode 10.1. Update llvm-objdump and llvm-readobj accordingly.

Differential Revision: https://reviews.llvm.org/D58636

Added:
    llvm/trunk/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml
    llvm/trunk/test/tools/llvm-objdump/AArch64/macho-arm64e.test
Modified:
    llvm/trunk/include/llvm/BinaryFormat/MachO.h
    llvm/trunk/tools/llvm-objdump/MachODump.cpp
    llvm/trunk/tools/llvm-readobj/MachODumper.cpp

Modified: llvm/trunk/include/llvm/BinaryFormat/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/MachO.h?rev=357945&r1=357944&r2=357945&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BinaryFormat/MachO.h (original)
+++ llvm/trunk/include/llvm/BinaryFormat/MachO.h Mon Apr  8 14:37:08 2019
@@ -1477,7 +1477,10 @@ enum CPUSubTypeARM {
   CPU_SUBTYPE_ARM_V7EM = 16
 };
 
-enum CPUSubTypeARM64 { CPU_SUBTYPE_ARM64_ALL = 0 };
+enum CPUSubTypeARM64 {
+  CPU_SUBTYPE_ARM64_ALL = 0,
+  CPU_SUBTYPE_ARM64E = 2,
+};
 
 enum CPUSubTypeSPARC { CPU_SUBTYPE_SPARC_ALL = 0 };
 

Added: llvm/trunk/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml?rev=357945&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml (added)
+++ llvm/trunk/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml Mon Apr  8 14:37:08 2019
@@ -0,0 +1,11 @@
+--- !mach-o
+FileHeader:
+  magic:           0xFEEDFACF
+  cputype:         0x0100000C
+  cpusubtype:      0x00000002
+  filetype:        0x00000001
+  ncmds:           0
+  sizeofcmds:      0
+  flags:           0x00000000
+  reserved:        0x00000000
+...

Added: llvm/trunk/test/tools/llvm-objdump/AArch64/macho-arm64e.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/AArch64/macho-arm64e.test?rev=357945&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/AArch64/macho-arm64e.test (added)
+++ llvm/trunk/test/tools/llvm-objdump/AArch64/macho-arm64e.test Mon Apr  8 14:37:08 2019
@@ -0,0 +1,6 @@
+// RUN: yaml2obj %p/Inputs/arm64e.macho.yaml -o %tarm64e.o
+// RUN: llvm-objdump -p %tarm64e.o | FileCheck -strict-whitespace %s
+
+CHECK:      Mach header
+CHECK-NEXT:       magic cputype cpusubtype  caps    filetype ncmds sizeofcmds      flags
+CHECK-NEXT: MH_MAGIC_64   ARM64          E  0x00      OBJECT     0          0 0x00000000

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=357945&r1=357944&r2=357945&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Mon Apr  8 14:37:08 2019
@@ -2009,6 +2009,10 @@ static void printCPUType(uint32_t cputyp
       outs() << "    cputype CPU_TYPE_ARM64\n";
       outs() << "    cpusubtype CPU_SUBTYPE_ARM64_ALL\n";
       break;
+    case MachO::CPU_SUBTYPE_ARM64E:
+      outs() << "    cputype CPU_TYPE_ARM64\n";
+      outs() << "    cpusubtype CPU_SUBTYPE_ARM64E\n";
+      break;
     default:
       printUnknownCPUType(cputype, cpusubtype);
       break;
@@ -8084,6 +8088,9 @@ static void PrintMachHeader(uint32_t mag
       case MachO::CPU_SUBTYPE_ARM64_ALL:
         outs() << "        ALL";
         break;
+      case MachO::CPU_SUBTYPE_ARM64E:
+        outs() << "          E";
+        break;
       default:
         outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
         break;

Modified: llvm/trunk/tools/llvm-readobj/MachODumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/MachODumper.cpp?rev=357945&r1=357944&r2=357945&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/MachODumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/MachODumper.cpp Mon Apr  8 14:37:08 2019
@@ -162,6 +162,7 @@ static const EnumEntry<uint32_t> MachOHe
 
 static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64[] = {
   LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL),
+  LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E),
 };
 
 static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesSPARC[] = {