wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Ken Thomases : dbghelp/stabs: Track line numbers pending for an upcoming function.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 985f0ea18f4cf05d8b96829e5992b62e6af6b34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=985f0ea18f4cf05d8b96829e5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:08:50 2009 -0500 dbghelp/stabs: Track line numbers pending for an upcoming function. On Darwin, line numbers usually precede the associated function. --- dlls/dbghelp/stabs.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e12fcfa..fd88722 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1265,7 +1265,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, unsigned incl[32]; int incl_stk = -1; int source_idx = -1; - struct pending_list pending; + struct pending_list pending_block; + struct pending_list pending_func; BOOL ret = TRUE; struct location loc; unsigned char type; @@ -1275,7 +1276,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, memset(srcpath, 0, sizeof(srcpath)); memset(stabs_basic, 0, sizeof(stabs_basic)); - memset(&pending, 0, sizeof(pending)); + memset(&pending_block, 0, sizeof(pending_block)); + memset(&pending_func, 0, sizeof(pending_func)); /* * Allocate a buffer into which we can build stab strings for cases @@ -1381,7 +1383,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, { block = symt_open_func_block(module, curr_func, block, stab_ptr->n_value, 0); - pending_flush(&pending, module, curr_func, block); + pending_flush(&pending_block, module, curr_func, block); } break; case N_RBRAC: @@ -1465,7 +1467,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, param_type); } else - pending_add_var(&pending, ptr, DataIsLocal, &loc); + pending_add_var(&pending_block, ptr, DataIsLocal, &loc); } break; case N_LSYM: @@ -1473,19 +1475,21 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, loc.kind = loc_regrel; loc.reg = 0; /* FIXME */ loc.offset = stab_ptr->n_value; - if (curr_func != NULL) pending_add_var(&pending, ptr, DataIsLocal, &loc); + if (curr_func != NULL) pending_add_var(&pending_block, ptr, DataIsLocal, &loc); break; case N_SLINE: /* * This is a line number. These are always relative to the start * of the function (N_FUN), and this makes the lookup easier. */ + assert(source_idx >= 0); if (curr_func != NULL) { - assert(source_idx >= 0); symt_add_func_line(module, curr_func, source_idx, stab_ptr->n_desc, stab_ptr->n_value); } + else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, + stab_ptr->n_value); break; case N_FUN: /* @@ -1520,6 +1524,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, curr_func = symt_new_function(module, compiland, symname, load_offset + stab_ptr->n_value, 0, &func_type->symt); + pending_flush(&pending_func, module, curr_func, NULL); } else { @@ -1649,7 +1654,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, done: HeapFree(GetProcessHeap(), 0, stabbuff); stabs_free_includes(); - HeapFree(GetProcessHeap(), 0, pending.objs); + HeapFree(GetProcessHeap(), 0, pending_block.objs); + HeapFree(GetProcessHeap(), 0, pending_func.objs); return ret; }

1 0

Ken Thomases : dbghelp/stabs: Allow pending list to include line numbers as well as variables.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 65d929079cb85b222c72c595b4d0a9ee2fb868ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d929079cb85b222c72c595b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:08:45 2009 -0500 dbghelp/stabs: Allow pending list to include line numbers as well as variables. On Darwin, line numbers usually precede the associated function. --- dlls/dbghelp/stabs.c | 90 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 68 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 91b85fe..e12fcfa 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1112,6 +1112,12 @@ static struct symt* stabs_parse_type(const char* stab) return *stabs_read_type_enum(&c); } +enum pending_obj_kind +{ + PENDING_VAR, + PENDING_LINE, +}; + struct pending_loc_var { char name[256]; @@ -1120,9 +1126,25 @@ struct pending_loc_var struct location loc; }; -struct pending_block +struct pending_line +{ + int source_idx; + int line_num; + unsigned long offset; +}; + +struct pending_object { - struct pending_loc_var* vars; + enum pending_obj_kind tag; + union { + struct pending_loc_var var; + struct pending_line line; + } u; +}; + +struct pending_list +{ + struct pending_object* objs; unsigned num; unsigned allocated; }; @@ -1132,37 +1154,61 @@ static inline void pending_make_room(struct pending_list* pending) if (pending->num == pending->allocated) { pending->allocated += 8; - if (!pending->vars) - pending->vars = HeapAlloc(GetProcessHeap(), 0, - pending->allocated * sizeof(pending->vars[0])); + if (!pending->objs) + pending->objs = HeapAlloc(GetProcessHeap(), 0, + pending->allocated * sizeof(pending->objs[0])); else - pending->vars = HeapReAlloc(GetProcessHeap(), 0, pending->vars, - pending->allocated * sizeof(pending->vars[0])); + pending->objs = HeapReAlloc(GetProcessHeap(), 0, pending->objs, + pending->allocated * sizeof(pending->objs[0])); } } -static inline void pending_add(struct pending_block* pending, const char* name, - enum DataKind dt, const struct location* loc) +static inline void pending_add_var(struct pending_list* pending, const char* name, + enum DataKind dt, const struct location* loc) +{ + pending_make_room(pending); + pending->objs[pending->num].tag = PENDING_VAR; + stab_strcpy(pending->objs[pending->num].u.var.name, + sizeof(pending->objs[pending->num].u.var.name), name); + pending->objs[pending->num].u.var.type = stabs_parse_type(name); + pending->objs[pending->num].u.var.kind = dt; + pending->objs[pending->num].u.var.loc = *loc; + pending->num++; +} + +static inline void pending_add_line(struct pending_list* pending, int source_idx, + int line_num, unsigned long offset) { pending_make_room(pending); - stab_strcpy(pending->vars[pending->num].name, - sizeof(pending->vars[pending->num].name), name); - pending->vars[pending->num].type = stabs_parse_type(name); - pending->vars[pending->num].kind = dt; - pending->vars[pending->num].loc = *loc; + pending->objs[pending->num].tag = PENDING_LINE; + pending->objs[pending->num].u.line.source_idx = source_idx; + pending->objs[pending->num].u.line.line_num = line_num; + pending->objs[pending->num].u.line.offset = offset; pending->num++; } -static void pending_flush(struct pending_block* pending, struct module* module, +static void pending_flush(struct pending_list* pending, struct module* module, struct symt_function* func, struct symt_block* block) { unsigned int i; for (i = 0; i < pending->num; i++) { - symt_add_func_local(module, func, - pending->vars[i].kind, &pending->vars[i].loc, - block, pending->vars[i].type, pending->vars[i].name); + switch (pending->objs[i].tag) + { + case PENDING_VAR: + symt_add_func_local(module, func, + pending->objs[i].u.var.kind, &pending->objs[i].u.var.loc, + block, pending->objs[i].u.var.type, pending->objs[i].u.var.name); + break; + case PENDING_LINE: + 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); + break; + default: + ERR("Unknown pending object tag %u\n", (unsigned)pending->objs[i].tag); + break; + } } pending->num = 0; } @@ -1219,7 +1265,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, unsigned incl[32]; int incl_stk = -1; int source_idx = -1; - struct pending_block pending; + struct pending_list pending; BOOL ret = TRUE; struct location loc; unsigned char type; @@ -1419,7 +1465,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, param_type); } else - pending_add(&pending, ptr, DataIsLocal, &loc); + pending_add_var(&pending, ptr, DataIsLocal, &loc); } break; case N_LSYM: @@ -1427,7 +1473,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, loc.kind = loc_regrel; loc.reg = 0; /* FIXME */ loc.offset = stab_ptr->n_value; - if (curr_func != NULL) pending_add(&pending, ptr, DataIsLocal, &loc); + if (curr_func != NULL) pending_add_var(&pending, ptr, DataIsLocal, &loc); break; case N_SLINE: /* @@ -1603,7 +1649,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, done: HeapFree(GetProcessHeap(), 0, stabbuff); stabs_free_includes(); - HeapFree(GetProcessHeap(), 0, pending.vars); + HeapFree(GetProcessHeap(), 0, pending.objs); return ret; }

1 0

Ken Thomases : dbghelp/stabs: Extract growing of pending_block' s buffer to pending_make_room().
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: a1ac32822aa52cc08fc7608e40fbb4fba19f6e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ac32822aa52cc08fc7608e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:08:38 2009 -0500 dbghelp/stabs: Extract growing of pending_block's buffer to pending_make_room(). --- dlls/dbghelp/stabs.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 33590ab..91b85fe 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1127,8 +1127,7 @@ struct pending_block unsigned allocated; }; -static inline void pending_add(struct pending_block* pending, const char* name, - enum DataKind dt, const struct location* loc) +static inline void pending_make_room(struct pending_list* pending) { if (pending->num == pending->allocated) { @@ -1140,6 +1139,12 @@ static inline void pending_add(struct pending_block* pending, const char* name, pending->vars = HeapReAlloc(GetProcessHeap(), 0, pending->vars, pending->allocated * sizeof(pending->vars[0])); } +} + +static inline void pending_add(struct pending_block* pending, const char* name, + enum DataKind dt, const struct location* loc) +{ + pending_make_room(pending); stab_strcpy(pending->vars[pending->num].name, sizeof(pending->vars[pending->num].name), name); pending->vars[pending->num].type = stabs_parse_type(name);

1 0

Ken Thomases : dbghelp: Teach stabs_parse about other kinds of Mach-O symbol definitions.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 615fff293a29560f46570097455d90e8320c1ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=615fff293a29560f465700974… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:08:33 2009 -0500 dbghelp: Teach stabs_parse about other kinds of Mach-O symbol definitions. --- dlls/dbghelp/stabs.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index aeac9cb..33590ab 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -53,6 +53,10 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_MACH_O_NLIST_H +# include <mach-o/nlist.h> +#endif + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -1549,12 +1553,25 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, /* Always ignore these, they seem to be used only on Darwin. */ break; case N_ABS: +#ifdef N_SECT + case N_SECT: +#endif /* FIXME: Other definition types (N_TEXT, N_DATA, N_BSS, ...)? */ if (callback) { BOOL is_public = (stab_ptr->n_type & N_EXT); BOOL is_global = is_public; +#ifdef N_PEXT + /* "private extern"; shared among compilation units in a shared + * library, but not accessible from outside the library. */ + if (stab_ptr->n_type & N_PEXT) + { + is_public = FALSE; + is_global = TRUE; + } +#endif + if (*ptr == '_') ptr++; stab_strcpy(symname, sizeof(symname), ptr);

