From: kub <derkub@gmail.com>
Date: Thu, 25 Jun 2020 14:49:17 +0000 (+0200)
Subject: sh2 drc, fix for SH2 T handling in Mips/RiscV
X-Git-Tag: v2.00~726
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c95d9f57eaac320c3d6725333d7f11d590ac70;p=picodrive.git

sh2 drc, fix for SH2 T handling in Mips/RiscV
---

diff --git a/cpu/drc/emit_mips.c b/cpu/drc/emit_mips.c
index 1c98ac04..fb7de366 100644
--- a/cpu/drc/emit_mips.c
+++ b/cpu/drc/emit_mips.c
@@ -1801,7 +1801,7 @@ static void emith_set_t_cond(int sr, int cond)
                   EMIT(MIPS_SLTU_IMM(AT,AT, 1)); r=AT; val++; break;
       } else if ((b>>5) == OP_BNE) {
                   EMIT(MIPS_XOR_REG(AT, r, b&0x1f));
-                  EMIT(MIPS_SLTU_IMM(AT,Z0,AT)); r=AT; val++; break;
+                  EMIT(MIPS_SLTU_REG(AT,Z0,AT)); r=AT; val++; break;
       }
   }
   if (val) {
diff --git a/cpu/drc/emit_riscv.c b/cpu/drc/emit_riscv.c
index ab6c4fd0..de99d4fd 100644
--- a/cpu/drc/emit_riscv.c
+++ b/cpu/drc/emit_riscv.c
@@ -1601,28 +1601,21 @@ static void emith_set_t_cond(int sr, int cond)
   u32 val = 0, inv = 0;
 
   // try to avoid jumping around if possible
-  if (emith_cmp_rs >= 0) {
-    if (emith_cmp_rt >= 0)
-      b = emith_cmpr_check(emith_cmp_rs, emith_cmp_rt,  cond, &r, &s);
-    else
-      b = emith_cmpi_check(emith_cmp_rs, emith_cmp_imm, cond, &r, &s);
-  } else {
-    b = emith_cond_check(cond, &r, &s);
-    if (r == Z0) {
-      if (b == F1_BEQ || b == F1_BGE || b == F1_BGEU)
-        emith_or_r_imm(sr, T);
-      return;
-    } else if (r == FC)
-      val++, inv = (b == F1_BEQ);
-  }
+  b = emith_cond_check(cond, &r, &s);
+  if (r == Z0) {
+    if (b == F1_BEQ || b == F1_BGE || b == F1_BGEU)
+      emith_or_r_imm(sr, T);
+    return;
+  } else if (r == FC)
+    val++, inv = (b == F1_BEQ);
 
   if (!val) switch (b) {
   case F1_BEQ:  if (s == Z0) { EMIT(R5_SLTU_IMM(AT,r ,1)); r=AT; val++; break; }
                 EMIT(R5_XOR_REG(AT, r, s));
                 EMIT(R5_SLTU_IMM(AT,AT, 1)); r=AT; val++; break;
-  case F1_BNE:  if (s == Z0) { EMIT(R5_SLTU_IMM(AT,Z0,r)); r=AT; val++; break; }
+  case F1_BNE:  if (s == Z0) { EMIT(R5_SLTU_REG(AT,Z0,r)); r=AT; val++; break; }
                 EMIT(R5_XOR_REG(AT, r, s));
-                EMIT(R5_SLTU_IMM(AT,Z0,AT)); r=AT; val++; break;
+                EMIT(R5_SLTU_REG(AT,Z0,AT)); r=AT; val++; break;
   case F1_BLTU: EMIT(R5_SLTU_REG(AT, r, s)); r=AT; val++; break;
   case F1_BGEU: EMIT(R5_SLTU_REG(AT, r, s)); r=AT; val++; inv++; break;
   case F1_BLT:  EMIT(R5_SLT_REG(AT, r, s)); r=AT; val++; break;