[Qemu-devel] [4944] CRIS: Correct condition for when to apply fast move flags evaluation .

[Edgar E. Iglesias]

Revision: 4944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4944
Author:   edgar_igl
Date:     2008-07-25 21:20:21 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
CRIS: Correct condition for when to apply fast move flags evaluation. Correct 
single-stepping over branches.

Modified Paths:
--------------
    trunk/target-cris/translate.c

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c       2008-07-25 21:07:21 UTC (rev 4943)
+++ trunk/target-cris/translate.c       2008-07-25 21:20:21 UTC (rev 4944)
@@ -979,7 +979,7 @@
         * 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 @@
        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) {