Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

minor improvements: squelch warnings when dumping; debug_out an indication that is_string_ptr raised an exception

Browse Source 
This was SVN commit r2070.
This commit is contained in:
janwas 2005-03-27 18:17:03 +00:00
parent 71705b5aa4
commit fd14510005
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/sysdep/win/wdbg.cpp
View File

@ -385,7 +385,7 @@ static void out(const wchar_t* fmt, ...)
static bool is_string_ptr(u64 addr, size_t stride = 1)
{
// completely bogus on IA32; save ourselves the segfault (slow).
#ifdef _WIN32
#ifdef _M_IX86
if(addr < 0x10000 || addr > 0xc0000000)
return false;
#endif
@ -422,6 +422,7 @@ static bool is_string_ptr(u64 addr, size_t stride = 1)
}
__except(1)
{
debug_out("^ raised by is_string_ptr; ignore\n");
return false;
}
}
@ -877,14 +878,11 @@ static int dump_data_sym(DWORD data_idx, const u8* p, uint level)
if(!SymFromIndexW(hProcess, mod_base, data_idx, sym))
return -1;
// dump_udt does some filtering (it skips symbols that don't have a
// defined offset), but we still get some SymTagBaseClass here.
// just ignore them. note: dump_sym_cb is the only other call site.
if(sym->Tag != SymTagData)
{
// still happens, even though dump_udt skips symbols that don't have
// defined offset values. don't know any other way to prevent this.
// (note: dump_sym_cb is the only other call site).
debug_out("dump_data_sym: unexpected symbol tag %d\n", sym->Tag);
return -1;
}
return 0;
// indent
for(uint i = 0; i <= level+1; i++)
@ -952,7 +950,7 @@ static BOOL CALLBACK dump_sym_cb(SYMBOL_INFO* sym, ULONG sym_size, void* ctx)
{
if(p->locals_active)
{
out(L"params:\r\n");
out(L" params:\r\n");
p->locals_active = false;
}
}
@ -960,7 +958,7 @@ static BOOL CALLBACK dump_sym_cb(SYMBOL_INFO* sym, ULONG sym_size, void* ctx)
{
if(!p->locals_active)
{
out(L"locals:\r\n ");
out(L" locals:\r\n ");
p->locals_active = true;
}
}