Correctly restore pc after an exception occured in Thumb mode.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4211 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-arm/translate.c b/target-arm/translate.c
index afa368a..4678586 100644 (file)
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -905,11 +905,6 @@ static inline void gen_set_pc_im(uint32_t val)
     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 int gen_set_psr_T0(DisasContext *s, uint32_t mask, int spsr)
 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);