vwbn.s, viim.s, vfim.s

Decompollaborate · Apr 18, 2024 · d02c14f · d02c14f
1 parent 38c2068
commit d02c14f
Show file tree

Hide file tree

Showing 10 changed files with 315 additions and 276 deletions.
diff --git a/asdf.txt b/asdf.txt
diff --git a/cplusplus/include/generated/UniqueId_enum_class.hpp b/cplusplus/include/generated/UniqueId_enum_class.hpp
diff --git a/include/generated/InstrDescriptor_Descriptors_array.h b/include/generated/InstrDescriptor_Descriptors_array.h
diff --git a/include/generated/InstrId_Names_array.h b/include/generated/InstrId_Names_array.h
diff --git a/include/generated/InstrId_enum.h b/include/generated/InstrId_enum.h
diff --git a/rabbitizer/InstrId.pyi b/rabbitizer/InstrId.pyi
diff --git a/rust/src/instr_id_enum.rs b/rust/src/instr_id_enum.rs
diff --git a/...s/RabbitizerInstructionR4000Allegrex/RabbitizerInstructionR4000Allegrex_ProcessUniqueId.c b/...s/RabbitizerInstructionR4000Allegrex/RabbitizerInstructionR4000Allegrex_ProcessUniqueId.c
@@ -1010,7 +1010,7 @@ void RabbitizerInstructionR4000Allegrex_processUniqueId_Vfpu4_Fmt3(RabbitizerIns
     self->instrIdType = RAB_INSTR_ID_TYPE_R4000ALLEGREX_VFPU4_FMT3;
 
     switch (fmt) {
-#include "tables/instr_id/r4000allegrex/r4000allegrex_vfpu4_fmt2.inc"
+#include "tables/instr_id/r4000allegrex/r4000allegrex_vfpu4_fmt3.inc"
     }
 
     if (fetchDescriptor) {

diff --git a/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu4_fmt3.inc b/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu4_fmt3.inc
@@ -6,7 +6,7 @@
     |   VFPU4   |1 1|               |t|             |p|             |
     ------6-------2------------------1---------------1---------------
     |-------|
- 00 |       |
+ 00 | vwbn.s|
  01 |       |
  10 |       |
  11 |       |
@@ -19,3 +19,10 @@ vwbn.s
     |   VFPU4   |1 1|      imm8     |0|      vs     |0|      vd     |
     ------6-------2---------8--------1-------7-------1-------7-------
 */
+
+    // TODO: vd, vs, imm8
+    RABBITIZER_DEF_INSTR_ID_ALTNAME(
+        r4000allegrex, 0x0, vwbn_s, vwbn.s,
+        .operands={RAB_OPERAND_r4000allegrex_s_vd, RAB_OPERAND_r4000allegrex_s_vs},
+        .instrType=RABBITIZER_INSTR_TYPE_R
+    ) // WrapBN Single word
diff --git a/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu5_fmt3.inc b/tables/tables/instr_id/r4000allegrex/r4000allegrex_vfpu5_fmt3.inc
@@ -13,13 +13,27 @@
 /*
 viim.s
     31--------26-25-23-22---------16-15-----------------------------0
-    |   VFPU5   |1 1|0|      vt     |0|            imm16            |
-    ------6-------2--1-------7-------1---------------16--------------
+    |   VFPU5   |1 1|0|      vt     |              imm16            |
+    ------6-------2--1-------7-----------------------16--------------
 */
 
+    // TODO: vt, imm16
+    RABBITIZER_DEF_INSTR_ID_ALTNAME(
+        r4000allegrex, 0x0, viim_s, viim.s,
+        .operands={RAB_OPERAND_r4000allegrex_s_vt},
+        .instrType=RABBITIZER_INSTR_TYPE_R
+    ) // Convert integer immediate to float Single Word
+
 /*
 vfim.s
     31--------26-25----22---------16-15-----------------------------0
-    |   VFPU5   |1 1|1|      vt     |0|            imm16            |
-    ------6-------2--1-------7-------1---------------16--------------
+    |   VFPU5   |1 1|1|      vt     |              imm16            |
+    ------6-------2--1-------7-----------------------16--------------
 */
+
+    // TODO: vt, imm16
+    RABBITIZER_DEF_INSTR_ID_ALTNAME(
+        r4000allegrex, 0x1, vfim_s, vfim.s,
+        .operands={RAB_OPERAND_r4000allegrex_s_vt},
+        .instrType=RABBITIZER_INSTR_TYPE_R
+    ) // Convert integer immediate to float Single Word