Implement "transpose matrix register"

Decompollaborate · Apr 20, 2024 · dadad6b · dadad6b
1 parent d2e4eca
commit dadad6b
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 1,942 deletions.
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/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
@@ -289,12 +289,15 @@ bool RabbitizerInstrDescriptor_hasOperandAlias(const RabbitizerInstrDescriptor *
         case RAB_OPERAND_r4000allegrex_mp_vs:
         case RAB_OPERAND_r4000allegrex_mp_vt:
         case RAB_OPERAND_r4000allegrex_mp_vd:
+        case RAB_OPERAND_r4000allegrex_mp_vs_transpose:
         case RAB_OPERAND_r4000allegrex_mt_vs:
         case RAB_OPERAND_r4000allegrex_mt_vt:
         case RAB_OPERAND_r4000allegrex_mt_vd:
+        case RAB_OPERAND_r4000allegrex_mt_vs_transpose:
         case RAB_OPERAND_r4000allegrex_mq_vs:
         case RAB_OPERAND_r4000allegrex_mq_vt:
         case RAB_OPERAND_r4000allegrex_mq_vd:
+        case RAB_OPERAND_r4000allegrex_mq_vs_transpose:
         case RAB_OPERAND_r4000allegrex_cop2cs:
         case RAB_OPERAND_r4000allegrex_cop2cd:
             break;

diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction.c
@@ -364,6 +364,9 @@ void RabbitizerInstruction_blankOut(RabbitizerInstruction *self) {
             case RAB_OPERAND_r4000allegrex_mp_vs:
             case RAB_OPERAND_r4000allegrex_mt_vs:
             case RAB_OPERAND_r4000allegrex_mq_vs:
+            case RAB_OPERAND_r4000allegrex_mp_vs_transpose:
+            case RAB_OPERAND_r4000allegrex_mt_vs_transpose:
+            case RAB_OPERAND_r4000allegrex_mq_vs_transpose:
                 self->word = RAB_INSTR_R4000ALLEGREX_PACK_vs(self->word, 0);
                 break;
 

diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Examination.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Examination.c
@@ -410,6 +410,9 @@ uint32_t RabbitizerInstruction_getValidBits(const RabbitizerInstruction *self) {
             case RAB_OPERAND_r4000allegrex_mp_vs:
             case RAB_OPERAND_r4000allegrex_mt_vs:
             case RAB_OPERAND_r4000allegrex_mq_vs:
+            case RAB_OPERAND_r4000allegrex_mp_vs_transpose:
+            case RAB_OPERAND_r4000allegrex_mt_vs_transpose:
+            case RAB_OPERAND_r4000allegrex_mq_vs_transpose:
                 validbits = RAB_INSTR_R4000ALLEGREX_PACK_vs(validbits, ~0);
                 break;
 

diff --git a/...tions/RabbitizerInstructionR4000Allegrex/RabbitizerInstructionR4000Allegrex_OperandType.c b/...tions/RabbitizerInstructionR4000Allegrex/RabbitizerInstructionR4000Allegrex_OperandType.c
@@ -209,6 +209,18 @@ size_t RabbitizerOperandType_process_r4000allegrex_mp_vd(const RabbitizerInstruc
     return totalSize;
 }
 
+size_t RabbitizerOperandType_process_r4000allegrex_mp_vs_transpose(const RabbitizerInstruction *self, char *dst,
+                                                         UNUSED const char *immOverride,
+                                                         UNUSED size_t immOverrideLength) {
+    size_t totalSize = 0;
+    // For whatever reason the transpose just toggles bit 5, no clue why.
+    const char *reg = RabbitizerRegister_getNameR4000AllegrexM2x2(RAB_INSTR_R4000ALLEGREX_GET_vs(self) ^ 0x20);
+
+    RABUTILS_BUFFER_CPY(dst, totalSize, reg);
+
+    return totalSize;
+}
+
 size_t RabbitizerOperandType_process_r4000allegrex_mt_vs(const RabbitizerInstruction *self, char *dst,
                                                          UNUSED const char *immOverride,
                                                          UNUSED size_t immOverrideLength) {
@@ -242,6 +254,17 @@ size_t RabbitizerOperandType_process_r4000allegrex_mt_vd(const RabbitizerInstruc
     return totalSize;
 }
 
+size_t RabbitizerOperandType_process_r4000allegrex_mt_vs_transpose(const RabbitizerInstruction *self, char *dst,
+                                                         UNUSED const char *immOverride,
+                                                         UNUSED size_t immOverrideLength) {
+    size_t totalSize = 0;
+    const char *reg = RabbitizerRegister_getNameR4000AllegrexM3x3(RAB_INSTR_R4000ALLEGREX_GET_vs(self) ^ 0x20);
+
+    RABUTILS_BUFFER_CPY(dst, totalSize, reg);
+
+    return totalSize;
+}
+
 size_t RabbitizerOperandType_process_r4000allegrex_mq_vs(const RabbitizerInstruction *self, char *dst,
                                                          UNUSED const char *immOverride,
                                                          UNUSED size_t immOverrideLength) {
@@ -275,6 +298,17 @@ size_t RabbitizerOperandType_process_r4000allegrex_mq_vd(const RabbitizerInstruc
     return totalSize;
 }
 
+size_t RabbitizerOperandType_process_r4000allegrex_mq_vs_transpose(const RabbitizerInstruction *self, char *dst,
+                                                         UNUSED const char *immOverride,
+                                                         UNUSED size_t immOverrideLength) {
+    size_t totalSize = 0;
+    const char *reg = RabbitizerRegister_getNameR4000AllegrexM4x4(RAB_INSTR_R4000ALLEGREX_GET_vs(self) ^ 0x20);
+
+    RABUTILS_BUFFER_CPY(dst, totalSize, reg);
+
+    return totalSize;
+}
+
 size_t RabbitizerOperandType_process_r4000allegrex_cop2cs(const RabbitizerInstruction *self, char *dst,
                                                           UNUSED const char *immOverride,
                                                           UNUSED size_t immOverrideLength) {

diff --git a/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu6.inc b/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu6.inc
@@ -23,7 +23,7 @@ vmmul.p
 
     RABBITIZER_DEF_INSTR_ID_ALTNAME(
         r4000allegrex, 0x00 << 2 | 0x1, vmmul_p, vmmul.p,
-        .operands={RAB_OPERAND_r4000allegrex_mp_vd, RAB_OPERAND_r4000allegrex_mp_vs, RAB_OPERAND_r4000allegrex_mp_vt},
+        .operands={RAB_OPERAND_r4000allegrex_mp_vd, RAB_OPERAND_r4000allegrex_mp_vs_transpose, RAB_OPERAND_r4000allegrex_mp_vt},
         .instrType=RABBITIZER_INSTR_TYPE_R
     ) // Multiply Pair x Pair Matrix
 
@@ -36,7 +36,7 @@ vmmul.t
 
     RABBITIZER_DEF_INSTR_ID_ALTNAME(
         r4000allegrex, 0x00 << 2 | 0x2, vmmul_t, vmmul.t,
-        .operands={RAB_OPERAND_r4000allegrex_mt_vd, RAB_OPERAND_r4000allegrex_mt_vs, RAB_OPERAND_r4000allegrex_mt_vt},
+        .operands={RAB_OPERAND_r4000allegrex_mt_vd, RAB_OPERAND_r4000allegrex_mt_vs_transpose, RAB_OPERAND_r4000allegrex_mt_vt},
         .instrType=RABBITIZER_INSTR_TYPE_R
     ) // Multiply Triple x Triple Matrix
 
@@ -49,7 +49,7 @@ vmmul.q
 
     RABBITIZER_DEF_INSTR_ID_ALTNAME(
         r4000allegrex, 0x00 << 2 | 0x3, vmmul_q, vmmul.q,
-        .operands={RAB_OPERAND_r4000allegrex_mq_vd, RAB_OPERAND_r4000allegrex_mq_vs, RAB_OPERAND_r4000allegrex_mq_vt},
+        .operands={RAB_OPERAND_r4000allegrex_mq_vd, RAB_OPERAND_r4000allegrex_mq_vs_transpose, RAB_OPERAND_r4000allegrex_mq_vt},
         .instrType=RABBITIZER_INSTR_TYPE_R
     ) // Multiply Quad x Quad Matrix
 

diff --git a/tables/tables/operands/RabbitizerOperandType_r4000allegrex.inc b/tables/tables/operands/RabbitizerOperandType_r4000allegrex.inc
@@ -28,16 +28,19 @@
     RAB_DEF_OPERAND(r4000allegrex, mp_vs)
     RAB_DEF_OPERAND(r4000allegrex, mp_vt)
     RAB_DEF_OPERAND(r4000allegrex, mp_vd)
+    RAB_DEF_OPERAND(r4000allegrex, mp_vs_transpose)
 
     // matrix triple
     RAB_DEF_OPERAND(r4000allegrex, mt_vs)
     RAB_DEF_OPERAND(r4000allegrex, mt_vt)
     RAB_DEF_OPERAND(r4000allegrex, mt_vd)
+    RAB_DEF_OPERAND(r4000allegrex, mt_vs_transpose)
 
     // matrix quad
     RAB_DEF_OPERAND(r4000allegrex, mq_vs)
     RAB_DEF_OPERAND(r4000allegrex, mq_vt)
     RAB_DEF_OPERAND(r4000allegrex, mq_vd)
+    RAB_DEF_OPERAND(r4000allegrex, mq_vs_transpose)
 
     RAB_DEF_OPERAND(r4000allegrex, cop2cs)
     RAB_DEF_OPERAND(r4000allegrex, cop2cd)