system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-05 17:28:47 +00:00
Code Issues Projects Releases Wiki Activity

dbghelp: Remove symt_close_func_block() stabs's only parameter.

Browse Source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-10-07 11:40:00 +02:00 committed by Alexandre Julliard
parent 6f8ba8119a
commit 1bcdb17455
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dbghelp/dbghelp_private.h
View File

@ -862,9 +862,9 @@ extern struct symt_block*
struct symt_block* block,
unsigned pc, unsigned len) DECLSPEC_HIDDEN;
extern struct symt_block*
symt_close_func_block(struct module* module,
symt_close_func_block(struct module* module,
const struct symt_function* func,
struct symt_block* block, unsigned pc) DECLSPEC_HIDDEN;
struct symt_block* block) DECLSPEC_HIDDEN;
extern struct symt_hierarchy_point*
symt_add_function_point(struct module* module,
struct symt_function* func,

4
dlls/dbghelp/dwarf.c
View File

@ -2312,9 +2312,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm,
}
}
symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->current_func, subpgm->current_block, 0);
subpgm->current_block = symt_check_tag(subpgm->current_block->container, SymTagBlock) ?
(struct symt_block*)subpgm->current_block->container : NULL;
subpgm->current_block = symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->current_func, subpgm->current_block);
}
static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di)

2
dlls/dbghelp/msc.c
View File

@ -2472,7 +2472,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg,
case S_END:
if (block)
{
block = symt_close_func_block(msc_dbg->module, curr_func, block, 0);
block = symt_close_func_block(msc_dbg->module, curr_func, block);
}
else if (top_func)
{

6
dlls/dbghelp/stabs.c
View File

@ -1381,8 +1381,10 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
break;
case N_RBRAC:
if (curr_func)
block = symt_close_func_block(module, curr_func, block,
n_value);
{
block->size = curr_func->address + n_value - block->address;
block = symt_close_func_block(module, curr_func, block);
}
break;
case N_PSYM:
/* These are function parameters. */

7
dlls/dbghelp/symbol.c
View File

@ -549,14 +549,13 @@ struct symt_block* symt_open_func_block(struct module* module,
return block;
}
struct symt_block* symt_close_func_block(struct module* module,
struct symt_block* symt_close_func_block(struct module* module,
const struct symt_function* func,
struct symt_block* block, unsigned pc)
struct symt_block* block)
{
assert(symt_check_tag(&func->symt, SymTagFunction) || symt_check_tag(&func->symt, SymTagInlineSite));
if (pc) block->size = func->address + pc - block->address;
return (block->container->tag == SymTagBlock) ?
return (block->container->tag == SymTagBlock) ?
CONTAINING_RECORD(block->container, struct symt_block, symt) : NULL;
}