mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly restore pc after an exception occured in Thumb mode.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4211 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-04-14 19:14:06 +00:00
parent 5b340b51fd
commit e22f8f39f3
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target-arm/translate.c
View File

@ -905,11 +905,6 @@ static inline void gen_set_pc_im(uint32_t val)
store_cpu_field(tmp, regs[15]); 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) static inline void gen_movl_reg_TN(DisasContext *s, int reg, int t)
{ {
TCGv tmp; 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) static void gen_exception_return(DisasContext *s)
{ {
TCGv tmp; TCGv tmp;
gen_set_pc_T0(); gen_movl_reg_T0(s, 15);
tmp = load_cpu_field(spsr); tmp = load_cpu_field(spsr);
gen_set_cpsr(tmp, 0xffffffff); gen_set_cpsr(tmp, 0xffffffff);
dead_tmp(tmp); dead_tmp(tmp);