[llvm] r308665 - [COFF, ARM64, CodeView] Add support to emit CodeView debug info for ARM64 COFF
Mandeep Singh Grang via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 20 13:20:01 PDT 2017
Author: mgrang
Date: Thu Jul 20 13:20:00 2017
New Revision: 308665
URL: http://llvm.org/viewvc/llvm-project?rev=308665&view=rev
Log:
[COFF, ARM64, CodeView] Add support to emit CodeView debug info for ARM64 COFF
Reviewers: compnerd, ruiu, rnk, zturner
Reviewed By: rnk
Subscribers: majnemer, aemerson, aprantl, javed.absar, kristof.beyls, llvm-commits
Differential Revision: https://reviews.llvm.org/D35518
Added:
llvm/trunk/test/MC/AArch64/coff-debug.ll
Modified:
llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h
llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
llvm/trunk/lib/Target/AArch64/AArch64RegisterInfo.cpp
llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h
llvm/trunk/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/CodeView/CodeView.h Thu Jul 20 13:20:00 2017
@@ -124,6 +124,7 @@ enum class CPUType : uint16_t {
ARM_XMAC = 0x66,
ARM_WMMX = 0x67,
ARM7 = 0x68,
+ ARM64 = 0x69,
Omni = 0x70,
Ia64 = 0x80,
Ia64_2 = 0x81,
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp Thu Jul 20 13:20:00 2017
@@ -611,6 +611,8 @@ static CPUType mapArchToCVCPUType(Triple
return CPUType::X64;
case Triple::ArchType::thumb:
return CPUType::Thumb;
+ case Triple::ArchType::aarch64:
+ return CPUType::ARM64;
default:
report_fatal_error("target architecture doesn't map to a CodeView "
"CPUType");
Modified: llvm/trunk/lib/Target/AArch64/AArch64RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64RegisterInfo.cpp?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64RegisterInfo.cpp Thu Jul 20 13:20:00 2017
@@ -35,7 +35,9 @@ using namespace llvm;
#include "AArch64GenRegisterInfo.inc"
AArch64RegisterInfo::AArch64RegisterInfo(const Triple &TT)
- : AArch64GenRegisterInfo(AArch64::LR), TT(TT) {}
+ : AArch64GenRegisterInfo(AArch64::LR), TT(TT) {
+ AArch64_MC::initLLVMToCVRegMapping(this);
+}
const MCPhysReg *
AArch64RegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp Thu Jul 20 13:20:00 2017
@@ -106,4 +106,6 @@ AArch64MCAsmInfoCOFF::AArch64MCAsmInfoCO
PrivateGlobalPrefix = ".L";
PrivateLabelPrefix = ".L";
AlignmentIsInBytes = false;
+ SupportsDebugInformation = true;
+ ExceptionsType = ExceptionHandling::WinEH;
}
Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp Thu Jul 20 13:20:00 2017
@@ -49,9 +49,18 @@ createAArch64MCSubtargetInfo(const Tripl
return createAArch64MCSubtargetInfoImpl(TT, CPU, FS);
}
+void AArch64_MC::initLLVMToCVRegMapping(MCRegisterInfo *MRI) {
+ for (unsigned Reg = AArch64::NoRegister + 1;
+ Reg < AArch64::NUM_TARGET_REGS; ++Reg) {
+ unsigned CV = MRI->getEncodingValue(Reg);
+ MRI->mapLLVMRegToCVReg(Reg, CV);
+ }
+}
+
static MCRegisterInfo *createAArch64MCRegisterInfo(const Triple &Triple) {
MCRegisterInfo *X = new MCRegisterInfo();
InitAArch64MCRegisterInfo(X, AArch64::LR);
+ AArch64_MC::initLLVMToCVRegMapping(X);
return X;
}
Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h (original)
+++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.h Thu Jul 20 13:20:00 2017
@@ -70,6 +70,10 @@ MCTargetStreamer *createAArch64AsmTarget
MCTargetStreamer *createAArch64ObjectTargetStreamer(MCStreamer &S,
const MCSubtargetInfo &STI);
+namespace AArch64_MC {
+void initLLVMToCVRegMapping(MCRegisterInfo *MRI);
+}
+
} // End llvm namespace
// Defines symbolic names for AArch64 registers. This defines a mapping from
Added: llvm/trunk/test/MC/AArch64/coff-debug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AArch64/coff-debug.ll?rev=308665&view=auto
==============================================================================
--- llvm/trunk/test/MC/AArch64/coff-debug.ll (added)
+++ llvm/trunk/test/MC/AArch64/coff-debug.ll Thu Jul 20 13:20:00 2017
@@ -0,0 +1,134 @@
+; RUN: llc -mtriple=aarch64-windows -filetype=obj -o - %s | \
+; RUN: llvm-readobj -codeview - | FileCheck %s
+
+; ModuleID = 'a.c'
+source_filename = "a.c"
+target datalayout = "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128"
+target triple = "aarch64--windows-msvc18.0.0"
+
+; Function Attrs: noinline nounwind optnone
+define i32 @main() #0 !dbg !7 {
+entry:
+ %retval = alloca i32, align 4
+ store i32 0, i32* %retval, align 4
+ ret i32 1, !dbg !11
+}
+
+attributes #0 = { noinline nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="generic" "target-features"="+neon" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!1 = !DIFile(filename: "a.c", directory: "/", checksumkind: CSK_MD5, checksum: "")
+!2 = !{}
+!3 = !{i32 2, !"CodeView", i32 1}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 2}
+!6 = !{!"clang"}
+!7 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: false, unit: !0, variables: !2)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !DILocation(line: 2, column: 3, scope: !7)
+
+; CHECK: Format: COFF-ARM64
+; CHECK: Arch: aarch64
+; CHECK: AddressSize: 64bit
+; CHECK: CodeViewTypes [
+; CHECK: Section: .debug$T (5)
+; CHECK: Magic: 0x4
+; CHECK: ArgList (0x1000) {
+; CHECK: TypeLeafKind: LF_ARGLIST (0x1201)
+; CHECK: NumArgs: 0
+; CHECK: Arguments [
+; CHECK: ]
+; CHECK: }
+; CHECK: Procedure (0x1001) {
+; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
+; CHECK: ReturnType: int (0x74)
+; CHECK: CallingConvention: NearC (0x0)
+; CHECK: FunctionOptions [ (0x0)
+; CHECK: ]
+; CHECK: NumParameters: 0
+; CHECK: ArgListType: () (0x1000)
+; CHECK: }
+; CHECK: FuncId (0x1002) {
+; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
+; CHECK: ParentScope: 0x0
+; CHECK: FunctionType: int () (0x1001)
+; CHECK: Name: main
+; CHECK: }
+; CHECK: ]
+; CHECK: CodeViewDebugInfo [
+; CHECK: Section: .debug$S (4)
+; CHECK: Magic: 0x4
+; CHECK: Subsection [
+; CHECK: SubSectionType: Symbols (0xF1)
+; CHECK: Compile3Sym {
+; CHECK: Kind: S_COMPILE3 (0x113C)
+; CHECK: Language: C (0x0)
+; CHECK: Flags [ (0x0)
+; CHECK: ]
+; CHECK: }
+; CHECK: ]
+; CHECK: Subsection [
+; CHECK: SubSectionType: Symbols (0xF1)
+; CHECK: GlobalProcIdSym {
+; CHECK: Kind: S_GPROC32_ID (0x1147)
+; CHECK: PtrParent: 0x0
+; CHECK: PtrEnd: 0x0
+; CHECK: PtrNext: 0x0
+; CHECK: CodeSize: 0x14
+; CHECK: DbgStart: 0x0
+; CHECK: DbgEnd: 0x0
+; CHECK: FunctionType: main (0x1002)
+; CHECK: CodeOffset: main+0x0
+; CHECK: Segment: 0x0
+; CHECK: Flags [ (0x0)
+; CHECK: ]
+; CHECK: DisplayName: main
+; CHECK: LinkageName: main
+; CHECK: }
+; CHECK: ProcEnd {
+; CHECK: Kind: S_PROC_ID_END (0x114F)
+; CHECK: }
+; CHECK: ]
+; CHECK: Subsection [
+; CHECK: SubSectionType: Lines (0xF2)
+; CHECK: LinkageName: main
+; CHECK: ]
+; CHECK: Subsection [
+; CHECK: SubSectionType: FileChecksums (0xF4)
+; CHECK: FileChecksum {
+; CHECK: ChecksumSize: 0x0
+; CHECK: ChecksumKind: None (0x0)
+; CHECK: ChecksumBytes: ()
+; CHECK: }
+; CHECK: ]
+; CHECK: Subsection [
+; CHECK: SubSectionType: StringTable (0xF3)
+; CHECK: ]
+; CHECK: FunctionLineTable [
+; CHECK: LinkageName: main
+; CHECK: Flags: 0x1
+; CHECK: CodeSize: 0x14
+; CHECK: FilenameSegment [
+; CHECK: +0x0 [
+; CHECK: LineNumberStart: 1
+; CHECK: LineNumberEndDelta: 0
+; CHECK: IsStatement: No
+; CHECK: ColStart: 0
+; CHECK: ColEnd: 0
+; CHECK: ]
+; CHECK: +0x8 [
+; CHECK: LineNumberStart: 2
+; CHECK: LineNumberEndDelta: 0
+; CHECK: IsStatement: No
+; CHECK: ColStart: 3
+; CHECK: ColEnd: 0
+; CHECK: ]
+; CHECK: ]
+; CHECK: ]
+; CHECK: ]
Modified: llvm/trunk/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/MinimalSymbolDumper.cpp?rev=308665&r1=308664&r2=308665&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbutil/MinimalSymbolDumper.cpp (original)
+++ llvm/trunk/tools/llvm-pdbutil/MinimalSymbolDumper.cpp Thu Jul 20 13:20:00 2017
@@ -269,6 +269,7 @@ static std::string formatMachineType(CPU
RETURN_CASE(CPUType, ARM_XMAC, "arm xmac");
RETURN_CASE(CPUType, ARM_WMMX, "arm wmmx");
RETURN_CASE(CPUType, ARM7, "arm 7");
+ RETURN_CASE(CPUType, ARM64, "arm64");
RETURN_CASE(CPUType, Omni, "omni");
RETURN_CASE(CPUType, Ia64, "intel itanium ia64");
RETURN_CASE(CPUType, Ia64_2, "intel itanium ia64 2");
More information about the llvm-commits
mailing list