winedbg: Respect Thumb mode when adjusting PC on ARM.

2c5a7743 · André Hentschel · Alexandre Julliard · c6008a06 · 2c5a7743
Commit 2c5a7743 authored Mar 10, 2012 by André Hentschel Committed by Alexandre Julliard Mar 12, 2012
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

be_arm.c programs/winedbg/be_arm.c +6 -4

No files found.
--- a/programs/winedbg/be_arm.c
+++ b/programs/winedbg/be_arm.c
@@ -205,13 +205,15 @@ static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx)

 static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way)
 {
+    INT step = (ctx->Cpsr & 0x20) ? 2 : 4;
+
    if (way)
    {
-        ctx->Pc-=4;
-        return -4;
+        ctx->Pc -= step;
+        return -step;
    }
-    ctx->Pc+=4;
-    return 4;
+    ctx->Pc += step;
+    return step;
 }

 static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,