Merge pull request #45 from Decompollaborate/develop

1.7.9
Decompollaborate · Sep 18, 2023 · 89ae90f · 89ae90f
2 parents a17c9e6 + a0fd33c
commit 89ae90f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@
 [package]
 name = "rabbitizer"
 # Version should be synced with include/common/RabbitizerVersion.h
-version = "1.7.8"
+version = "1.7.9"
 edition = "2021"
 authors = ["Anghelo Carvajal <angheloalf95@gmail.com>"]
 description = "MIPS instruction decoder"

diff --git a/include/common/RabbitizerVersion.h b/include/common/RabbitizerVersion.h
@@ -14,7 +14,7 @@ extern "C" {
 // Header version
 #define RAB_VERSION_MAJOR 1
 #define RAB_VERSION_MINOR 7
-#define RAB_VERSION_PATCH 8
+#define RAB_VERSION_PATCH 9
 
 #define RAB_VERSION_STR RAB_STRINGIFY(RAB_VERSION_MAJOR) "." RAB_STRINGIFY(RAB_VERSION_MINOR) "." RAB_STRINGIFY(RAB_VERSION_PATCH)
 

diff --git a/include/generated/InstrDescriptor_Descriptors_array.h b/include/generated/InstrDescriptor_Descriptors_array.h
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@
 [project]
 name = "rabbitizer"
 # Version should be synced with include/common/RabbitizerVersion.h
-version = "1.7.8"
+version = "1.7.9"
 description = "MIPS instruction decoder"
 # license = "MIT"
 readme = "README.md"

diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c
@@ -126,6 +126,14 @@ bool RabbitizerInstruction_mustDisasmAsData(const RabbitizerInstruction *self) {
                     return true;
                 }
                 break;
+            case RABBITIZER_INSTR_ID_r5900_vclipw:
+                // The vclipw instruction has variants that are undocumented (vclipw.xy, vclipw.z) and don't assemble in
+                // gnu as
+                return true;
+            case RABBITIZER_INSTR_ID_r5900_vsqrt:
+                // The vclipw instruction seems to be representable in multiple ways, and we only disassemble one of
+                // them
+                return true;
 
             default:
                 break;

diff --git a/tables/tables/instr_id/r5900/r5900_cop2_special2.inc b/tables/tables/instr_id/r5900/r5900_cop2_special2.inc
@@ -216,6 +216,7 @@ Note: opcode is flo | (
     RABBITIZER_DEF_INSTR_ID(
         r5900, 0x1F, vclipw,
         .operands={RAB_OPERAND_r5900_vfsxyzw, RAB_OPERAND_r5900_vftn},
+        .instrSuffix=RABINSTRSUFFIX_R5900_xyzw,
         .isFloat=true
     ) // Clip