From e22f8f39f3b0856c199ef29ff75749bb201b17bc Mon Sep 17 00:00:00 2001 From: balrog Date: Mon, 14 Apr 2008 19:14:06 +0000 Subject: 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 --- target-arm/translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index afa368af6e..4678586601 100644 --- 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); -- cgit v1.2.3