1 0

Ken Thomases : configure: Check for mach-o/dyld_images.h and mach-o/nlist. h headers.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: d35c0e87eb04e120f75da3942a1fe042e9760e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35c0e87eb04e120f75da3942… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:05:53 2009 -0500 configure: Check for mach-o/dyld_images.h and mach-o/nlist.h headers. --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4ccd3bf..9e0094f 100755 --- a/configure +++ b/configure @@ -6092,6 +6092,8 @@ done + + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -6137,6 +6139,8 @@ for ac_header in \ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ + mach-o/dyld_images.h \ + mach-o/nlist.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/configure.ac b/configure.ac index 590ca4e..e114331 100644 --- a/configure.ac +++ b/configure.ac @@ -315,6 +315,8 @@ AC_CHECK_HEADERS(\ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ + mach-o/dyld_images.h \ + mach-o/nlist.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/include/config.h.in b/include/config.h.in index 9f3da47..047e90c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -432,6 +432,12 @@ /* Define to 1 if you have the <mach/mach.h> header file. */ #undef HAVE_MACH_MACH_H +/* Define to 1 if you have the <mach-o/dyld_images.h> header file. */ +#undef HAVE_MACH_O_DYLD_IMAGES_H + +/* Define to 1 if you have the <mach-o/nlist.h> header file. */ +#undef HAVE_MACH_O_NLIST_H + /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE

1 0

Ken Thomases : dbghelp: Let stabs_parse call back for real (non-debug) symbol definitions.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 3db11b98b706564dd821f95e9c1b3a7af29f636f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db11b98b706564dd821f95e9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:05:49 2009 -0500 dbghelp: Let stabs_parse call back for real (non-debug) symbol definitions. --- dlls/dbghelp/dbghelp_private.h | 7 ++++++- dlls/dbghelp/elf_module.c | 3 ++- dlls/dbghelp/pe_module.c | 3 ++- dlls/dbghelp/stabs.c | 17 ++++++++++++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 132a6b9..5d3f401 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -487,9 +487,14 @@ extern unsigned source_new(struct module* module, const char* basedir, const extern const char* source_get(const struct module* module, unsigned idx); /* stabs.c */ +typedef void (*stabs_def_cb)(struct module* module, unsigned long load_offset, + const char* name, unsigned long offset, + BOOL is_public, BOOL is_global, unsigned char other, + struct symt_compiland* compiland, void* user); extern BOOL stabs_parse(struct module* module, unsigned long load_offset, const void* stabs, int stablen, - const char* strs, int strtablen); + const char* strs, int strtablen, + stabs_def_cb callback, void* user); /* dwarf.c */ extern BOOL dwarf2_parse(struct module* module, unsigned long load_offset, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 820c972..3b6c7cc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1039,7 +1039,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, /* OK, now just parse all of the stabs. */ lret = stabs_parse(module, module->elf_info->elf_addr, stab, elf_get_map_size(&stab_sect), - stabstr, elf_get_map_size(&stabstr_sect)); + stabstr, elf_get_map_size(&stabstr_sect), + NULL, NULL); if (lret) /* and fill in the missing information for stabs */ elf_finish_stabs_info(module, ht_symtab); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 4e77790..91c7d80 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -72,7 +72,8 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, RtlImageRvaToVa(nth, mapping, stabs, NULL), stabsize, RtlImageRvaToVa(nth, mapping, stabstr, NULL), - stabstrsize); + stabstrsize, + NULL, NULL); } TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load"); diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 58c7783..aeac9cb 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1191,7 +1191,8 @@ static void stabs_finalize_function(struct module* module, struct symt_function* BOOL stabs_parse(struct module* module, unsigned long load_offset, const void* pv_stab_ptr, int stablen, - const char* strs, int strtablen) + const char* strs, int strtablen, + stabs_def_cb callback, void* user) { struct symt_function* curr_func = NULL; struct symt_block* block = NULL; @@ -1547,6 +1548,20 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_OSO: /* Always ignore these, they seem to be used only on Darwin. */ break; + case N_ABS: + /* FIXME: Other definition types (N_TEXT, N_DATA, N_BSS, ...)? */ + if (callback) + { + BOOL is_public = (stab_ptr->n_type & N_EXT); + BOOL is_global = is_public; + + if (*ptr == '_') ptr++; + stab_strcpy(symname, sizeof(symname), ptr); + + callback(module, load_offset, symname, stab_ptr->n_value, + is_public, is_global, stab_ptr->n_other, compiland, user); + } + break; default: ERR("Unknown stab type 0x%02x\n", type); break;

