aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-25 21:20:21 +0000
committeredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-25 21:20:21 +0000
commit89cc7382030bfd7b1f1c3d826c26f17c7bd761a2 (patch)
tree575c302e9ca998db1d0922585bbd64b6059455a8 /target-cris/translate.c
parentFix OMAP GPMC register offsets and SYSCTL 8bit io (Kyungmin Park). (diff)
downloadqemu-kvm-89cc7382030bfd7b1f1c3d826c26f17c7bd761a2.tar.gz
qemu-kvm-89cc7382030bfd7b1f1c3d826c26f17c7bd761a2.tar.bz2
qemu-kvm-89cc7382030bfd7b1f1c3d826c26f17c7bd761a2.zip
CRIS: Correct condition for when to apply fast move flags evaluation. Correct single-stepping over branches.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4944 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-cris/translate.c')
-rw-r--r--target-cris/translate.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 0c23cdf28..c43992e35 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -979,7 +979,7 @@ static void gen_tst_cc (DisasContext *dc, int cond)
* code is true.
*/
arith_opt = arith_cc(dc) && !dc->flags_uptodate;
- move_opt = (dc->cc_op == CC_OP_MOVE) && !dc->flags_uptodate;
+ move_opt = (dc->cc_op == CC_OP_MOVE) && dc->flags_uptodate;
switch (cond) {
case CC_EQ:
if (arith_opt || move_opt) {
@@ -3192,7 +3192,8 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
cris_evaluate_flags (dc);
if (unlikely(env->singlestep_enabled)) {
- tcg_gen_movi_tl(env_pc, npc);
+ if (dc->is_jmp == DISAS_NEXT)
+ tcg_gen_movi_tl(env_pc, npc);
t_gen_raise_exception(EXCP_DEBUG);
} else {
switch(dc->is_jmp) {