Skip to content

W
wine-cw
Commit 233cb06f authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Alexandre Julliard
Browse files
Options

Bugfix: (E)IP-relative offsets depend on operand, not address, size.

parent 8388f675
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
debugger/db_disasm.c
View file @ 233cb06f
...@@ -1552,17 +1552,17 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display ) ...@@ -1552,17 +1552,17 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display )
break; break;
} }
if (short_addr) { if (size == WORD) {
/* offset only affects low 16 bits */ /* offset only affects low 16 bits */
displ = (addr->off & 0xffff0000) displ = (addr->off & 0xffff0000)
| ((addr->off + displ) & 0xffff); | ((addr->off + displ) & 0xffff);
} }
else displ += addr->off; else displ += addr->off;
db_task_printsym(displ, short_addr ? WORD : LONG); db_task_printsym(displ, size);
break; break;
case Dl: case Dl:
if (short_addr) { if (size == WORD) {
get_value_inc(displ, addr, 2, TRUE); get_value_inc(displ, addr, 2, TRUE);
/* offset only affects low 16 bits */ /* offset only affects low 16 bits */
displ = (addr->off & 0xffff0000) displ = (addr->off & 0xffff0000)
...@@ -1576,7 +1576,7 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display ) ...@@ -1576,7 +1576,7 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display )
{ {
break; break;
} }
db_task_printsym( displ, short_addr ? WORD : LONG); db_task_printsym( displ, size );
break; break;
case o1: case o1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment