diff options
9 files changed, 25 insertions, 25 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml index 9114424e470..70817f14da5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/arm64-macos.yaml @@ -1,7 +1,7 @@ --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: MacOSX CSD Version: '15E216' CPU: diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml index 3c0961eba07..680ad623361 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/regions-linux-map.yaml @@ -1,7 +1,7 @@ --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: Linux CSD Version: '15E216' CPU: diff --git a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp index 47cfd5bd273..99717e7fe34 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp +++ b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp @@ -173,7 +173,7 @@ ArchSpec MinidumpParser::GetArchitecture() { case ProcessorArchitecture::ARM: triple.setArch(llvm::Triple::ArchType::arm); break; - case ProcessorArchitecture::ARM64: + case ProcessorArchitecture::BP_ARM64: triple.setArch(llvm::Triple::ArchType::aarch64); break; default: diff --git a/lldb/test/Shell/Minidump/dump-all.test b/lldb/test/Shell/Minidump/dump-all.test index 92f2be24e17..507c1688bb8 100644 --- a/lldb/test/Shell/Minidump/dump-all.test +++ b/lldb/test/Shell/Minidump/dump-all.test @@ -57,7 +57,7 @@ --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: Linux CSD Version: '15E216' CPU: diff --git a/lldb/test/Shell/Minidump/fb-dump.test b/lldb/test/Shell/Minidump/fb-dump.test index 1cd777c6d71..319db2f3d36 100644 --- a/lldb/test/Shell/Minidump/fb-dump.test +++ b/lldb/test/Shell/Minidump/fb-dump.test @@ -61,7 +61,7 @@ --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: Linux CSD Version: '15E216' CPU: diff --git a/llvm/include/llvm/BinaryFormat/MinidumpConstants.def b/llvm/include/llvm/BinaryFormat/MinidumpConstants.def index aeef399af7a..c04a10d30d4 100644 --- a/llvm/include/llvm/BinaryFormat/MinidumpConstants.def +++ b/llvm/include/llvm/BinaryFormat/MinidumpConstants.def @@ -85,21 +85,21 @@ HANDLE_MDMP_STREAM_TYPE(0xFACECCCC, FacebookAppStateLog) HANDLE_MDMP_STREAM_TYPE(0xFACEDEAD, FacebookAbortReason) HANDLE_MDMP_STREAM_TYPE(0xFACEE000, FacebookThreadName) -HANDLE_MDMP_ARCH(0x0000, X86) // PROCESSOR_ARCHITECTURE_INTEL -HANDLE_MDMP_ARCH(0x0001, MIPS) // PROCESSOR_ARCHITECTURE_MIPS -HANDLE_MDMP_ARCH(0x0002, Alpha) // PROCESSOR_ARCHITECTURE_ALPHA -HANDLE_MDMP_ARCH(0x0003, PPC) // PROCESSOR_ARCHITECTURE_PPC -HANDLE_MDMP_ARCH(0x0004, SHX) // PROCESSOR_ARCHITECTURE_SHX (Super-H) -HANDLE_MDMP_ARCH(0x0005, ARM) // PROCESSOR_ARCHITECTURE_ARM -HANDLE_MDMP_ARCH(0x0006, IA64) // PROCESSOR_ARCHITECTURE_IA64 -HANDLE_MDMP_ARCH(0x0007, Alpha64) // PROCESSOR_ARCHITECTURE_ALPHA64 -HANDLE_MDMP_ARCH(0x0008, MSIL) // PROCESSOR_ARCHITECTURE_MSIL -HANDLE_MDMP_ARCH(0x0009, AMD64) // PROCESSOR_ARCHITECTURE_AMD64 -HANDLE_MDMP_ARCH(0x000a, X86Win64) // PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 -HANDLE_MDMP_ARCH(0x8001, SPARC) // Breakpad-defined value for SPARC -HANDLE_MDMP_ARCH(0x8002, PPC64) // Breakpad-defined value for PPC64 -HANDLE_MDMP_ARCH(0x8003, ARM64) // Breakpad-defined value for ARM64 -HANDLE_MDMP_ARCH(0x8004, MIPS64) // Breakpad-defined value for MIPS64 +HANDLE_MDMP_ARCH(0x0000, X86) // PROCESSOR_ARCHITECTURE_INTEL +HANDLE_MDMP_ARCH(0x0001, MIPS) // PROCESSOR_ARCHITECTURE_MIPS +HANDLE_MDMP_ARCH(0x0002, Alpha) // PROCESSOR_ARCHITECTURE_ALPHA +HANDLE_MDMP_ARCH(0x0003, PPC) // PROCESSOR_ARCHITECTURE_PPC +HANDLE_MDMP_ARCH(0x0004, SHX) // PROCESSOR_ARCHITECTURE_SHX (Super-H) +HANDLE_MDMP_ARCH(0x0005, ARM) // PROCESSOR_ARCHITECTURE_ARM +HANDLE_MDMP_ARCH(0x0006, IA64) // PROCESSOR_ARCHITECTURE_IA64 +HANDLE_MDMP_ARCH(0x0007, Alpha64) // PROCESSOR_ARCHITECTURE_ALPHA64 +HANDLE_MDMP_ARCH(0x0008, MSIL) // PROCESSOR_ARCHITECTURE_MSIL +HANDLE_MDMP_ARCH(0x0009, AMD64) // PROCESSOR_ARCHITECTURE_AMD64 +HANDLE_MDMP_ARCH(0x000a, X86Win64) // PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 +HANDLE_MDMP_ARCH(0x8001, BP_SPARC) // Breakpad-defined value for SPARC +HANDLE_MDMP_ARCH(0x8002, BP_PPC64) // Breakpad-defined value for PPC64 +HANDLE_MDMP_ARCH(0x8003, BP_ARM64) // Breakpad-defined value for ARM64 +HANDLE_MDMP_ARCH(0x8004, BP_MIPS64) // Breakpad-defined value for MIPS64 HANDLE_MDMP_PLATFORM(0x0000, Win32S) // Win32 on Windows 3.1 HANDLE_MDMP_PLATFORM(0x0001, Win32Windows) // Windows 95-98-Me diff --git a/llvm/lib/ObjectYAML/MinidumpYAML.cpp b/llvm/lib/ObjectYAML/MinidumpYAML.cpp index 21b2a4d7862..aa7382247a0 100644 --- a/llvm/lib/ObjectYAML/MinidumpYAML.cpp +++ b/llvm/lib/ObjectYAML/MinidumpYAML.cpp @@ -336,7 +336,7 @@ static void streamMapping(yaml::IO &IO, SystemInfoStream &Stream) { IO.mapOptional("CPU", Info.CPU.X86); break; case ProcessorArchitecture::ARM: - case ProcessorArchitecture::ARM64: + case ProcessorArchitecture::BP_ARM64: IO.mapOptional("CPU", Info.CPU.Arm); break; default: diff --git a/llvm/test/tools/obj2yaml/basic-minidump.yaml b/llvm/test/tools/obj2yaml/basic-minidump.yaml index 9797e1200e3..0ed887b5a81 100644 --- a/llvm/test/tools/obj2yaml/basic-minidump.yaml +++ b/llvm/test/tools/obj2yaml/basic-minidump.yaml @@ -3,7 +3,7 @@ --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: Linux CSD Version: Linux 3.13.0-91-generic CPU: @@ -92,7 +92,7 @@ Streams: # CHECK: --- !minidump # CHECK-NEXT: Streams: # CHECK-NEXT: - Type: SystemInfo -# CHECK-NEXT: Processor Arch: ARM64 +# CHECK-NEXT: Processor Arch: BP_ARM64 # CHECK-NEXT: Platform ID: Linux # CHECK-NEXT: CSD Version: Linux 3.13.0-91-generic # CHECK-NEXT: CPU: diff --git a/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp b/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp index a3c9e7ef18e..ca7fff13d0a 100644 --- a/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp +++ b/llvm/unittests/ObjectYAML/MinidumpYAMLTest.cpp @@ -33,7 +33,7 @@ TEST(MinidumpYAML, Basic) { --- !minidump Streams: - Type: SystemInfo - Processor Arch: ARM64 + Processor Arch: BP_ARM64 Platform ID: Linux CPU: CPUID: 0x05060708 @@ -53,7 +53,7 @@ Streams: auto ExpectedSysInfo = File.getSystemInfo(); ASSERT_THAT_EXPECTED(ExpectedSysInfo, Succeeded()); const SystemInfo &SysInfo = *ExpectedSysInfo; - EXPECT_EQ(ProcessorArchitecture::ARM64, SysInfo.ProcessorArch); + EXPECT_EQ(ProcessorArchitecture::BP_ARM64, SysInfo.ProcessorArch); EXPECT_EQ(OSPlatform::Linux, SysInfo.PlatformId); EXPECT_EQ(0x05060708u, SysInfo.CPU.Arm.CPUID); |
