dbghelp/stabs: For Mach-O, line numbers use absolute address, not offset.

So, compute the offset by subtracting the function address.
This commit is contained in:
Ken Thomases 2009-03-13 11:48:21 -05:00 committed by Alexandre Julliard
parent feedbb1630
commit 3a96219d57
1 changed files with 6 additions and 1 deletions

View File

@ -1202,6 +1202,8 @@ static void pending_flush(struct pending_list* pending, struct module* module,
block, pending->objs[i].u.var.type, pending->objs[i].u.var.name); block, pending->objs[i].u.var.type, pending->objs[i].u.var.name);
break; break;
case PENDING_LINE: case PENDING_LINE:
if (module->type == DMT_MACHO)
pending->objs[i].u.line.offset -= func->address;
symt_add_func_line(module, func, pending->objs[i].u.line.source_idx, symt_add_func_line(module, func, pending->objs[i].u.line.source_idx,
pending->objs[i].u.line.line_num, pending->objs[i].u.line.offset); pending->objs[i].u.line.line_num, pending->objs[i].u.line.offset);
break; break;
@ -1485,8 +1487,11 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
assert(source_idx >= 0); assert(source_idx >= 0);
if (curr_func != NULL) if (curr_func != NULL)
{ {
unsigned long offset = stab_ptr->n_value;
if (module->type == DMT_MACHO)
offset -= curr_func->address;
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, offset);
} }
else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc,
stab_ptr->n_value); stab_ptr->n_value);