implement vcmp comparisons

Decompollaborate · Apr 19, 2024 · 1932266 · 1932266
1 parent 60ed8ce
commit 1932266
Show file tree

Hide file tree

Showing 21 changed files with 4,926 additions and 4,535 deletions.
diff --git a/adsf.py b/adsf.py
@@ -117,6 +117,20 @@ def do_vfp3_vcmp():
             print(f"    .word 0x{VFPU3:08X} | 0x{vfpu0_fmt_tp(i):08X} | 0x{VT:08X} | 0x{VS:08X} | 0x{cond:08X}")
     func_end("vcmp_all")
 
+def do_vfp3_vcmp_zero():
+    func_start("vcmp_zero")
+    print("    # vcmp zero")
+
+    VT = vt(0)
+    VS = vs(0)
+
+    i = 0
+
+    for cond in range(1<<4):
+        for i in range(4):
+            print(f"    .word 0x{VFPU3:08X} | 0x{vfpu0_fmt_tp(i):08X} | 0x{VT:08X} | 0x{VS:08X} | 0x{cond:08X}")
+    func_end("vcmp_zero")
+
 def do_vfp4_fmt0():
     func_start("vfpu4_fmt0_all")
     print("    # VFPU4 FMT0")
@@ -220,4 +234,4 @@ def do_vfpu6():
                     print(f"    .word 0x{VFPU6:08X} | 0x{i << 23:08X} | 0x{VT:08X} | 0x{t << 15:08X} | 0x{VS:08X} | 0x{p << 7:08X} | 0x{VD:08X}")
     func_end("vfpu6_all")
 
-do_vfpu6()
+do_vfp3_vcmp_zero()
diff --git a/asdf.txt b/asdf.txt
diff --git a/cplusplus/include/generated/OperandType_enum_class.hpp b/cplusplus/include/generated/OperandType_enum_class.hpp
diff --git a/include/generated/InstrDescriptor_Descriptors_array.h b/include/generated/InstrDescriptor_Descriptors_array.h
diff --git a/include/generated/OperandType_enum.h b/include/generated/OperandType_enum.h
diff --git a/include/generated/OperandType_function_declarations.h b/include/generated/OperandType_function_declarations.h
diff --git a/include/generated/instrOpercandCallbacks_array.h b/include/generated/instrOpercandCallbacks_array.h
diff --git a/include/instructions/RabbitizerInstructionR4000Allegrex.h b/include/instructions/RabbitizerInstructionR4000Allegrex.h
@@ -50,6 +50,8 @@ extern "C" {
 #define RAB_INSTR_R4000ALLEGREX_GET_vfpu6_fmt7_fmt0_fmt(self)                   ((SHIFTR((self)->word, 16,  3) << 2) | (SHIFTR((self)->word, 15,  1) << 1) | (SHIFTR((self)->word, 7,  1)))
 #define RAB_INSTR_R4000ALLEGREX_GET_vfpu7_fmt(self)                             (SHIFTR((self)->word,   0, 26))
 
+#define RAB_INSTR_R4000ALLEGREX_GET_vcmp_cond(self)                             (SHIFTR((self)->word,   0,  4))
+
 
 #define RAB_INSTR_R4000ALLEGREX_PACK_vt(word, value)                            (BITREPACK((word), (value), 16,  7))
 #define RAB_INSTR_R4000ALLEGREX_PACK_vs(word, value)                            (BITREPACK((word), (value),  8,  7))
@@ -89,6 +91,8 @@ extern "C" {
 #define RAB_INSTR_R4000ALLEGREX_PACK_vfpu6_fmt7_fmt0_fmt(word, value)           (BITREPACK(BITREPACK(BITREPACK((word), (value) >> 2, 16,  3), (value) >> 1, 15,  1), (value),  7,  1))
 #define RAB_INSTR_R4000ALLEGREX_PACK_vfpu7_fmt(word, value)                     (BITREPACK((word), (value),  0,  26))
 
+#define RAB_INSTR_R4000ALLEGREX_PACK_vcmp_cond(word, value)                     (BITREPACK((word), (value),  0,  4))
+
 
 NON_NULL(1)
 void RabbitizerInstructionR4000Allegrex_init(RabbitizerInstruction *self, uint32_t word, uint32_t vram);

diff --git a/rabbitizer/OperandType.pyi b/rabbitizer/OperandType.pyi
diff --git a/rust/src/operand_type_enum.rs b/rust/src/operand_type_enum.rs
diff --git a/src/instructions/RabbitizerInstrDescriptor.c b/src/instructions/RabbitizerInstrDescriptor.c
@@ -322,6 +322,69 @@ bool RabbitizerInstrDescriptor_hasOperandAlias(const RabbitizerInstrDescriptor *
                 return true;
             }
             break;
+
+        case RAB_OPERAND_r4000allegrex_vcmp_cond:
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond_s_maybe_vs_maybe_vt)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond_p_maybe_vs_maybe_vt)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond_t_maybe_vs_maybe_vt)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond_q_maybe_vs_maybe_vt)) {
+                return true;
+            }
+            break;
+
+        case RAB_OPERAND_r4000allegrex_vcmp_cond_s_maybe_vs_maybe_vt:
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_s_vs)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_s_vt)) {
+                return true;
+            }
+            break;
+
+        case RAB_OPERAND_r4000allegrex_vcmp_cond_p_maybe_vs_maybe_vt:
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_p_vs)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_p_vt)) {
+                return true;
+            }
+            break;
+
+        case RAB_OPERAND_r4000allegrex_vcmp_cond_q_maybe_vs_maybe_vt:
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_t_vs)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_t_vt)) {
+                return true;
+            }
+            break;
+
+        case RAB_OPERAND_r4000allegrex_vcmp_cond_t_maybe_vs_maybe_vt:
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_vcmp_cond)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_q_vs)) {
+                return true;
+            }
+            if (RabbitizerInstrDescriptor_hasSpecificOperand(self, RAB_OPERAND_r4000allegrex_q_vt)) {
+                return true;
+            }
+            break;
             /* r4000allegrex */
 
             /* r5900 */

diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction.c
@@ -430,6 +430,18 @@ void RabbitizerInstruction_blankOut(RabbitizerInstruction *self) {
                 self->word = RAB_INSTR_R4000ALLEGREX_PACK_offset14(self->word, 0);
                 self->word = RAB_INSTR_PACK_rs(self->word, 0);
                 break;
+
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_s_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_p_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_q_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_t_maybe_vs_maybe_vt:
+                self->word = RAB_INSTR_R4000ALLEGREX_PACK_vs(self->word, 0);
+                self->word = RAB_INSTR_R4000ALLEGREX_PACK_vt(self->word, 0);
+                FALLTHROUGH;
+            case RAB_OPERAND_r4000allegrex_vcmp_cond:
+                self->word = RAB_INSTR_R4000ALLEGREX_PACK_vcmp_cond(self->word, 0);
+                break;
+
             /* r4000allegrex */
 
             /* r5900 */

diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Examination.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Examination.c
@@ -476,6 +476,18 @@ uint32_t RabbitizerInstruction_getValidBits(const RabbitizerInstruction *self) {
                 validbits = RAB_INSTR_R4000ALLEGREX_PACK_offset14(validbits, ~0);
                 validbits = RAB_INSTR_PACK_rs(validbits, ~0);
                 break;
+
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_s_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_p_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_q_maybe_vs_maybe_vt:
+            case RAB_OPERAND_r4000allegrex_vcmp_cond_t_maybe_vs_maybe_vt:
+                validbits = RAB_INSTR_R4000ALLEGREX_PACK_vs(validbits, ~0);
+                validbits = RAB_INSTR_R4000ALLEGREX_PACK_vt(validbits, ~0);
+                FALLTHROUGH;
+            case RAB_OPERAND_r4000allegrex_vcmp_cond:
+                validbits = RAB_INSTR_R4000ALLEGREX_PACK_vcmp_cond(validbits, ~0);
+                break;
+
             /* r4000allegrex */
 
             /* r5900 */