This is an archive of the discontinued LLVM Phabricator instance.

Differential D67951

[LLDB] Add tests for PECOFF arm architecture identification
ClosedPublic

Authored by mstorsjo on Sep 24 2019, 2:24 AM.

Details

Reviewers
labath
compnerd
amccarth
hhb
Commits
rG544c8f48c86c: [LLDB] Add tests for PECOFF arm architecture identification
rL372741: [LLDB] Add tests for PECOFF arm architecture identification
rLLDB372741: [LLDB] Add tests for PECOFF arm architecture identification
Summary

Add a test case for the change from SVN r372657, and for the preexisting ARM identification.

Add a missing ArchDefinitionEntry for PECOFF/arm64, and tweak the ArmNt case to set the architecture to armv7 (ArmNt never ran on anything lower than that). (This avoids a case where ArchSpec::MergeFrom would override the arch from arm to armv7 and ArchSpec::CoreUpdated would reset the OS to unknown at the same time.)

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 24 2019, 2:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 24 2019, 2:24 AM
Herald added subscribers: JDevlieghere, abidh, kristof.beyls. · View Herald Transcript
labath accepted this revision.Sep 24 2019, 4:47 AM
This revision is now accepted and ready to land.Sep 24 2019, 4:47 AM
Closed by commit rL372741: [LLDB] Add tests for PECOFF arm architecture identification (authored by mstorsjo). · Explain WhySep 24 2019, 5:20 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 24 2019, 5:20 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
lit/
Modules/
PECOFF/
86 lines
86 lines
source/
Plugins/
ObjectFile/
PECOFF/
2 lines
Utility/
4 lines

Diff 221487

lldb/lit/Modules/PECOFF/basic-info-arm.yaml

  • This file was added.
