github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-19 06:06:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: PDB debugger support for global variables

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7592 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-08-19 06:27:43 +00:00
parent 6fc91d3fd6
commit 181fef1168
5 changed files with 59 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/ide/Debuggers/Data.cpp
View file

@ -116,6 +116,7 @@ void Pdb::Autos()
VectorMap<String, Value> prev = DataMap(autos);
autos.Clear();
CParser p(autotext);
TryAuto("this", prev);
while(!p.IsEof())
if(p.IsId()) {
String exp = p.ReadId();
@ -126,6 +127,9 @@ void Pdb::Autos()
else
if(p.Char2('-', '>') && p.IsId())
exp << "->";
else
if(p.Char2(':', ':') && p.IsId())
exp << "::";
else
break;
exp << p.ReadId();
@ -135,7 +139,6 @@ void Pdb::Autos()
else
p.SkipTerm();
autos.Sort();
// MarkChanged(prev, autos);
}
void Pdb::Watches()

1
uppsrc/ide/Debuggers/Debug.cpp
View file

@ -101,7 +101,6 @@ void Pdb::LoadModuleInfo()
bool Pdb::AddBp(adr_t address)
{
LLOG("AddBp: " << Hex(address));
LLOG("AddBp: " << Hex((adr_t)(LPVOID) address));
if(bp_set.Find(address) >= 0)
return true;
byte prev;

25
uppsrc/ide/Debuggers/Exp.cpp
View file

@ -323,11 +323,26 @@ Pdb::Val Pdb::Term(CParser& p)
if(q >= 0)
return f.param[q];
q = f.local.Find("this");
if(q >= 0)
return Field(DeRef(f.local[q]), id);
Val v = GetGlobal(f.fn.name, id);
if(v.address)
return v;
if(q >= 0) {
Val v = Field0(DeRef(f.local[q]), id);
if(!IsNull(v.type))
return v;
}
String scope = f.fn.name;
do {
String n = id;
int q = scope.ReverseFind("::");
if(q >= 0) {
scope.Trim(q);
n = scope + "::" + id;
}
else
scope.Clear();
Val v = GetGlobal(n);
if(v.address)
return v;
}
while(scope.GetCount());
}
ThrowError("\'" + id + "\' undefined");
return Val();

14
uppsrc/ide/Debuggers/Pdb.h
View file

