6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-14 16:33:28 +00:00
Code Issues Projects Releases Wiki Activity

s/DebugLoc.CompileUnit/DebugLoc.Scope/g

Browse Source 
s/DebugLoc.InlinedLoc/DebugLoc.InlinedAtLoc/g



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84054 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2009-10-13 23:28:53 +00:00
parent 228ebd0f4c
commit 1619dc3b9e
8 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/llvm/Support/DebugLoc.h
View File

@ -24,19 +24,19 @@ namespace llvm {
/// DebugLocTuple - Debug location tuple of filename id, line and column.
///
struct DebugLocTuple {
MDNode *CompileUnit;
MDNode *InlinedLoc;
MDNode *Scope;
MDNode *InlinedAtLoc;
unsigned Line, Col;
DebugLocTuple()
: CompileUnit(0), InlinedLoc(0), Line(~0U), Col(~0U) {};
: Scope(0), InlinedAtLoc(0), Line(~0U), Col(~0U) {};
DebugLocTuple(MDNode *n, MDNode *i, unsigned l, unsigned c)
: CompileUnit(n), InlinedLoc(i), Line(l), Col(c) {};
: Scope(n), InlinedAtLoc(i), Line(l), Col(c) {};
bool operator==(const DebugLocTuple &DLT) const {
return CompileUnit == DLT.CompileUnit &&
InlinedLoc == DLT.InlinedLoc &&
return Scope == DLT.Scope &&
InlinedAtLoc == DLT.InlinedAtLoc &&
Line == DLT.Line && Col == DLT.Col;
}
bool operator!=(const DebugLocTuple &DLT) const {
@ -74,16 +74,16 @@ namespace llvm {
return DebugLocTuple((MDNode*)~1U, (MDNode*)~1U, ~1U, ~1U);
}
static unsigned getHashValue(const DebugLocTuple &Val) {
return DenseMapInfo<MDNode*>::getHashValue(Val.CompileUnit) ^
DenseMapInfo<MDNode*>::getHashValue(Val.InlinedLoc) ^
return DenseMapInfo<MDNode*>::getHashValue(Val.Scope) ^
DenseMapInfo<MDNode*>::getHashValue(Val.InlinedAtLoc) ^
DenseMapInfo<unsigned>::getHashValue(Val.Line) ^
DenseMapInfo<unsigned>::getHashValue(Val.Col);
}
static bool isEqual(const DebugLocTuple &LHS, const DebugLocTuple &RHS) {
return LHS.CompileUnit == RHS.CompileUnit &&
LHS.InlinedLoc == RHS.InlinedLoc &&
LHS.Line == RHS.Line &&
LHS.Col == RHS.Col;
return LHS.Scope == RHS.Scope &&
LHS.InlinedAtLoc == RHS.InlinedAtLoc &&
LHS.Line == RHS.Line &&
LHS.Col == RHS.Col;
}
static bool isPod() { return true; }

11
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -1362,9 +1362,9 @@ void AsmPrinter::processDebugLoc(const MachineInstr *MI,
if (!DL.isUnknown()) {
DebugLocTuple CurDLT = MF->getDebugLocTuple(DL);
if (BeforePrintingInsn) {
if (CurDLT.CompileUnit != 0 && PrevDLT != CurDLT) {
if (CurDLT.Scope != 0 && PrevDLT != CurDLT) {
unsigned L = DW->RecordSourceLine(CurDLT.Line, CurDLT.Col,
CurDLT.CompileUnit);
CurDLT.Scope);
printLabel(L);
#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
DW->SetDbgScopeBeginLabels(MI, L);
@ -1773,9 +1773,10 @@ void AsmPrinter::EmitComments(const MachineInstr &MI) const {
// Print source line info.
O.PadToColumn(MAI->getCommentColumn());
O << MAI->getCommentString() << " SrcLine ";
if (DLT.CompileUnit) {
DICompileUnit CU(DLT.CompileUnit);
O << CU.getFilename() << " ";
if (DLT.Scope) {
DICompileUnit CU(DLT.Scope);
if (!CU.isNull())
O << CU.getFilename() << " ";
}
O << DLT.Line;
if (DLT.Col != 0)

14
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -1842,14 +1842,14 @@ bool DwarfDebug::ExtractScopeInformation(MachineFunction *MF) {
if (DL.isUnknown())
continue;
DebugLocTuple DLT = MF->getDebugLocTuple(DL);
if (!DLT.CompileUnit)
if (!DLT.Scope)
continue;
// There is no need to create another DIE for compile unit. For all
// other scopes, create one DbgScope now. This will be translated
// into a scope DIE at the end.
DIDescriptor D(DLT.CompileUnit);
DIDescriptor D(DLT.Scope);
if (!D.isCompileUnit()) {
DbgScope *Scope = getDbgScope(DLT.CompileUnit, MInsn);
DbgScope *Scope = getDbgScope(DLT.Scope, MInsn);
Scope->setLastInsn(MInsn);
}
}
@ -1942,11 +1942,11 @@ void DwarfDebug::BeginFunction(MachineFunction *MF) {
if (!FDL.isUnknown()) {
DebugLocTuple DLT = MF->getDebugLocTuple(FDL);
unsigned LabelID = 0;
DISubprogram SP = getDISubprogram(DLT.CompileUnit);
DISubprogram SP = getDISubprogram(DLT.Scope);
if (!SP.isNull())
LabelID = RecordSourceLine(SP.getLineNumber(), 0, DLT.CompileUnit);
LabelID = RecordSourceLine(SP.getLineNumber(), 0, DLT.Scope);
else
LabelID = RecordSourceLine(DLT.Line, DLT.Col, DLT.CompileUnit);
LabelID = RecordSourceLine(DLT.Line, DLT.Col, DLT.Scope);
Asm->printLabel(LabelID);
O << '\n';
}
@ -1954,7 +1954,7 @@ void DwarfDebug::BeginFunction(MachineFunction *MF) {
DebugLoc FDL = MF->getDefaultDebugLoc();
if (!FDL.isUnknown()) {
DebugLocTuple DLT = MF->getDebugLocTuple(FDL);
unsigned LabelID = RecordSourceLine(DLT.Line, DLT.Col, DLT.CompileUnit);
unsigned LabelID = RecordSourceLine(DLT.Line, DLT.Col, DLT.Scope);
Asm->printLabel(LabelID);
O << '\n';
}

11
lib/CodeGen/MachineInstr.cpp
View File

@ -1082,11 +1082,12 @@ void MachineInstr::print(raw_ostream &OS, const TargetMachine *TM) const {
if (!debugLoc.isUnknown()) {
const MachineFunction *MF = getParent()->getParent();
DebugLocTuple DLT = MF->getDebugLocTuple(debugLoc);
DICompileUnit CU(DLT.CompileUnit);
OS << " [dbg: "
<< CU.getDirectory() << '/' << CU.getFilename() << ","
<< DLT.Line << ","
<< DLT.Col << "]";
DICompileUnit CU(DLT.Scope);
if (!CU.isNull())
OS << " [dbg: "
<< CU.getDirectory() << '/' << CU.getFilename() << ","
<< DLT.Line << ","
<< DLT.Col << "]";
}
OS << "\n";

7
lib/CodeGen/SelectionDAG/FastISel.cpp
View File

@ -385,10 +385,9 @@ bool FastISel::SelectCall(User *I) {
DebugLocTuple PrevLocTpl = MF.getDebugLocTuple(PrevLoc);
DISubprogram SP(FSI->getSubprogram());
unsigned LabelID = DW->RecordInlinedFnStart(SP,
DICompileUnit(PrevLocTpl.CompileUnit),
PrevLocTpl.Line,
PrevLocTpl.Col);
unsigned LabelID =
DW->RecordInlinedFnStart(SP,DICompileUnit(PrevLocTpl.Scope),
PrevLocTpl.Line, PrevLocTpl.Col);
const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL);
BuildMI(MBB, DL, II).addImm(LabelID);
return true;

2
lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
View File

@ -3910,7 +3910,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
return 0;
DebugLocTuple PrevLocTpl = MF.getDebugLocTuple(PrevLoc);
DISubprogram SP(FSI.getSubprogram());
DICompileUnit CU(PrevLocTpl.CompileUnit);
DICompileUnit CU(PrevLocTpl.Scope);
unsigned LabelID = DW->RecordInlinedFnStart(SP, CU,
PrevLocTpl.Line,
PrevLocTpl.Col);

2
lib/ExecutionEngine/JIT/JITEmitter.cpp
View File

@ -710,7 +710,7 @@ void JITEmitter::processDebugLoc(DebugLoc DL, bool BeforePrintingInsn) {
DebugLocTuple CurDLT = EmissionDetails.MF->getDebugLocTuple(DL);
if (BeforePrintingInsn) {
if (CurDLT.CompileUnit != 0 && PrevDLT != CurDLT) {
if (CurDLT.Scope != 0 && PrevDLT != CurDLT) {
JITEvent_EmittedFunctionDetails::LineStart NextLine;
NextLine.Address = getCurrentPCValue();
NextLine.Loc = DL;

2
lib/Target/PIC16/PIC16DebugInfo.cpp
View File

@ -258,7 +258,7 @@ void PIC16DbgInfo::ChangeDebugLoc(const MachineFunction &MF,
if (! EmitDebugDirectives) return;
assert (! DL.isUnknown() && "can't change to invalid debug loc");
MDNode *CU = MF.getDebugLocTuple(DL).CompileUnit;
MDNode *CU = MF.getDebugLocTuple(DL).Scope;
unsigned line = MF.getDebugLocTuple(DL).Line;
SwitchToCU(CU);