Commit: 8d3e670a0d1a4ca21fa99f4ff366ac166e45a723 - qemu (git)

Commit MetaInfo

• Révision: 8d3e670a0d1a4ca21fa99f4ff366ac166e45a723 (tree)
• l'heure: 2019-01-13 22:57:43
• Auteur: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Message de Log

bnot fix

Change Summary

• modified: target/rx/translate.c

Modification

--- a/target/rx/translate.c
+++ b/target/rx/translate.c
@@ -1926,15 +1926,6 @@ DEFINE_INSN(bnot1)
     dc->pc += 3;
 }
 
-DEFINE_INSN(bnot3)
-{
-    int imm, rd;
-    imm = (insn >> 16) & 31;
-    rd = (insn >> 8) & 15;
-    tcg_gen_xori_i32(cpu_regs[rd], cpu_regs[rd], 1 << imm);
-    dc->pc += 3;
-}
-
 DEFINE_INSN(bmcnd1)
 {
     int imm, id, rd;
@@ -1975,17 +1966,22 @@ DEFINE_INSN(bmcnd2)
     imm = (insn >> 16) & 31;
     cd = tcg_const_local_i32((insn >> 12) & 15);
     rd = (insn >> 8) & 15;
-    result = tcg_temp_local_new();
-    gen_helper_cond(result, cpu_env, cd);
-    tcg_gen_brcondi_i32(TCG_COND_NE, result, 0, l1);
-    tcg_gen_andi_i32(cpu_regs[rd], cpu_regs[rd], ~(1 << imm));
-    tcg_gen_br(l2);
-    gen_set_label(l1);
-    tcg_gen_ori_i32(cpu_regs[rd], cpu_regs[rd], 1 << imm);
-    gen_set_label(l2);
-    dc->pc += 3;
+    if (((insn >> 12) & 15) == 15) {
+        /* special case bnot #imm, reg */
+        tcg_gen_xori_i32(cpu_regs[rd], cpu_regs[rd], 1 << imm);
+    } else {
+        result = tcg_temp_local_new();
+        gen_helper_cond(result, cpu_env, cd);
+        tcg_gen_brcondi_i32(TCG_COND_NE, result, 0, l1);
+        tcg_gen_andi_i32(cpu_regs[rd], cpu_regs[rd], ~(1 << imm));
+        tcg_gen_br(l2);
+        gen_set_label(l1);
+        tcg_gen_ori_i32(cpu_regs[rd], cpu_regs[rd], 1 << imm);
+        gen_set_label(l2);
+        tcg_temp_free(result);
+    }
     tcg_temp_free(cd);
-    tcg_temp_free(result);
+    dc->pc += 3;
 }
 
 DEFINE_INSN(scmpu)
@@ -2745,7 +2741,6 @@ struct op {
     OPTABLE(0x7a00, 0xfe00, bop3)
     OPTABLE(0xfce0, 0xffe0, bnot1)
     OPTABLE(0xfc6c, 0xfffc, bop2)
-    OPTABLE(0xfde0, 0xffe0, bnot3)
     OPTABLE(0xf000, 0xfc08, bop1)
     OPTABLE(0xfc60, 0xfffc, bop2)
     OPTABLE(0x7800, 0xfe00, bop3)