[Qemu-devel] [4211] Correctly restore pc after an exception occured in Thumb mode.

[Andrzej Zaborowski]

Revision: 4211
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4211
Author:   balrog
Date:     2008-04-14 19:14:06 +0000 (Mon, 14 Apr 2008)

Log Message:
-----------
Correctly restore pc after an exception occured in Thumb mode.

Modified Paths:
--------------
    trunk/target-arm/translate.c

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c        2008-04-14 02:19:57 UTC (rev 4210)
+++ trunk/target-arm/translate.c        2008-04-14 19:14:06 UTC (rev 4211)
@@ -905,11 +905,6 @@
     store_cpu_field(tmp, regs[15]);
 }
 
-static inline void gen_set_pc_T0(void)
-{
-    tcg_gen_st_i32(cpu_T[0], cpu_env, offsetof(CPUState, regs[15]));
-}
-
 static inline void gen_movl_reg_TN(DisasContext *s, int reg, int t)
 {
     TCGv tmp;
@@ -3486,7 +3481,7 @@
 static void gen_exception_return(DisasContext *s)
 {
     TCGv tmp;
-    gen_set_pc_T0();
+    gen_movl_reg_T0(s, 15);
     tmp = load_cpu_field(spsr);
     gen_set_cpsr(tmp, 0xffffffff);
     dead_tmp(tmp);