@ -37,10 +37,10 @@ struct Pdb : Debugger, ParentCtrl {
int line;
adr_t address;
operator bool() const { return !IsNull(path); }
operator bool() const { return !IsNull(path); }
FilePos() {}
FilePos(const String& p, int l) : path(p), line(l) {}
FilePos() { line = 0; address = 0; }
FilePos(const String& p, int l) : path(p), line(l) { address = 0; }
};
enum CpuRegisterKind {
@ -76,6 +76,8 @@ struct Pdb : Debugger, ParentCtrl {
FnInfo() { address = size = pdbtype = 0; }
};
enum { UNKNOWN = -99, BOOL1, SINT1, UINT1, SINT2, UINT2, SINT4, UINT4, SINT8, UINT8, FLT, DBL, PFUNC };
struct Val : Moveable<Val> {
int type;
int ref;
@ -93,7 +95,7 @@ struct Pdb : Debugger, ParentCtrl {
String ToString() const;
#endif
Val() { rvalue = false; ref = 0; array = false; bitcnt = 0; address = 0; }
Val() { type = UNKNOWN; rvalue = false; ref = 0; array = false; bitcnt = 0; address = 0; }
};
struct NamedVal : Moveable<NamedVal> {
@ -101,8 +103,6 @@ struct Pdb : Debugger, ParentCtrl {
Val val;
};
enum { UNKNOWN = -99, BOOL1, SINT1, UINT1, SINT2, UINT2, SINT4, UINT4, SINT8, UINT8, FLT, DBL, PFUNC };
struct Type : Moveable<Type> {
Type() : size(-1), vtbl_typeindex(-1) {}
@ -289,7 +289,7 @@ struct Pdb : Debugger, ParentCtrl {
const Type& GetType(int ti);
int GetTypeIndex(adr_t modbase, dword typeindex);
const Type& GetTypeId(adr_t modbase, dword typeindex) { return GetType(GetTypeIndex(modbase, typeindex)); }
Val GetGlobal(const char *fn, const String& name);
Val GetGlobal(const String& name);
adr_t GetAddress(FilePos p);
FilePos GetFilePos(adr_t address);

118
uppsrc/ide/Debuggers/Sym.cpp
View file

@ -2,7 +2,7 @@
#ifdef COMPILER_MSC
#define LLOG(x) // DLOG(x)
#define LLOG(x) // DLOG(x)
#ifdef _DEBUG
char * SymTagAsString( DWORD symTag )
@ -90,10 +90,7 @@ Pdb::FnInfo Pdb::GetFnInfo(adr_t address)
{
DWORD64 h;
ULONG64 buffer[(sizeof(SYMBOL_INFO) +
MAX_SYM_NAME +
sizeof(ULONG64) - 1) /
sizeof(ULONG64)];
ULONG64 buffer[(sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(ULONG64) - 1) / sizeof(ULONG64)];
SYMBOL_INFO *f = (SYMBOL_INFO*)buffer;
f->SizeOfStruct = sizeof(SYMBOL_INFO);
@ -114,31 +111,7 @@ Pdb::FnInfo Pdb::GetFnInfo(adr_t address)
}
return fn;
}
/*
Pdb::FnInfo Pdb::GetFnInfo(String name)
{
ULONG64 b[(sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(ULONG64) - 1) / sizeof(ULONG64)];
SYMBOL_INFO *f = (SYMBOL_INFO*)b;
f->SizeOfStruct = sizeof(SYMBOL_INFO);
f->MaxNameLen = MAX_SYM_NAME;
FnInfo fn;
if(SymFromName(hProcess, const_cast<char *>(~name), f)) {
LLOG("GetFnInfo " << f->Name
<< ", type index: " << f->TypeIndex
<< ", Flags: " << FormatIntHex(f->Flags)
<< ", Address: " << FormatIntHex((dword)f->Address)
<< ", Size: " << FormatIntHex((dword)f->Size)
<< ", Tag: " << SymTagAsString(f->Tag));
fn.name = f->Name;
fn.address = (dword)f->Address;
fn.size = f->Size;
fn.pdbtype = f->TypeIndex;
}
return fn;
}
*/
void Pdb::TypeVal(Pdb::Val& v, int typeId, adr_t modbase)
{
adr_t tag;
@ -240,87 +213,52 @@ void Pdb::GetLocals(Frame& frame, Context& context, VectorMap<String, Pdb::Val>&
local = c.local;
}
#ifdef _DEBUG
BOOL CALLBACK Pdb::EnumGlobals(PSYMBOL_INFO pSym, ULONG SymbolSize, PVOID UserContext)
{
LocalsCtx& c = *(LocalsCtx *)UserContext;
if(pSym->Tag != SymTagData)
return TRUE;
DLOG(pSym->Name << " " << Format64Hex(pSym->Address));
LLOG("GLOBAL: " << pSym->Name << " " << Format64Hex(pSym->Address));
#if 0
DDUMP(pSym->Scope);
// FilePos pos = c.pdb->GetFilePos(pSym->Address);
// DDUMP(pos.line);
// DDUMP(pos.path);
// LLOG("LOCAL " << pSym->Name << ": " << Format64Hex(v.address));*/
DDUMP(pSym->Flags);
DDUMP(pSym->Tag);
DDUMP(pSym->TypeIndex);
DWORD dummy;
IMAGEHLP_LINE ln;
ln.SizeOfStruct = sizeof(ln);
ln.Address = pSym->Address;
if(SymGetLineFromAddr(c.pdb->hProcess, (uintptr_t)pSym->Address, &dummy, &ln)) {
DDUMP(ln.FileName);
DDUMP(ln.Address);
DDUMP(ln.LineNumber);
}
else
DLOG("GetSymLineFromAddr failed!");
DLOG("=========================");
#endif
Val& v = c.pdb->global.GetAdd(pSym->Name);
v.address = (adr_t)pSym->Address;
c.pdb->TypeVal(v, pSym->TypeIndex, (adr_t)pSym->ModBase);
return TRUE;
}
#endif
void Pdb::LoadGlobals(DWORD64 base)
{
#ifdef _DEBUG
TimeStop tm;
static IMAGEHLP_STACK_FRAME f;
LocalsCtx c;
c.pdb = this;
c.context = &context;
// SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS|SYMOPT_NO_PUBLICS);
SymEnumSymbols(hProcess, base, NULL, &EnumGlobals, &c);
// SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
DUMP(tm);
#endif
}
Pdb::Val Pdb::GetGlobal(const char *fn, const String& name)
Pdb::Val Pdb::GetGlobal(const String& name)
{
return Val();
ULONG64 b[(sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(ULONG64) - 1) / sizeof(ULONG64)];
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)b;
pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
pSymbol->MaxNameLen = MAX_SYM_NAME;
SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME
|SYMOPT_NO_UNQUALIFIED_LOADS|SYMOPT_NO_PUBLICS);
Vector<String> n = Split(fn, ':');
if(noglobal.GetCount() > 5000)
noglobal.Clear();
String nm;
for(;;) {
if(n.GetCount())
n.Drop();
nm = n.GetCount() ? Join(n, "::") + "::" + name : name;
int q = global.Find(nm);
if(q >= 0) {
SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
return global[q];
}
if(noglobal.Find(nm) < 0) {
Buffer<char> h(nm.GetLength() + 1);
strcpy(h, nm);
if(SymFromName(hProcess, h, pSymbol))
break;
}
noglobal.FindAdd(nm);
if(n.GetCount() == 0) {
SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
return Val();
}
}
SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME|SYMOPT_NO_UNQUALIFIED_LOADS);
if(pSymbol->Flags & (IMAGEHLP_SYMBOL_INFO_PARAMETER|IMAGEHLP_SYMBOL_INFO_LOCAL) ||
pSymbol->Tag != SymTagData) {
noglobal.FindAdd(nm);
return Val();
}
Val v;
v.address = (adr_t)pSymbol->Address;
TypeVal(v, pSymbol->TypeIndex, (adr_t)pSymbol->ModBase);
global.Add(nm, v);
return v;
return global.Get(name, Val());
}
String Pdb::GetSymName(adr_t modbase, dword typeindex)