1 0

Ken Thomases : dbghelp/stabs: Decode the Stabs type more carefully.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 82a3f8fcb22f3180f45aa86f7ecd24aa3a9516bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a3f8fcb22f3180f45aa86f7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:05:42 2009 -0500 dbghelp/stabs: Decode the Stabs type more carefully. --- dlls/dbghelp/stabs.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 6605c96..58c7783 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -63,9 +63,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); +/* Masks for n_type field */ +#ifndef N_STAB +#define N_STAB 0xe0 +#endif +#ifndef N_TYPE +#define N_TYPE 0x1e +#endif +#ifndef N_EXT +#define N_EXT 0x01 +#endif + +/* Values for (n_type & N_TYPE) */ #ifndef N_UNDF #define N_UNDF 0x00 #endif +#ifndef N_ABS +#define N_ABS 0x02 +#endif #define N_GSYM 0x20 #define N_FUN 0x24 @@ -1197,6 +1212,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, struct pending_block pending; BOOL ret = TRUE; struct location loc; + unsigned char type; nstab = stablen / sizeof(struct stab_nlist); strs_end = strs + strtablen; @@ -1244,8 +1260,13 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, ptr = stabbuff; } + if (stab_ptr->n_type & N_STAB) + type = stab_ptr->n_type; + else + type = (stab_ptr->n_type & N_TYPE); + /* only symbol entries contain a typedef */ - switch (stab_ptr->n_type) + switch (type) { case N_GSYM: case N_LCSYM: @@ -1275,7 +1296,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, } } - switch (stab_ptr->n_type) + switch (type) { case N_GSYM: /* @@ -1527,7 +1548,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, /* Always ignore these, they seem to be used only on Darwin. */ break; default: - ERR("Unknown stab type 0x%02x\n", stab_ptr->n_type); + ERR("Unknown stab type 0x%02x\n", type); break; } stabbuff[0] = '\0';

