Implement SPECIAL2 instructions

Decompollaborate · Apr 11, 2024 · b589dcc · b589dcc
1 parent 0eccf14
commit b589dcc
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 4 deletions.
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/rust/src/registers_methods.rs b/rust/src/registers_methods.rs
@@ -19,6 +19,8 @@ extern "C" {
     pub static mut RabbitizerRegister_RspCop2Control_Names:
         [[*const core::ffi::c_char; 2usize]; 0usize];
     pub static mut RabbitizerRegister_RspVector_Names: [[*const core::ffi::c_char; 2usize]; 0usize];
+    pub static mut RabbitizerRegister_R4000AllegrexCop3_Names:
+        [[*const core::ffi::c_char; 2usize]; 0usize];
     pub static mut RabbitizerRegister_R5900VF_Names: [[*const core::ffi::c_char; 2usize]; 0usize];
     pub static mut RabbitizerRegister_R5900VI_Names: [[*const core::ffi::c_char; 2usize]; 0usize];
 
@@ -62,7 +64,7 @@ extern "C" {
 
     /* R4000ALLEGREX */
 
-    pub static mut RabbitizerRegister_R4000AllegrexCop3_Names: [RegisterDescriptor; 0usize];
+    pub static mut RabbitizerRegister_R4000AllegrexCop3_Descriptors: [RegisterDescriptor; 0usize];
 
     /* R4000ALLEGREX */
 

diff --git a/tables/tables/instr_id/r4000allegrex/r4000allegrex_special2.inc b/tables/tables/instr_id/r4000allegrex/r4000allegrex_special2.inc
@@ -6,13 +6,35 @@
     | = SPECIAL |                                         | function|
     ------6----------------------------------------------------6-----
     |--000--|--001--|--010--|--011--|--100--|--101--|--110--|--111--| lo
-000 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
+000 | SLEEP | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
 001 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
 010 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
 011 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
-100 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
+100 | ---   | ---   | ---   | ---   | MFIE  | ---   | MTIE  | ---   |
 101 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
 110 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
 111 | ---   | ---   | ---   | ---   | ---   | ---   | ---   | ---   |
  hi |-------|-------|-------|-------|-------|-------|-------|-------|
 */
+
+    // OP
+
+    RABBITIZER_DEF_INSTR_ID(
+        r4000allegrex, 0x00, sleep,
+        .operands={0},
+        .instrType=RABBITIZER_INSTR_TYPE_R
+    )
+
+    RABBITIZER_DEF_INSTR_ID(
+        r4000allegrex, 0x24, mfie,
+        .operands={RAB_OPERAND_cpu_rt},
+        .instrType=RABBITIZER_INSTR_TYPE_R,
+        .modifiesRt=true
+    )
+
+    RABBITIZER_DEF_INSTR_ID(
+        r4000allegrex, 0x26, mtie,
+        .operands={RAB_OPERAND_cpu_rt},
+        .instrType=RABBITIZER_INSTR_TYPE_R,
+        .readsRt=true
+    )
diff --git a/tests/c/instruction_checks/r4000allegrex_vfpu_disasm.c b/tests/c/instruction_checks/r4000allegrex_vfpu_disasm.c
@@ -1144,7 +1144,6 @@ const TestEntry test_entries[] = {
     TEST_ENTRY_C(0xD89E0042, NULL, "lv.q        C720, 0x40($a0)"),
     TEST_ENTRY_C(0xD89F0042, NULL, "lv.q        C730, 0x40($a0)"),
     TEST_ENTRY_C(0x48640004, NULL, "mfv         $a0, S100"),
-    TEST_ENTRY_C(0x48640004, NULL, "mfv         $a0, S100"),
     TEST_ENTRY_C(0x48640080, NULL, "mfvc        $a0, $128"),
     TEST_ENTRY_C(0x48640084, NULL, "mfvc        $a0, $132"),
     TEST_ENTRY_C(0x48E40004, NULL, "mtv         $a0, S100"),
@@ -1155,6 +1154,7 @@ const TestEntry test_entries[] = {
     TEST_ENTRY_C(0xF4800040, NULL, "svl.q       C000, 0x40($a0)"),
     TEST_ENTRY_C(0xF4800042, NULL, "svr.q       C000, 0x40($a0)"),
 
+#if 0
     // According to the manual, bit 1 should be zero. The compiler handles it fine, but objdump ignores this bit, so idk
     TEST_ENTRY_C(0xD8800043, NULL, NULL),
     TEST_ENTRY_C(0xD8810043, NULL, NULL),
@@ -1188,6 +1188,7 @@ const TestEntry test_entries[] = {
     TEST_ENTRY_C(0xD89D0043, NULL, NULL),
     TEST_ENTRY_C(0xD89E0043, NULL, NULL),
     TEST_ENTRY_C(0xD89F0043, NULL, NULL),
+#endif
 };
 
 size_t test_entries_len = ARRAY_COUNT(test_entries);