openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

CRIS: Concistent use of btarget and make it possible to single-step over delayslots. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4389 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
edgar_igl 2008-05-09 08:14:05 +00:00
parent e83a86737f
commit 73e517236c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target-cris/translate.c
View File

@ -2509,7 +2509,7 @@ static unsigned int dec_jasc_im(DisasContext *dc)
cris_cc_mask(dc, 0); cris_cc_mask(dc, 0);
/* Store the return address in Pd. */ /* Store the return address in Pd. */
tcg_gen_movi_tl(cpu_T[0], imm); tcg_gen_movi_tl(cpu_T[0], imm);
t_gen_mov_env_TN(btarget, cpu_T[0]); tcg_gen_mov_tl(env_btarget, cpu_T[0]);
tcg_gen_movi_tl(cpu_T[0], dc->pc + 8 + 4); tcg_gen_movi_tl(cpu_T[0], dc->pc + 8 + 4);
t_gen_mov_preg_TN(dc->op2, cpu_T[0]); t_gen_mov_preg_TN(dc->op2, cpu_T[0]);
cris_prepare_dyn_jmp(dc); cris_prepare_dyn_jmp(dc);
@ -2522,7 +2522,7 @@ static unsigned int dec_jasc_r(DisasContext *dc)
cris_cc_mask(dc, 0); cris_cc_mask(dc, 0);
/* Store the return address in Pd. */ /* Store the return address in Pd. */
t_gen_mov_TN_reg(cpu_T[0], dc->op1); t_gen_mov_TN_reg(cpu_T[0], dc->op1);
t_gen_mov_env_TN(btarget, cpu_T[0]); tcg_gen_mov_tl(env_btarget, cpu_T[0]);
tcg_gen_movi_tl(cpu_T[0], dc->pc + 4 + 4); tcg_gen_movi_tl(cpu_T[0], dc->pc + 4 + 4);
t_gen_mov_preg_TN(dc->op2, cpu_T[0]); t_gen_mov_preg_TN(dc->op2, cpu_T[0]);
cris_prepare_dyn_jmp(dc); cris_prepare_dyn_jmp(dc);
@ -2557,7 +2557,7 @@ static unsigned int dec_bas_im(DisasContext *dc)
cris_cc_mask(dc, 0); cris_cc_mask(dc, 0);
/* Stor the return address in Pd. */ /* Stor the return address in Pd. */
tcg_gen_movi_tl(cpu_T[0], dc->pc + simm); tcg_gen_movi_tl(cpu_T[0], dc->pc + simm);
t_gen_mov_env_TN(btarget, cpu_T[0]); tcg_gen_mov_tl(env_btarget, cpu_T[0]);
tcg_gen_movi_tl(cpu_T[0], dc->pc + 8); tcg_gen_movi_tl(cpu_T[0], dc->pc + 8);
t_gen_mov_preg_TN(dc->op2, cpu_T[0]); t_gen_mov_preg_TN(dc->op2, cpu_T[0]);
cris_prepare_dyn_jmp(dc); cris_prepare_dyn_jmp(dc);
@ -2573,7 +2573,7 @@ static unsigned int dec_basc_im(DisasContext *dc)
cris_cc_mask(dc, 0); cris_cc_mask(dc, 0);
/* Stor the return address in Pd. */ /* Stor the return address in Pd. */
tcg_gen_movi_tl(cpu_T[0], dc->pc + simm); tcg_gen_movi_tl(cpu_T[0], dc->pc + simm);
t_gen_mov_env_TN(btarget, cpu_T[0]); tcg_gen_mov_tl(env_btarget, cpu_T[0]);
tcg_gen_movi_tl(cpu_T[0], dc->pc + 12); tcg_gen_movi_tl(cpu_T[0], dc->pc + 12);
t_gen_mov_preg_TN(dc->op2, cpu_T[0]); t_gen_mov_preg_TN(dc->op2, cpu_T[0]);
cris_prepare_dyn_jmp(dc); cris_prepare_dyn_jmp(dc);
@ -2813,10 +2813,12 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
if (!logfile) if (!logfile)
logfile = stderr; logfile = stderr;
if (tb->pc & 1) /* Odd PC indicates that branch is rexecuting due to exception in the
cpu_abort(env, "unaligned pc=%x erp=%x\n", * delayslot, like in real hw.
env->pc, env->pregs[PR_ERP]); * FIXME: we need to handle the case were the branch and the insn in
pc_start = tb->pc; * the delayslot do not share pages.
*/
pc_start = tb->pc & ~1;
dc->env = env; dc->env = env;
dc->tb = tb; dc->tb = tb;
@ -2905,14 +2907,16 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
} }
} }
if (env->singlestep_enabled) /* If we are rexecuting a branch due to exceptions on
delay slots dont break. */
if (!(tb->pc & 1) && env->singlestep_enabled)
break; break;
} while (!dc->is_jmp && gen_opc_ptr < gen_opc_end } while (!dc->is_jmp && gen_opc_ptr < gen_opc_end
&& ((dc->pc < next_page_start) || dc->delayed_branch)); && ((dc->pc < next_page_start) || dc->delayed_branch));
if (dc->delayed_branch == 1) { if (dc->delayed_branch == 1) {
/* Reexecute the last insn. */ /* Reexecute the last insn. */
dc->pc = dc->ppc; dc->pc = dc->ppc | 1;
} }
if (!dc->is_jmp) { if (!dc->is_jmp) {