1 0

Ken Thomases : dbghelp/stabs: Ignore the N_OSO type used on Darwin.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 1ecd634c4b377c752ab45b8560de84ec9ea70750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecd634c4b377c752ab45b856… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:05:32 2009 -0500 dbghelp/stabs: Ignore the N_OSO type used on Darwin. --- dlls/dbghelp/stabs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index cbc0e2f..6605c96 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -79,6 +79,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_SLINE 0x44 #define N_ENSYM 0x4e #define N_SO 0x64 +#define N_OSO 0x66 #define N_LSYM 0x80 #define N_BINCL 0x82 #define N_SOL 0x84 @@ -1522,6 +1523,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; case N_BNSYM: case N_ENSYM: + case N_OSO: /* Always ignore these, they seem to be used only on Darwin. */ break; default:

1 0

Ken Thomases : dbghelp/stabs: Translate additional register codes.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 1f4ddbaed9b985d2167d322fb96acc8a4825b4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4ddbaed9b985d2167d322fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 09:05:27 2009 -0500 dbghelp/stabs: Translate additional register codes. --- dlls/dbghelp/stabs.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 3cba34f..cbc0e2f 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1354,6 +1354,22 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 17: case 18: case 19: loc.reg = CV_REG_ST0 + stab_ptr->n_value - 12; break; + case 21: + case 22: + case 23: + case 24: + case 25: + case 26: + case 27: + case 28: loc.reg = CV_REG_XMM0 + stab_ptr->n_value - 21; break; + case 29: + case 30: + case 31: + case 32: + case 33: + case 34: + case 35: + case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; default: FIXME("Unknown register value (%lu)\n", stab_ptr->n_value); loc.reg = CV_REG_NONE;