# RUN: yaml2obj %s > %t
# RUN: lldb-test object-file %t | FileCheck %s
# CHECK: Plugin name: pe-coff
# CHECK: Architecture: armv7-pc-windows-msvc
# CHECK: UUID:
# CHECK: Executable: true
# CHECK: Stripped: false
# CHECK: Type: executable
# CHECK: Strata: user
# CHECK: Base VM address: 0x40000
--- !COFF
OptionalHeader:
AddressOfEntryPoint: 4097
ImageBase: 4194304
SectionAlignment: 4096
FileAlignment: 512
MajorOperatingSystemVersion: 6
MinorOperatingSystemVersion: 0
MajorImageVersion: 0
MinorImageVersion: 0
MajorSubsystemVersion: 6
MinorSubsystemVersion: 0
Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ]
SizeOfStackReserve: 1048576
SizeOfStackCommit: 4096
SizeOfHeapReserve: 1048576
SizeOfHeapCommit: 4096
ExportTable:
RelativeVirtualAddress: 0
Size: 0
ImportTable:
RelativeVirtualAddress: 0
Size: 0
ResourceTable:
RelativeVirtualAddress: 0
Size: 0
ExceptionTable:
RelativeVirtualAddress: 0
Size: 0
CertificateTable:
RelativeVirtualAddress: 0
Size: 0
BaseRelocationTable:
RelativeVirtualAddress: 0
Size: 0
Debug:
RelativeVirtualAddress: 0
Size: 0
Architecture:
RelativeVirtualAddress: 0
Size: 0
GlobalPtr:
RelativeVirtualAddress: 0
Size: 0
TlsTable:
RelativeVirtualAddress: 0
Size: 0
LoadConfigTable:
RelativeVirtualAddress: 0
Size: 0
BoundImport:
RelativeVirtualAddress: 0
Size: 0
IAT:
RelativeVirtualAddress: 0
Size: 0
DelayImportDescriptor:
RelativeVirtualAddress: 0
Size: 0
ClrRuntimeHeader:
RelativeVirtualAddress: 0
Size: 0
header:
Machine: IMAGE_FILE_MACHINE_ARMNT
Characteristics: [ IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_32BIT_MACHINE ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
VirtualAddress: 4096
VirtualSize: 2
SectionData: '7047'
symbols: []
...

lldb/lit/Modules/PECOFF/basic-info-arm64.yaml

  • This file was added.
# RUN: yaml2obj %s > %t
# RUN: lldb-test object-file %t | FileCheck %s
# CHECK: Plugin name: pe-coff
# CHECK: Architecture: aarch64-unknown-windows-msvc
# CHECK: UUID:
# CHECK: Executable: true
# CHECK: Stripped: false
# CHECK: Type: executable
# CHECK: Strata: user
# CHECK: Base VM address: 0x40000000
--- !COFF
OptionalHeader:
AddressOfEntryPoint: 4096
ImageBase: 1073741824
SectionAlignment: 4096
FileAlignment: 512
MajorOperatingSystemVersion: 6
MinorOperatingSystemVersion: 0
MajorImageVersion: 0
MinorImageVersion: 0
MajorSubsystemVersion: 6
MinorSubsystemVersion: 0
Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ]
SizeOfStackReserve: 1048576
SizeOfStackCommit: 4096
SizeOfHeapReserve: 1048576
SizeOfHeapCommit: 4096
ExportTable:
RelativeVirtualAddress: 0
Size: 0
ImportTable:
RelativeVirtualAddress: 0
Size: 0
ResourceTable:
RelativeVirtualAddress: 0
Size: 0
ExceptionTable:
RelativeVirtualAddress: 0
Size: 0
CertificateTable:
RelativeVirtualAddress: 0
Size: 0
BaseRelocationTable:
RelativeVirtualAddress: 0
Size: 0
Debug:
RelativeVirtualAddress: 0
Size: 0
Architecture:
RelativeVirtualAddress: 0
Size: 0
GlobalPtr:
RelativeVirtualAddress: 0
Size: 0
TlsTable:
RelativeVirtualAddress: 0
Size: 0
LoadConfigTable:
RelativeVirtualAddress: 0
Size: 0
BoundImport:
RelativeVirtualAddress: 0
Size: 0
IAT:
RelativeVirtualAddress: 0
Size: 0
DelayImportDescriptor:
RelativeVirtualAddress: 0
Size: 0
ClrRuntimeHeader:
RelativeVirtualAddress: 0
Size: 0
header:
Machine: IMAGE_FILE_MACHINE_ARM64
Characteristics: [ IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_LARGE_ADDRESS_AWARE ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
VirtualAddress: 4096
VirtualSize: 4
SectionData: C0035FD6
symbols: []
...

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp

Show First 20 Lines • Show All 189 Lines • ▼ Show 20 Lines case MachineAmd64:
break; break;
case MachineX86: case MachineX86:
spec.SetTriple("i386-pc-windows"); spec.SetTriple("i386-pc-windows");
specs.Append(module_spec); specs.Append(module_spec);
spec.SetTriple("i686-pc-windows"); spec.SetTriple("i686-pc-windows");
specs.Append(module_spec); specs.Append(module_spec);
break; break;
case MachineArmNt: case MachineArmNt:
spec.SetTriple("arm-pc-windows"); spec.SetTriple("armv7-pc-windows");
specs.Append(module_spec); specs.Append(module_spec);
break; break;
case MachineArm64: case MachineArm64:
spec.SetTriple("aarch64-unknown-windows"); spec.SetTriple("aarch64-unknown-windows");
specs.Append(module_spec); specs.Append(module_spec);
break; break;
default: default:
break; break;
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines

lldb/source/Utility/ArchSpec.cpp

Show First 20 Lines • Show All 453 Lines • ▼ Show 20 Linesstatic const ArchDefinitionEntry g_coff_arch_entries[] = {
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // PowerPC (with FPU) LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // PowerPC (with FPU)
{ArchSpec::eCore_arm_generic, llvm::COFF::IMAGE_FILE_MACHINE_ARM, {ArchSpec::eCore_arm_generic, llvm::COFF::IMAGE_FILE_MACHINE_ARM,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARM LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARM
{ArchSpec::eCore_arm_armv7, llvm::COFF::IMAGE_FILE_MACHINE_ARMNT, {ArchSpec::eCore_arm_armv7, llvm::COFF::IMAGE_FILE_MACHINE_ARMNT,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARMv7 LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARMv7
{ArchSpec::eCore_thumb, llvm::COFF::IMAGE_FILE_MACHINE_THUMB, {ArchSpec::eCore_thumb, llvm::COFF::IMAGE_FILE_MACHINE_THUMB,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARMv7 LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARMv7
{ArchSpec::eCore_x86_64_x86_64, llvm::COFF::IMAGE_FILE_MACHINE_AMD64, {ArchSpec::eCore_x86_64_x86_64, llvm::COFF::IMAGE_FILE_MACHINE_AMD64,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu} // AMD64 LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // AMD64
{ArchSpec::eCore_arm_arm64, llvm::COFF::IMAGE_FILE_MACHINE_ARM64,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu} // ARM64
}; };
static const ArchDefinition g_coff_arch_def = { static const ArchDefinition g_coff_arch_def = {
eArchTypeCOFF, eArchTypeCOFF,
llvm::array_lengthof(g_coff_arch_entries), llvm::array_lengthof(g_coff_arch_entries),
g_coff_arch_entries, g_coff_arch_entries,
"pe-coff", "pe-coff",
}; };
▲ Show 20 Lines • Show All 981 Lines • Show Last 20 Lines