D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-14 11:53:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few fixes for debug

Browse Source
This commit is contained in:
Alexey Prokhin
2010-10-31 12:11:16 +03:00
parent d0c7a5a3cb
commit bca5491974
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gen/irstate.cpp
View File

@@ -68,10 +68,6 @@ IRState::IRState(llvm::Module* m)
mainFunc = 0;
ir.state = this;
asmBlock = NULL;
dwarfCUs = NULL;
dwarfSPs = NULL;
dwarfGVs = NULL;
}
IrFunction* IRState::func()

5
gen/irstate.h
View File

@@ -178,11 +178,6 @@ struct IRState
// 'used' array solely for keeping a reference to globals
std::vector<LLConstant*> usedArray;
// dwarf dbg stuff
LLGlobalVariable* dwarfCUs;
LLGlobalVariable* dwarfSPs;
LLGlobalVariable* dwarfGVs;
};
template <typename InputIterator>

24
gen/todebug.cpp
View File

@@ -50,15 +50,10 @@ static llvm::DIType dwarfTypeDescription(Type* type, llvm::DICompileUnit cu, con
llvm::DIFile DtoDwarfFile(Loc loc, llvm::DICompileUnit compileUnit)
{
llvm::StringRef path;
llvm::StringRef name;
llvm::StringRef dir;
if (loc.filename) {
path = llvm::StringRef(loc.filename);
name = llvm::StringRef(basename(loc.filename));
dir = path.substr(0, path.size() - name.size());
}
return gIR->difactory.CreateFile(name, dir, compileUnit);
typedef llvm::sys::Path LLPath;
LLPath path = loc.filename ? LLPath(loc.filename) : LLPath();
path.makeAbsolute();
return gIR->difactory.CreateFile(path.getLast(), path.getDirname(), compileUnit);
}
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -261,7 +256,7 @@ static llvm::DICompositeType dwarfCompositeType(Type* type, llvm::DICompileUnit
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), getTypeBitSize(T), false), // size in bits
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), getABITypeAlign(T)*8, false), // alignment in bits
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), 0, false), // offset in bits,
0, // flags
llvm::DIType::FlagFwdDecl, // flags
derivedFrom, // DerivedFrom
llvm::DIArray(0)
);
@@ -308,7 +303,7 @@ static llvm::DICompositeType dwarfCompositeType(Type* type, llvm::DICompileUnit
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), getTypeBitSize(T), false), // size in bits
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), getABITypeAlign(T)*8, false), // alignment in bits
LLConstantInt::get(LLType::getInt64Ty(gIR->context()), 0, false), // offset in bits,
0, // flags
llvm::DIType::FlagFwdDecl, // flags
derivedFrom, // DerivedFrom
elemsArray);
if (diCompositeType)
@@ -336,7 +331,7 @@ static llvm::DIGlobalVariable dwarfGlobalVariable(LLGlobalVariable* ll, VarDecla
vd->loc.linnum, // line num
dwarfTypeDescription_impl(vd->type, compileUnit, NULL), // type
vd->protection == PROTprivate, // is local to unit
getDefinedModule(vd) == gIR->dmodule, // is definition
true, // is definition
ll // value
);
}
@@ -453,7 +448,7 @@ llvm::DICompileUnit DtoDwarfCompileUnit(Module* m)
srcpath,
"LDC (http://www.dsource.org/projects/ldc)",
//FIXME: What do these two mean?
false, // isMain,
gIR->dmodule == m, // isMain,
false // isOptimized
);
@@ -550,8 +545,7 @@ void DtoDwarfStopPoint(unsigned ln)
{
Logger::println("D to dwarf stoppoint at line %u", ln);
LOG_SCOPE;
// TODO: possibly it is wrong.
llvm::DebugLoc loc = llvm::DebugLoc::get(ln, 0, DtoDwarfCompileUnit(gIR->dmodule));
llvm::DebugLoc loc = llvm::DebugLoc::get(ln, 0, gIR->func()->diSubprogram);
gIR->ir->SetCurrentDebugLocation(loc);
}