1 0

Henri Verbeet : wined3d: Remove the shader_color_fixup field from IWineD3DBaseTextureClass.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: e3bcc7544c40dc386868aba21b8506d0bd649db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bcc7544c40dc386868aba21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:15 2009 +0100 wined3d: Remove the shader_color_fixup field from IWineD3DBaseTextureClass. This is redundant now. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 683c9f4..52df212 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1067,7 +1067,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, tmpW = max(1, tmpW >> 1); tmpH = max(1, tmpH >> 1); } - object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = texture_internal_preload; TRACE("(%p) : Created texture %p\n", This, object); @@ -1188,7 +1187,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa tmpH = max(1, tmpH >> 1); tmpD = max(1, tmpD >> 1); } - object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = volumetexture_internal_preload; *ppVolumeTexture = (IWineD3DVolumeTexture *) object; @@ -1386,7 +1384,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } tmpW = max(1, tmpW >> 1); } - object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = cubetexture_internal_preload; TRACE("(%p) : Created Cube Texture %p\n", This, object); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 3d32635..68dd801 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -468,7 +468,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue; } - args->color_fixup[i] = tex->baseTexture.shader_color_fixup; + args->color_fixup[i] = tex->resource.format_desc->color_fixup; } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6d19010..e6a6de0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2105,7 +2105,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting texture = (IWineD3DBaseTextureImpl *) stateblock->textures[i]; if(texture) { - settings->op[i].color_fixup = texture->baseTexture.shader_color_fixup; + settings->op[i].color_fixup = texture->resource.format_desc->color_fixup; if(ignore_textype) { settings->op[i].tex_type = tex_1d; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8ed82fc..570ab7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1336,7 +1336,6 @@ typedef struct IWineD3DBaseTextureClass BOOL is_srgb; const struct min_lookup *minMipLookup; const GLenum *magLookup; - struct color_fixup_desc shader_color_fixup; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass;

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
84
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 2009