wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 5ca6d9b5be30b359a401c74dd2bce368f2f82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca6d9b5be30b359a401c74dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:55:34 2010 +0100 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8a8766a..a5d8e4a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1099,7 +1099,7 @@ static void test_CreateTypeLib(void) { funcdesc.invkind = INVOKE_PROPERTYGET; funcdesc.callconv = CC_STDCALL; funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; - funcdesc.elemdescFunc.idldesc.wIDLFlags = IDLFLAG_NONE; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -1122,8 +1122,8 @@ static void test_CreateTypeLib(void) { ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_BSTR; - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_PROPERTYPUT; @@ -1158,40 +1158,40 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_PTR; - elemdesc[0].tdesc.lptdesc = &typedesc1; + U(elemdesc[0].tdesc).lptdesc = &typedesc1; typedesc1.vt = VT_BSTR; funcdesc.cParams = 1; funcdesc.lprgelemdescParam = elemdesc; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].tdesc.lptdesc = &typedesc2; + U(elemdesc[0].tdesc).lptdesc = &typedesc2; typedesc2.vt = VT_PTR; - typedesc2.lptdesc = &typedesc1; + U(typedesc2).lptdesc = &typedesc1; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_INT; - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0x123; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; elemdesc[1].tdesc.vt = VT_UI2; - elemdesc[1].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[1].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[1]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[1]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_UI2; V_UI2(&paramdescex.varDefaultValue) = 0xffff; funcdesc.cParams = 2; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; elemdesc[1].tdesc.vt = VT_INT; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0xffffffff;

1 0

Francois Gouget : winedbg: Fix compilation with gcc 2. 95 and non-GNU compilers.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 51dfd9adb11885daec878737f18f89fb05c1516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51dfd9adb11885daec878737f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:55:27 2010 +0100 winedbg: Fix compilation with gcc 2.95 and non-GNU compilers. --- programs/winedbg/db_disasm64.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index d7f7c03..98f7ef2 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -32,11 +32,25 @@ #include <stdio.h> #include "debugger.h" -static int (*db_printf)(const char* format, ...) -#ifdef __GNUC__ - __attribute__((format (printf,1,2))); +#ifndef __GNUC__ +#define __attribute__(X) #endif -static int no_printf(const char* format, ...) {return 0;} + +static int db_debug = 0; +static int db_printf(const char* format, ...) __attribute__((format (printf,1,2))); +int db_printf(const char* format, ...) +{ + va_list valist; + int len = 0; + if (db_debug) + { + va_start(valist, format); + len = dbg_printf(format, valist); + va_end(valist); + } + return len; +} + typedef DWORD_PTR db_addr_t; typedef BOOL boolean_t; @@ -79,7 +93,7 @@ static ULONG64 db_get_value(db_addr_t addr, int size, int is_signed) static void db_printsym(db_addr_t addr, unsigned unused) { - if (db_printf != no_printf) + if (db_debug) { ADDRESS64 a; @@ -1642,6 +1656,6 @@ db_disasm(db_addr_t loc, boolean_t altfmt) void be_x86_64_disasm_one_insn(ADDRESS64 *addr, int display) { - db_printf = display ? dbg_printf : no_printf; + db_debug = display; addr->Offset = db_disasm(addr->Offset, TRUE); }

1 0

Francois Gouget : gdiplus/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 5aca2dd9642eb698bce560978223af4b5457f29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aca2dd9642eb698bce560978… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:54:22 2010 +0100 gdiplus/tests: Fix compilation on systems that don't support nameless unions. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f0dc681..262f9a2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -913,7 +913,7 @@ static void test_loadwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY); @@ -971,7 +971,7 @@ static void test_createfromwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY);

1 0

Eric Pouech : dbghelp: When unwinding the stack, stop if the current address isn't in a known module.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 060ccb123a04f9ce34e8ec6235c46e1720fa7392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060ccb123a04f9ce34e8ec623… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:08 2010 +0100 dbghelp: When unwinding the stack, stop if the current address isn't in a known module. --- dlls/dbghelp/cpu_x86_64.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c664fd9..f07d8e4 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -516,10 +516,8 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, deltapc = 1; } - if (frame->AddrPC.Offset && (base = sw_module_base(csw, frame->AddrPC.Offset))) - frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); - else - frame->FuncTableEntry = NULL; + if (!frame->AddrPC.Offset || !(base = sw_module_base(csw, frame->AddrPC.Offset))) goto done_err; + frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; if (frame->FuncTableEntry) {

1 0

Eric Pouech : dbghelp: Rewrite SymGetModuleBase so that it relies on 64 bit version.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0c2401369c20ebe7e69cc3c9f1ff419ee249a3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2401369c20ebe7e69cc3c9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:02 2010 +0100 dbghelp: Rewrite SymGetModuleBase so that it relies on 64 bit version. --- dlls/dbghelp/module.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index eadc67a..8f12fef 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1034,13 +1034,10 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { - struct process* pcs = process_find_by_handle(hProcess); - struct module* module; + DWORD64 ret; - if (!pcs) return 0; - module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); - if (!module) return 0; - return module->module.BaseOfImage; + ret = SymGetModuleBase64(hProcess, dwAddr); + return validate_addr64(ret) ? ret : 0; } /*********************************************************************** @@ -1048,8 +1045,13 @@ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) */ DWORD64 WINAPI SymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) { - if (!validate_addr64(dwAddr)) return 0; - return SymGetModuleBase(hProcess, (DWORD)dwAddr); + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs) return 0; + module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + if (!module) return 0; + return module->module.BaseOfImage; } /******************************************************************

1 0

Eric Pouech : dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: a5293895a34c0cbf4f6db0585a1c48a025ddaee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5293895a34c0cbf4f6db0585… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:55 2010 +0100 dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option. --- dlls/dbghelp/dwarf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1652f46..78860d7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -690,7 +690,6 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } stack[++stk] = dwarf2_leb128_as_signed(ctx); loc->kind = loc_regrel; - break; } else switch (op) { @@ -736,18 +735,22 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, case DW_OP_skip: tmp = dwarf2_parse_u2(ctx); ctx->data += tmp; break; case DW_OP_bra: tmp = dwarf2_parse_u2(ctx); if (!stack[stk--]) ctx->data += tmp; break; case DW_OP_regx: - if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(dwarf2_leb128_as_unsigned(ctx)); + tmp = dwarf2_leb128_as_unsigned(ctx); + if (!piece_found) + { + if (loc->reg != Wine_DW_no_register) + FIXME("Only supporting one reg\n"); + loc->reg = dwarf2_map_register(tmp); + } loc->kind = loc_register; break; case DW_OP_bregx: tmp = dwarf2_leb128_as_unsigned(ctx); - ctx->data++; if (loc->reg != Wine_DW_no_register) FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(tmp) + dwarf2_leb128_as_signed(ctx); - loc->kind = loc_register; + loc->reg = dwarf2_map_register(tmp); + stack[++stk] = dwarf2_leb128_as_signed(ctx); + loc->kind = loc_regrel; break; case DW_OP_fbreg: if (loc->reg != Wine_DW_no_register)

1 0

Eric Pouech : dbghelp: In dwarf attribute parsing, ensure that we do have a block when parsing a block.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6a6edcd1ca8820145e36916b0dfdca48c38fb763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6edcd1ca8820145e36916b0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:44 2010 +0100 dbghelp: In dwarf attribute parsing, ensure that we do have a block when parsing a block. --- dlls/dbghelp/dwarf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 94563af..1652f46 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -878,6 +878,13 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, loc->reg = Wine_DW_no_register; loc->offset = xloc.u.uvalue; return TRUE; + case DW_FORM_block: + case DW_FORM_block1: + case DW_FORM_block2: + case DW_FORM_block4: + break; + default: FIXME("Unsupported yet form %lx\n", xloc.form); + return FALSE; } /* assume we have a block form */

