ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed 'break NN' command (using dbghelp.SymEnumLines).

This commit is contained in:
Eric Pouech 2005-11-03 11:33:04 +00:00 committed by Alexandre Julliard
parent a6f40be771
commit 2d62ba5557
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
programs/winedbg/break.c
View File

@ -255,6 +255,25 @@ void break_add_break_from_id(const char *name, int lineno)
dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.symbol.lineno = lineno; dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.symbol.lineno = lineno;
} }
struct cb_break_lineno
{
int lineno;
ADDRESS addr;
};
static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user)
{
struct cb_break_lineno* bkln = user;
if (bkln->lineno == sci->LineNumber)
{
bkln->addr.Mode = AddrModeFlat;
bkln->addr.Offset = sci->Address;
return FALSE;
}
return TRUE;
}
/*********************************************************************** /***********************************************************************
* break_add_break_from_lineno * break_add_break_from_lineno
* *
@ -262,48 +281,29 @@ void break_add_break_from_id(const char *name, int lineno)
*/ */
void break_add_break_from_lineno(int lineno) void break_add_break_from_lineno(int lineno)
{ {
ADDRESS addr; struct cb_break_lineno bkln;
memory_get_current_pc(&addr); memory_get_current_pc(&bkln.addr);
if (lineno != -1) if (lineno != -1)
{ {
IMAGEHLP_LINE il; IMAGEHLP_LINE il;
IMAGEHLP_LINE iil;
BOOL found = FALSE;
DWORD disp; DWORD disp;
DWORD linear = (DWORD)memory_to_linear_addr(&bkln.addr);
il.SizeOfStruct = sizeof(il); il.SizeOfStruct = sizeof(il);
if (!SymGetLineFromAddr(dbg_curr_process->handle, if (!SymGetLineFromAddr(dbg_curr_process->handle, linear, &disp, &il))
(DWORD)memory_to_linear_addr(&addr), &disp, &il))
{ {
dbg_printf("Unable to add breakpoint (unknown address)\n"); dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear);
return; return;
} }
bkln.addr.Offset = 0;
iil = il; bkln.lineno = lineno;
while (SymGetLinePrev(dbg_curr_process->handle, &iil)) SymEnumLines(dbg_curr_process->handle, linear, NULL, il.FileName, line_cb, &bkln);
{ if (!bkln.addr.Offset)
if (lineno == iil.LineNumber && !strcmp(il.FileName, iil.FileName))
{
addr.Mode = AddrModeFlat;
addr.Offset = iil.Address;
found = TRUE;
break;
}
}
iil = il;
if (!found) while (SymGetLineNext(dbg_curr_process->handle, &iil))
{
if (lineno == iil.LineNumber && !strcmp(il.FileName, iil.FileName))
{
addr.Mode = AddrModeFlat;
addr.Offset = iil.Address;
found = TRUE;
break;
}
}
if (!found)
{ {
dbg_printf("Unknown line number\n" dbg_printf("Unknown line number\n"
"(either out of file, or no code at given line number)\n"); "(either out of file, or no code at given line number)\n");
@ -311,7 +311,7 @@ void break_add_break_from_lineno(int lineno)
} }
} }
break_add_break(&addr, TRUE); break_add_break(&bkln.addr, TRUE);
} }
/*********************************************************************** /***********************************************************************