Commit 01876750 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

dbghelp: Rename line_info's pc_offset field into address.

It's actually an absolute address. Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f26e0ba2
...@@ -519,7 +519,7 @@ struct line_info ...@@ -519,7 +519,7 @@ struct line_info
line_number; line_number;
union union
{ {
ULONG_PTR pc_offset; /* if is_source_file isn't set */ ULONG_PTR address; /* absolute, if is_source_file isn't set */
unsigned source_file; /* if is_source_file is set */ unsigned source_file; /* if is_source_file is set */
} u; } u;
}; };
......
...@@ -435,7 +435,7 @@ void symt_add_func_line(struct module* module, struct symt_function* func, ...@@ -435,7 +435,7 @@ void symt_add_func_line(struct module* module, struct symt_function* func,
dli->is_first = 0; /* only a source file can be first */ dli->is_first = 0; /* only a source file can be first */
dli->is_last = 1; dli->is_last = 1;
dli->line_number = line_num; dli->line_number = line_num;
dli->u.pc_offset = func->address + offset; dli->u.address = func->address + offset;
} }
/****************************************************************** /******************************************************************
...@@ -1870,9 +1870,9 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, ...@@ -1870,9 +1870,9 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
dli = vector_at(&func->vlines, i); dli = vector_at(&func->vlines, i);
if (!dli->is_source_file) if (!dli->is_source_file)
{ {
if (found || dli->u.pc_offset > addr) continue; if (found || dli->u.address > addr) continue;
intl->line_number = dli->line_number; intl->line_number = dli->line_number;
intl->address = dli->u.pc_offset; intl->address = dli->u.address;
intl->key = dli; intl->key = dli;
found = TRUE; found = TRUE;
continue; continue;
...@@ -2013,7 +2013,7 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int ...@@ -2013,7 +2013,7 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int
if (!li->is_source_file) if (!li->is_source_file)
{ {
intl->line_number = li->line_number; intl->line_number = li->line_number;
intl->address = li->u.pc_offset; intl->address = li->u.address;
intl->key = li; intl->key = li;
/* search source file */ /* search source file */
for (srcli = li; !srcli->is_source_file; srcli--); for (srcli = li; !srcli->is_source_file; srcli--);
...@@ -2092,7 +2092,7 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int ...@@ -2092,7 +2092,7 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int
if (!li->is_source_file) if (!li->is_source_file)
{ {
intl->line_number = li->line_number; intl->line_number = li->line_number;
intl->address = li->u.pc_offset; intl->address = li->u.address;
intl->key = li; intl->key = li;
return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE); return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
} }
...@@ -2559,7 +2559,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, ...@@ -2559,7 +2559,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland,
sci.Key = dli; sci.Key = dli;
sci.Obj[0] = '\0'; /* FIXME */ sci.Obj[0] = '\0'; /* FIXME */
sci.LineNumber = dli->line_number; sci.LineNumber = dli->line_number;
sci.Address = dli->u.pc_offset; sci.Address = dli->u.address;
if (!cb(&sci, user)) break; if (!cb(&sci, user)) break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment