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

dbghelp/stabs: Track line numbers pending for an upcoming function.

Browse Source 
On Darwin, line numbers usually precede the associated function.
This commit is contained in:
Ken Thomases 2009-03-11 09:08:50 -05:00 committed by Alexandre Julliard
parent 65d929079c
commit 985f0ea18f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/dbghelp/stabs.c
View File

@ -1265,7 +1265,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
unsigned incl[32]; unsigned incl[32];
int incl_stk = -1; int incl_stk = -1;
int source_idx = -1; int source_idx = -1;
struct pending_list pending; struct pending_list pending_block;
struct pending_list pending_func;
BOOL ret = TRUE; BOOL ret = TRUE;
struct location loc; struct location loc;
unsigned char type; unsigned char type;
@ -1275,7 +1276,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
memset(srcpath, 0, sizeof(srcpath)); memset(srcpath, 0, sizeof(srcpath));
memset(stabs_basic, 0, sizeof(stabs_basic)); memset(stabs_basic, 0, sizeof(stabs_basic));
memset(&pending, 0, sizeof(pending)); memset(&pending_block, 0, sizeof(pending_block));
memset(&pending_func, 0, sizeof(pending_func));
/* /*
* Allocate a buffer into which we can build stab strings for cases * Allocate a buffer into which we can build stab strings for cases
@ -1381,7 +1383,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
{ {
block = symt_open_func_block(module, curr_func, block, block = symt_open_func_block(module, curr_func, block,
stab_ptr->n_value, 0); stab_ptr->n_value, 0);
pending_flush(&pending, module, curr_func, block); pending_flush(&pending_block, module, curr_func, block);
} }
break; break;
case N_RBRAC: case N_RBRAC:
@ -1465,7 +1467,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
param_type); param_type);
} }
else else
pending_add_var(&pending, ptr, DataIsLocal, &loc); pending_add_var(&pending_block, ptr, DataIsLocal, &loc);
} }
break; break;
case N_LSYM: case N_LSYM:
@ -1473,19 +1475,21 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
loc.kind = loc_regrel; loc.kind = loc_regrel;
loc.reg = 0; /* FIXME */ loc.reg = 0; /* FIXME */
loc.offset = stab_ptr->n_value; loc.offset = stab_ptr->n_value;
if (curr_func != NULL) pending_add_var(&pending, ptr, DataIsLocal, &loc); if (curr_func != NULL) pending_add_var(&pending_block, ptr, DataIsLocal, &loc);
break; break;
case N_SLINE: case N_SLINE:
/* /*
* This is a line number. These are always relative to the start * This is a line number. These are always relative to the start
* of the function (N_FUN), and this makes the lookup easier. * of the function (N_FUN), and this makes the lookup easier.
*/ */
assert(source_idx >= 0);
if (curr_func != NULL) if (curr_func != NULL)
{ {
assert(source_idx >= 0);
symt_add_func_line(module, curr_func, source_idx, symt_add_func_line(module, curr_func, source_idx,
stab_ptr->n_desc, stab_ptr->n_value); stab_ptr->n_desc, stab_ptr->n_value);
} }
else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc,
stab_ptr->n_value);
break; break;
case N_FUN: case N_FUN:
/* /*
@ -1520,6 +1524,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
curr_func = symt_new_function(module, compiland, symname, curr_func = symt_new_function(module, compiland, symname,
load_offset + stab_ptr->n_value, 0, load_offset + stab_ptr->n_value, 0,
&func_type->symt); &func_type->symt);
pending_flush(&pending_func, module, curr_func, NULL);
} }
else else
{ {
@ -1649,7 +1654,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
done: done:
HeapFree(GetProcessHeap(), 0, stabbuff); HeapFree(GetProcessHeap(), 0, stabbuff);
stabs_free_includes(); stabs_free_includes();
HeapFree(GetProcessHeap(), 0, pending.objs); HeapFree(GetProcessHeap(), 0, pending_block.objs);
HeapFree(GetProcessHeap(), 0, pending_func.objs);
return ret; return ret;
} }