From 89cc7382030bfd7b1f1c3d826c26f17c7bd761a2 Mon Sep 17 00:00:00 2001 From: edgar_igl Date: Fri, 25 Jul 2008 21:20:21 +0000 Subject: 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 --- target-cris/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'target-cris/translate.c') diff --git a/target-cris/translate.c b/target-cris/translate.c index 0c23cdf28f..c43992e351 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) { -- cgit v1.2.3