[PATCH 1/2] [DbgHelp]: removed some unused fields for public symbol description
Eric Pouech
eric.pouech at orange.fr
Sat Jan 23 15:13:18 CST 2010
A+
---
dlls/dbghelp/dbghelp_private.h | 5 +----
dlls/dbghelp/elf_module.c | 3 +--
dlls/dbghelp/msc.c | 12 ++++--------
dlls/dbghelp/pe_module.c | 15 +++++----------
dlls/dbghelp/symbol.c | 5 +----
5 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index d2e2f1b..e7e3c7c 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -227,8 +227,6 @@ struct symt_public
struct symt* container; /* compiland */
unsigned long address;
unsigned long size;
- unsigned in_code : 1,
- is_function : 1;
};
struct symt_thunk
@@ -593,8 +591,7 @@ extern struct symt_public*
symt_new_public(struct module* module,
struct symt_compiland* parent,
const char* typename,
- unsigned long address, unsigned size,
- BOOL in_code, BOOL is_func);
+ unsigned long address, unsigned size);
extern struct symt_data*
symt_new_global_variable(struct module* module,
struct symt_compiland* parent,
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 3399aeb..6a8a151 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -749,8 +749,7 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table
{
symt_new_public(module, ste->compiland, ste->ht_elt.name,
module->elf_info->elf_addr + ste->symp->st_value,
- ste->symp->st_size, TRUE /* FIXME */,
- ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC);
+ ste->symp->st_size);
}
return TRUE;
}
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index c25be16..b7adabd 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -1919,8 +1919,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT
{
symt_new_public(msc_dbg->module, compiland,
terminate_string(&sym->data_v1.p_name),
- codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset),
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1);
}
break;
case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */
@@ -1928,8 +1927,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT
{
symt_new_public(msc_dbg->module, compiland,
terminate_string(&sym->data_v2.p_name),
- codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset),
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1);
}
break;
@@ -1938,8 +1936,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT
{
symt_new_public(msc_dbg->module, compiland,
sym->data_v3.name,
- codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset),
- 1, FALSE /* FIXME */, FALSE);
+ codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1);
}
break;
case S_PUB_FUNC1_V3:
@@ -1950,8 +1947,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT
{
symt_new_public(msc_dbg->module, compiland,
sym->data_v3.name,
- codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset),
- 1, TRUE /* FIXME */, TRUE);
+ codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1);
}
#endif
break;
diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index 2937013..80ad561 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -315,14 +315,12 @@ static BOOL pe_load_export_debug_info(const struct process* pcs,
#if 0
/* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */
/* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */
- symt_new_public(module, NULL, module->module.ModuleName, base, 1,
- TRUE /* FIXME */, TRUE /* FIXME */);
+ symt_new_public(module, NULL, module->module.ModuleName, base, 1);
#endif
/* Add entry point */
symt_new_public(module, NULL, "EntryPoint",
- base + nth->OptionalHeader.AddressOfEntryPoint, 1,
- TRUE, TRUE);
+ base + nth->OptionalHeader.AddressOfEntryPoint, 1);
#if 0
/* FIXME: we'd better store addresses linked to sections rather than
absolute values */
@@ -333,8 +331,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs,
for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++)
{
symt_new_public(module, NULL, section->Name,
- RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL),
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1);
}
#endif
@@ -359,8 +356,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs,
if (!names[i]) continue;
symt_new_public(module, NULL,
RtlImageRvaToVa(nth, mapping, names[i], NULL),
- base + functions[ordinals[i]],
- 1, TRUE /* FIXME */, TRUE /* FIXME */);
+ base + functions[ordinals[i]], 1);
}
for (i = 0; i < exports->NumberOfFunctions; i++)
@@ -371,8 +367,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs,
if ((ordinals[j] == i) && names[j]) break;
if (j < exports->NumberOfNames) continue;
snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
- symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1,
- TRUE /* FIXME */, TRUE /* FIXME */);
+ symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1);
}
}
}
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 3209067..0b66cdb 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -304,8 +304,7 @@ struct symt_compiland* symt_new_compiland(struct module* module,
struct symt_public* symt_new_public(struct module* module,
struct symt_compiland* compiland,
const char* name,
- unsigned long address, unsigned size,
- BOOL in_code, BOOL is_func)
+ unsigned long address, unsigned size)
{
struct symt_public* sym;
struct symt** p;
@@ -322,8 +321,6 @@ struct symt_public* symt_new_public(struct module* module,
sym->container = compiland ? &compiland->symt : NULL;
sym->address = address;
sym->size = size;
- sym->in_code = in_code;
- sym->is_function = is_func;
symt_add_module_ht(module, (struct symt_ht*)sym);
if (compiland)
{
More information about the wine-patches
mailing list