winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
783 discussions
Start a n
N
ew thread
Eric Pouech : winedbg: Implemented is_step_over method for x86-64 CPU.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 4f4e38ce40b9590d828ba1a326b9cd59da000e0c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4f4e38ce40b9590d828ba1a32…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:57 2010 +0100 winedbg: Implemented is_step_over method for x86-64 CPU. --- programs/winedbg/be_x86_64.c | 57 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 4cc5162..a0e5637 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -164,8 +164,61 @@ static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) static unsigned be_x86_64_is_step_over_insn(const void* insn) { - dbg_printf("not done step_over_insn\n"); - return FALSE; + BYTE ch; + + for (;;) + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + + switch (ch) + { + /* Skip all prefixes */ + case 0x2e: /* cs: */ + case 0x36: /* ss: */ + case 0x3e: /* ds: */ + case 0x26: /* es: */ + case 0x64: /* fs: */ + case 0x65: /* gs: */ + case 0x66: /* opcode size prefix */ + case 0x67: /* addr size prefix */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + insn = (const char*)insn + 1; + continue; + + /* Handle call instructions */ + case 0xcd: /* int <intno> */ + case 0xe8: /* call <offset> */ + case 0x9a: /* lcall <seg>:<off> */ + return TRUE; + + case 0xff: /* call <regmodrm> */ + if (!dbg_read_memory((const char*)insn + 1, &ch, sizeof(ch))) + return FALSE; + return (((ch & 0x38) == 0x10) || ((ch & 0x38) == 0x18)); + + /* Handle string instructions */ + case 0x6c: /* insb */ + case 0x6d: /* insw */ + case 0x6e: /* outsb */ + case 0x6f: /* outsw */ + case 0xa4: /* movsb */ + case 0xa5: /* movsw */ + case 0xa6: /* cmpsb */ + case 0xa7: /* cmpsw */ + case 0xaa: /* stosb */ + case 0xab: /* stosw */ + case 0xac: /* lodsb */ + case 0xad: /* lodsw */ + case 0xae: /* scasb */ + case 0xaf: /* scasw */ + return TRUE; + + default: + return FALSE; + } + } } static unsigned be_x86_64_is_function_return(const void* insn)
1
0
0
0
Eric Pouech : winedbg: Implemented is_break_insn for x86-64 CPUs.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 9ed8d56ed2dc24b33c654a0db8489af8bac16787 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9ed8d56ed2dc24b33c654a0db…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:51 2010 +0100 winedbg: Implemented is_break_insn for x86-64 CPUs. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index e2cdc12..4cc5162 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -176,8 +176,8 @@ static unsigned be_x86_64_is_function_return(const void* insn) static unsigned be_x86_64_is_break_insn(const void* insn) { - dbg_printf("not done is_break_insn\n"); - return FALSE; + BYTE c; + return dbg_read_memory(insn, &c, sizeof(c)) && c == 0xCC; } static unsigned be_x86_64_is_func_call(const void* insn, ADDRESS64* callee)
1
0
0
0
Eric Pouech : winedbg: Implemented is_function_return method for x86-64 CPU .
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 6979ea7d5bb62921f1817388c1d203bce045dca2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6979ea7d5bb62921f1817388c…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:46 2010 +0100 winedbg: Implemented is_function_return method for x86-64 CPU. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 42cdcab..e2cdc12 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -170,8 +170,8 @@ static unsigned be_x86_64_is_step_over_insn(const void* insn) static unsigned be_x86_64_is_function_return(const void* insn) { - dbg_printf("not done is_function_return\n"); - return FALSE; + BYTE c; + return dbg_read_memory(insn, &c, sizeof(c)) && ((c == 0xC2) || (c == 0xC3)); } static unsigned be_x86_64_is_break_insn(const void* insn)
1
0
0
0
Eric Pouech : winedbg: Implement float fetching for x86-64 debugger.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 7d3a9c6ffd5d57e869741c2a14d2e7c762904bc7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7d3a9c6ffd5d57e869741c2a1…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:40 2010 +0100 winedbg: Implement float fetching for x86-64 debugger. --- programs/winedbg/be_i386.c | 2 +- programs/winedbg/be_x86_64.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index e805a80..6ab5970 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -726,7 +726,7 @@ static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - char tmp[12]; + char tmp[sizeof(long double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 3a111af..42cdcab 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -364,11 +364,25 @@ static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned siz return TRUE; } -static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, +static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("not done fetch_float\n"); - return FALSE; + char tmp[sizeof(long double)]; + + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (!memory_read_value(lvalue, size, tmp)) return FALSE; + + /* float & double types have to be promoted to a long double */ + switch (size) + { + case sizeof(float): *ret = *(float*)tmp; break; + case sizeof(double): *ret = *(double*)tmp; break; + case sizeof(long double): *ret = *(long double*)tmp; break; + default: return FALSE; + } + return TRUE; } struct backend_cpu be_x86_64 =
1
0
0
0
Eric Pouech : winedbg: Added some more instructions disassembly.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 7c9cd44965c55ea4df13584d32cde1376ad761af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7c9cd44965c55ea4df13584d3…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:34 2010 +0100 winedbg: Added some more instructions disassembly. --- programs/winedbg/db_disasm64.c | 83 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index cb1a174..7cb3475 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -155,6 +155,11 @@ static void db_printsym(db_addr_t addr, unsigned unused) #define Ril 36 /* long register in instruction */ #define Iba 37 /* byte immediate, don't print if 0xa */ #define EL 38 /* address, explicitly long size */ +/* Wine extensions */ +#define MX 39 /* special register (MMX reg %mm0-7) */ +#define EMX 40 /* special register (MMX reg %mm0-7) */ +#define XMM 41 /* special register (floating point reg %xmm0-7) */ +#define EXMM 42 /* special register (floating point reg %xmm0-7) */ struct inst { const char * i_name; /* name */ @@ -322,6 +327,66 @@ static const struct inst db_inst_0f4x[] = { /*4f*/ { "cmovnle",TRUE, NONE, op2(E, R), 0 }, }; +static const struct inst db_inst_0f5x[] = { +/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +}; + +static const struct inst db_inst_0f6x[] = { +/*60*/ { "punpcklbw", TRUE, NONE, op2(E, MX), 0 }, +/*61*/ { "punpcklwd", TRUE, NONE, op2(E, MX), 0 }, +/*62*/ { "punpckldq", TRUE, NONE, op2(E, MX), 0 }, +/*63*/ { "packsswb", TRUE, NONE, op2(E, MX), 0 }, +/*64*/ { "pcmpgtb", TRUE, NONE, op2(E, MX), 0 }, +/*65*/ { "pcmpgtw", TRUE, NONE, op2(E, MX), 0 }, +/*66*/ { "pcmpgtd", TRUE, NONE, op2(E, MX), 0 }, +/*67*/ { "packuswb", TRUE, NONE, op2(E, MX), 0 }, + +/*68*/ { "punpckhbw", TRUE, NONE, op2(E, MX), 0 }, +/*69*/ { "punpckhwd", TRUE, NONE, op2(E, MX), 0 }, +/*6a*/ { "punpckhdq", TRUE, NONE, op2(E, MX), 0 }, +/*6b*/ { "packssdw", TRUE, NONE, op2(E, MX), 0 }, +/*6c*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*6d*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*6e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, +/*6f*/ { "movq", TRUE, NONE, op2(E, MX), 0 }, +}; + +static const struct inst db_inst_0f7x[] = { +/*70*/ { "pshufw", TRUE, NONE, op2(MX, EMX), 0 }, +/*71*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 12 */ +/*72*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 13 */ +/*73*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 14 */ +/*74*/ { "pcmpeqb", TRUE, NONE, op2(E, MX), 0 }, +/*75*/ { "pcmpeqw", TRUE, NONE, op2(E, MX), 0 }, +/*76*/ { "pcmpeqd", TRUE, NONE, op2(E, MX), 0 }, +/*77*/ { "emms", FALSE,NONE, 0, 0 }, + +/*78*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*79*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7a*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7b*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7c*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7d*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, +/*7f*/ { "movq", TRUE, NONE, op2(EMX, MX), 0 }, +}; + static const struct inst db_inst_0f8x[] = { /*80*/ { "jo", FALSE, NONE, op1(Dl), 0 }, /*81*/ { "jno", FALSE, NONE, op1(Dl), 0 }, @@ -427,9 +492,9 @@ static const struct inst * const db_inst_0f[] = { db_inst_0f2x, db_inst_0f3x, db_inst_0f4x, - 0, - 0, - 0, + db_inst_0f5x, + db_inst_0f6x, + db_inst_0f7x, db_inst_0f8x, db_inst_0f9x, db_inst_0fax, @@ -1558,6 +1623,18 @@ db_disasm(db_addr_t loc, boolean_t altfmt) get_value_inc(imm2, loc, 2, FALSE); /* segment */ db_printf("$%#x,%#x", imm2, imm); break; + case MX: + db_printf("%%mm%d", f_reg(rex, regmodrm)); + break; + case EMX: + db_printf("%%mm%d", f_rm(rex, regmodrm)); + break; + case XMM: + db_printf("%%xmm%d", f_reg(rex, regmodrm)); + break; + case EXMM: + db_printf("%%xmm%d", f_rm(rex, regmodrm)); + break; } } return (loc);
1
0
0
0
Eric Pouech : winedbg: Fix 32bit displacement sign extension.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 4b8b07834444d700146bfc74c02ae4f546a8da26 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4b8b07834444d700146bfc74c…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:28 2010 +0100 winedbg: Fix 32bit displacement sign extension. --- programs/winedbg/db_disasm64.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index a11ad1f..cb1a174 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -1205,6 +1205,7 @@ db_disasm(db_addr_t loc, boolean_t altfmt) long imm64; int len; struct i_addr address; + db_addr_t addr; get_value_inc(inst, loc, 1, FALSE); short_addr = FALSE; @@ -1528,19 +1529,19 @@ db_disasm(db_addr_t loc, boolean_t altfmt) case Db: get_value_inc(displ, loc, 1, TRUE); - displ += loc; + addr = loc + (LONG64)displ; if (size == WORD) - displ &= 0xFFFF; - db_printsym((db_addr_t)displ, DB_STGY_XTRN); + addr &= 0xFFFF; + db_printsym(addr, DB_STGY_XTRN); break; case Dl: len = db_lengths[(size == LONG && (rex & REX_W)) ? QUAD : size]; get_value_inc(displ, loc, len, FALSE); - displ += loc; + addr = loc + (LONG64)displ; if (size == WORD) - displ &= 0xFFFF; - db_printsym((db_addr_t)displ, DB_STGY_XTRN); + addr &= 0xFFFF; + db_printsym(addr, DB_STGY_XTRN); break; case o1:
1
0
0
0
Eric Pouech : winedbg: Add disassembly capacity to x86-64 backend.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 7f1105e6567f46440871ff09ee8b45f99db1b2ae URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f1105e6567f46440871ff09e…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:19 2010 +0100 winedbg: Add disassembly capacity to x86-64 backend. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_x86_64.c | 5 +- programs/winedbg/db_disasm64.c | 1569 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1571 insertions(+), 4 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f1105e6567f46440871f…
1
0
0
0
Eric Pouech : winedbg: For x86-64 CPU, fix $rip variable definition.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: e1b677dcd189e8e4cab8f53b8abc30cf00e272e7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e1b677dcd189e8e4cab8f53b8…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:14 2010 +0100 winedbg: For x86-64 CPU, fix $rip variable definition. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 1ef52b8..cc23c95 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -133,7 +133,7 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_GS, "GS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegGs), dbg_itype_unsigned_short_int}, {CV_AMD64_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, {CV_AMD64_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, - {CV_AMD64_RIP, "RIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_int}, + {CV_AMD64_RIP, "RIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_long_int}, {CV_AMD64_RAX, "RAX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_long_int}, {CV_AMD64_RBX, "RBX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_long_int}, {CV_AMD64_RCX, "RCX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_long_int}, @@ -150,7 +150,7 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, - {0, NULL, 0, dbg_itype_none} + {0, NULL, 0, dbg_itype_none} }; static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx)
1
0
0
0
Eric Pouech : winedbg: Extend print_typed_basic to handle unicode strings.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: f91948ad94b1a7c8d3dd31cc5b3829cbacf2cb09 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f91948ad94b1a7c8d3dd31cc5…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:07 2010 +0100 winedbg: Extend print_typed_basic to handle unicode strings. --- programs/winedbg/memory.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index e4f4729..c8ceeb1 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -347,6 +347,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) DWORD tag, size, count, bt; struct dbg_type type = lvalue->type; struct dbg_type sub_type; + struct dbg_lvalue sub_lvalue; if (!types_get_real_type(&type, &tag)) return; @@ -383,6 +384,11 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) print_char: if (size == 1 && (val_int < 0x20 || val_int > 0x80)) dbg_printf("%d", (int)val_int); + else if (size == 2) + { + WCHAR wch = (WCHAR)val_int; + dbg_outputW(&wch, 1); + } else dbg_printf("'%c'", (char)val_int); break; @@ -396,32 +402,31 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; case SymTagPointerType: - if (!memory_read_value(lvalue, sizeof(void*), &val_ptr)) return; - - sub_type.module = lvalue->type.module; - if (!types_get_info(&type, TI_GET_TYPE, &sub_type.id) || - sub_type.id == dbg_itype_none) + if (!types_deref(lvalue, &sub_lvalue)) { - dbg_printf("Internal symbol error: unable to access memory location %p", val_ptr); + dbg_printf("Internal symbol error: unable to access memory location %p", + memory_to_linear_addr(&lvalue->addr)); break; } - if (!types_get_real_type(&sub_type, &tag)) return; - - if (types_get_info(&sub_type, TI_GET_SYMTAG, &tag) && tag == SymTagBaseType && - types_get_info(&sub_type, TI_GET_BASETYPE, &bt) && (bt == btChar || bt == btInt) && - types_get_info(&sub_type, TI_GET_LENGTH, &size64) && size64 == 1) + val_ptr = memory_to_linear_addr(&sub_lvalue.addr); + if (types_get_real_type(&sub_lvalue.type, &tag) && tag == SymTagBaseType && + types_get_info(&sub_lvalue.type, TI_GET_BASETYPE, &bt) && + types_get_info(&sub_lvalue.type, TI_GET_LENGTH, &size64)) { char buffer[1024]; if (!val_ptr) dbg_printf("0x0"); - else if (memory_get_string(dbg_curr_process, val_ptr, - lvalue->cookie == DLV_TARGET, - size64 == 2, buffer, sizeof(buffer))) - dbg_printf("\"%s\"", buffer); - else - dbg_printf("*** invalid address %p ***", val_ptr); + else if (((bt == btChar || bt == btInt) && size64 == 1) || (bt == btUInt && size64 == 2)) + { + if (memory_get_string(dbg_curr_process, val_ptr, sub_lvalue.cookie == DLV_TARGET, + size64 == 2, buffer, sizeof(buffer))) + dbg_printf("\"%s\"", buffer); + else + dbg_printf("*** invalid address %p ***", val_ptr); + break; + } } - else dbg_printf("%p", val_ptr); + dbg_printf("%p", val_ptr); break; case SymTagArrayType: case SymTagUDT:
1
0
0
0
Michael Stefaniuc : user32: Avoid using HIWORD() on atoms/resources.
by Alexandre Julliard
04 Feb '10
04 Feb '10
Module: wine Branch: master Commit: 0a22cd2b8f85fc7c89e91302e6f4bd38b5c7d27b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0a22cd2b8f85fc7c89e91302e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 3 21:04:27 2010 +0100 user32: Avoid using HIWORD() on atoms/resources. --- dlls/user32/class.c | 10 +++++----- dlls/user32/cursoricon.c | 2 +- dlls/user32/defwnd.c | 4 ++-- dlls/user32/dialog.c | 8 ++++---- dlls/user32/hook.c | 8 ++++---- dlls/user32/message.c | 16 ++++++++-------- dlls/user32/msgbox.c | 30 +++++++++++++++--------------- dlls/user32/property.c | 12 ++++++------ dlls/user32/resource.c | 2 +- 9 files changed, 46 insertions(+), 46 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a22cd2b8f85fc7c89e91…
1
0
0
0
← Newer
1
...
56
57
58
59
60
61
62
...
79
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200