qdev/pci: misc fixes.

[qemu.git] / target-cris / translate.c

diff --git a/target-cris/translate.c b/target-cris/translate.c
index e12be4ef117c5f000028f44ef77152766235d0e2..fd9380cf60c12d96cc6cbd62df1397396e5df4ea 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
@@ -957,7 +956,8 @@ static void gen_tst_cc (DisasContext *dc, TCGv cc, int cond)
                                else if (dc->cc_size == 2)
                                        bits = 15;      
 
-                               tcg_gen_shri_tl(cc, cc_result, 31);
+                               tcg_gen_shri_tl(cc, cc_result, bits);
+                               tcg_gen_andi_tl(cc, cc, 1);
                        }
                        else {
                                cris_evaluate_flags(dc);
@@ -2392,7 +2392,7 @@ static unsigned int dec_test_m(DisasContext *dc)
        TCGv t[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("test.%d [$r%u%s] op2=%x\n",
+       LOG_DIS("test.%c [$r%u%s] op2=%x\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2);
@@ -2416,7 +2416,7 @@ static unsigned int dec_and_m(DisasContext *dc)
        TCGv t[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("and.%d [$r%u%s, $r%u\n",
+       LOG_DIS("and.%c [$r%u%s, $r%u\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2);
@@ -2435,7 +2435,7 @@ static unsigned int dec_add_m(DisasContext *dc)
        TCGv t[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("add.%d [$r%u%s, $r%u\n",
+       LOG_DIS("add.%c [$r%u%s, $r%u\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2);
@@ -2455,7 +2455,7 @@ static unsigned int dec_addo_m(DisasContext *dc)
        TCGv t[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("add.%d [$r%u%s, $r%u\n",
+       LOG_DIS("add.%c [$r%u%s, $r%u\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2);
@@ -2474,7 +2474,7 @@ static unsigned int dec_bound_m(DisasContext *dc)
        TCGv l[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("bound.%d [$r%u%s, $r%u\n",
+       LOG_DIS("bound.%c [$r%u%s, $r%u\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2);
@@ -2537,7 +2537,7 @@ static unsigned int dec_or_m(DisasContext *dc)
        TCGv t[2];
        int memsize = memsize_zz(dc);
        int insn_len;
-       LOG_DIS("or.%d [$r%u%s, $r%u pc=%x\n",
+       LOG_DIS("or.%c [$r%u%s, $r%u pc=%x\n",
                    memsize_char(memsize),
                    dc->op1, dc->postinc ? "+]" : "]",
                    dc->op2, dc->pc);
@@ -2692,8 +2692,8 @@ static unsigned int dec_move_rm(DisasContext *dc)
 
        memsize = memsize_zz(dc);
 
-       LOG_DIS("move.%d $r%u, [$r%u]\n",
-                    memsize, dc->op2, dc->op1);
+       LOG_DIS("move.%c $r%u, [$r%u]\n",
+                    memsize_char(memsize), dc->op2, dc->op1);
 
        /* prepare store.  */
        cris_flush_cc_state(dc);