From: Nicolas Pitre Date: Fri, 23 Oct 2009 03:23:44 +0000 (-0400) Subject: Ferocion: fix corruption of r0 when resuming Thumb mode X-Git-Tag: v0.3.0-rc0~41 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=517e812de3782a6b592cb69416d1327a9b94ac9f;p=openocd Ferocion: fix corruption of r0 when resuming Thumb mode The wrong variable (pc instead of r0) was used. Furthermore, someone did cover this error by stupidly silencing the compiler warning that occurred before a dummy void reference to r0 was added to the code. Signed-off-by: David Brownell --- diff --git a/src/target/feroceon.c b/src/target/feroceon.c index 8eea33e3..f084201e 100644 --- a/src/target/feroceon.c +++ b/src/target/feroceon.c @@ -335,7 +335,6 @@ void feroceon_branch_resume_thumb(target_t *target) arm_jtag_t *jtag_info = &arm7_9->jtag_info; uint32_t r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32); uint32_t pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32); - (void)(r0); // use R0... arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0); arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0); @@ -351,7 +350,7 @@ void feroceon_branch_resume_thumb(target_t *target) arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0); arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0); - arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, pc, NULL, 0); + arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, r0, NULL, 0); arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0); arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);