1 0

Eric Pouech : winedbg: Store for context variables only the offsets of each register ( instead of the address of the register in dbg_context).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: ea21a32707340cb4f5781691b9ebaab96a9ccab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea21a32707340cb4f5781691b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:20 2010 +0100 winedbg: Store for context variables only the offsets of each register (instead of the address of the register in dbg_context). --- programs/winedbg/be_alpha.c | 8 +------- programs/winedbg/be_cpu.h | 8 +++----- programs/winedbg/be_i386.c | 11 +---------- programs/winedbg/be_ppc.c | 8 +------- programs/winedbg/be_x86_64.c | 11 +---------- programs/winedbg/debugger.h | 1 - programs/winedbg/memory.c | 4 ++-- programs/winedbg/winedbg.c | 15 ++++++++++----- 8 files changed, 19 insertions(+), 47 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 57bdfd1..3c470e7 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -54,12 +54,6 @@ static struct dbg_internal_var be_alpha_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_alpha_init_registers(CONTEXT* ctx) -{ - dbg_printf("not done\n"); - return be_alpha_ctx; -} - static unsigned be_alpha_is_step_over_insn(const void* insn) { dbg_printf("not done\n"); @@ -159,7 +153,7 @@ struct backend_cpu be_alpha = be_alpha_single_step, be_alpha_print_context, be_alpha_print_segment_info, - be_alpha_init_registers, + be_alpha_ctx, be_alpha_is_step_over_insn, be_alpha_is_function_return, be_alpha_is_break_insn, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 6679977..a08f8f0 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -59,11 +59,9 @@ struct backend_cpu * function empty */ void (*print_segment_info)(HANDLE hThread, const CONTEXT* ctx); - /* Do the initialization so that the debugger has internal variables linked - * to the context's registers - */ - const struct dbg_internal_var* - (*init_registers)(CONTEXT* ctx); + /* all the CONTEXT's relative variables, bound to this CPU */ + const struct dbg_internal_var* context_vars; + /* ------------------------------------------------------------------------------- * code inspection * -------------------------------------------------------------------------------*/ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 6ab5970..74676dd 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -290,15 +290,6 @@ static struct dbg_internal_var be_i386_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_i386_init_registers(CONTEXT* ctx) -{ - struct dbg_internal_var* div; - - for (div = be_i386_ctx; div->name; div++) - div->pval = (DWORD_PTR*)((char*)ctx + (DWORD)div->pval); - return be_i386_ctx; -} - static unsigned be_i386_is_step_over_insn(const void* insn) { BYTE ch; @@ -754,7 +745,7 @@ struct backend_cpu be_i386 = be_i386_single_step, be_i386_print_context, be_i386_print_segment_info, - be_i386_init_registers, + be_i386_ctx, be_i386_is_step_over_insn, be_i386_is_function_return, be_i386_is_break_insn, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 9ba9994..22becf2 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -67,12 +67,6 @@ static struct dbg_internal_var be_ppc_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_ppc_init_registers(CONTEXT* ctx) -{ - dbg_printf("not done\n"); - return be_ppc_ctx; -} - static unsigned be_ppc_is_step_over_insn(const void* insn) { dbg_printf("not done\n"); @@ -183,7 +177,7 @@ struct backend_cpu be_ppc = be_ppc_single_step, be_ppc_print_context, be_ppc_print_segment_info, - be_ppc_init_registers, + be_ppc_ctx, be_ppc_is_step_over_insn, be_ppc_is_function_return, be_ppc_is_break_insn, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 682bd05..ac7f1fc 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -153,15 +153,6 @@ static struct dbg_internal_var be_x86_64_ctx[] = {0, NULL, 0, dbg_itype_none} }; -static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) -{ - struct dbg_internal_var* div; - - for (div = be_x86_64_ctx; div->name; div++) - div->pval = (DWORD_PTR*)((char*)ctx + (DWORD_PTR)div->pval); - return be_x86_64_ctx; -} - #define f_mod(b) ((b)>>6) #define f_reg(b) (((b)>>3)&0x7) #define f_rm(b) ((b)&0x7) @@ -561,7 +552,7 @@ struct backend_cpu be_x86_64 = be_x86_64_single_step, be_x86_64_print_context, be_x86_64_print_segment_info, - be_x86_64_init_registers, + be_x86_64_ctx, be_x86_64_is_step_over_insn, be_x86_64_is_function_return, be_x86_64_is_break_insn, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 300f48a..373600a 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -488,7 +488,6 @@ static inline void* dbg_heap_realloc(void* buffer, size_t size) } extern struct dbg_internal_var dbg_internal_vars[]; -extern const struct dbg_internal_var* dbg_context_vars; #define DBG_IVARNAME(_var) dbg_internal_var_##_var #define DBG_IVARSTRUCT(_var) dbg_internal_vars[DBG_IVARNAME(_var)] diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 9554ea4..2b17dab 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -690,7 +690,7 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) return FALSE; } - for (div = dbg_context_vars; div->name; div++) + for (div = be_cpu->context_vars; div->name; div++) { if (div->val == regno) { @@ -703,7 +703,7 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) } } else - *value = div->pval; + *value = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); if (buffer) lstrcpynA(buffer, div->name, len); return TRUE; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 78bf722..889bb3a 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -96,7 +96,6 @@ BOOL dbg_interactiveP = FALSE; static struct dbg_process* dbg_process_list = NULL; struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; -const struct dbg_internal_var* dbg_context_vars; static HANDLE dbg_houtput; static void dbg_outputA(const char* buffer, int len) @@ -208,8 +207,7 @@ static unsigned dbg_load_internal_vars(void) } } RegCloseKey(hkey); - /* set up the debug variables for the CPU context */ - dbg_context_vars = be_cpu->init_registers(&dbg_context); + return TRUE; } @@ -245,9 +243,16 @@ const struct dbg_internal_var* dbg_get_internal_var(const char* name) { if (!strcmp(div->name, name)) return div; } - for (div = dbg_context_vars; div->name; div++) + for (div = be_cpu->context_vars; div->name; div++) { - if (!strcasecmp(div->name, name)) return div; + if (!strcasecmp(div->name, name)) + { + struct dbg_internal_var* ret = (void*)lexeme_alloc_size(sizeof(*ret)); + /* relocate register's field against current context */ + *ret = *div; + ret->pval = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); + return ret; + } } return NULL;

1 0

Eric Pouech : dbghelp: Added preliminary CFA management.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 036392c5d131d73e84ad0ed52a796b2cb9c1139d URL: http://source.winehq.org/git/wine.git/?a=commit;h=036392c5d131d73e84ad0ed52… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:11 2010 +0100 dbghelp: Added preliminary CFA management. --- dlls/dbghelp/cpu_x86_64.c | 19 +- dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/dwarf.c | 697 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 716 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=036392c5d131d73e84ad0…

1 0

Eric Pouech : dbghelp: Added CFA information to dbghelp's dwarf.h.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0eef5d6809a4551e2395b53c4038e8bc5226bcd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef5d6809a4551e2395b53c4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:06 2010 +0100 dbghelp: Added CFA information to dbghelp's dwarf.h. --- dlls/dbghelp/dwarf.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index a590df2..2a01c1b 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -418,3 +418,50 @@ enum dwarf_calling_convention #define DW_LNE_end_sequence 0x01 #define DW_LNE_set_address 0x02 #define DW_LNE_define_file 0x03 + +#define DW_CIE_ID ~(0x0) + +enum dwarf_call_frame_info +{ + DW_CFA_advance_loc = 0x40, + DW_CFA_offset = 0x80, + DW_CFA_restore = 0xc0, + DW_CFA_nop = 0x00, + DW_CFA_set_loc = 0x01, + DW_CFA_advance_loc1 = 0x02, + DW_CFA_advance_loc2 = 0x03, + DW_CFA_advance_loc4 = 0x04, + DW_CFA_offset_extended = 0x05, + DW_CFA_restore_extended = 0x06, + DW_CFA_undefined = 0x07, + DW_CFA_same_value = 0x08, + DW_CFA_register = 0x09, + DW_CFA_remember_state = 0x0a, + DW_CFA_restore_state = 0x0b, + DW_CFA_def_cfa = 0x0c, + DW_CFA_def_cfa_register = 0x0d, + DW_CFA_def_cfa_offset = 0x0e, + DW_CFA_def_cfa_expression = 0x0f, + DW_CFA_expression = 0x10, + DW_CFA_offset_extended_sf = 0x11, + DW_CFA_def_cfa_sf = 0x12, + DW_CFA_def_cfa_offset_sf = 0x13, + DW_CFA_val_offset = 0x14, + DW_CFA_val_offset_sf = 0x15, + DW_CFA_val_expression = 0x16, +}; + +#define DW_EH_PE_native 0x00 +#define DW_EH_PE_leb128 0x01 +#define DW_EH_PE_data2 0x02 +#define DW_EH_PE_data4 0x03 +#define DW_EH_PE_data8 0x04 +#define DW_EH_PE_signed 0x08 +#define DW_EH_PE_abs 0x00 +#define DW_EH_PE_pcrel 0x10 +#define DW_EH_PE_textrel 0x20 +#define DW_EH_PE_datarel 0x30 +#define DW_EH_PE_funcrel 0x40 +#define DW_EH_PE_aligned 0x50 +#define DW_EH_PE_indirect 0x80 +#define DW_EH_PE_omit 0xff

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010