update prdp

external/parallel-rdp/CMakeLists.txt

@@ -67,6 +67,7 @@ target_include_directories(parallel-rdp PUBLIC
   ../../src/frontend/imgui
   ../../src/frontend/imgui/debugger
   ../../src
+  ../capstone/include
   ../imgui
   ../imgui/imgui
   ../imgui/imgui/backends

src/frontend/CMakeLists.txt

@@ -11,6 +11,7 @@ target_include_directories(frontend PUBLIC
   .
   ..
   ../../external
+  ../../external/capstone/include
   ../../external/parallel-rdp
   ../../external/parallel-rdp/parallel-rdp-standalone/vulkan
   ../../external/parallel-rdp/parallel-rdp-standalone/util

src/frontend/imgui/CMakeLists.txt

@@ -21,6 +21,7 @@ target_include_directories(frontend-imgui PUBLIC
   ../../n64/core/cpu
   ../../n64/core/cpu/registers
   ../../../external
+  ../../../external/capstone/include
   ../../../external/parallel-rdp/parallel-rdp-standalone
   ../../../external/parallel-rdp/parallel-rdp-standalone/vulkan
   ../../../external/parallel-rdp/parallel-rdp-standalone/util

src/n64/CMakeLists.txt

@@ -14,5 +14,6 @@ target_include_directories(n64 PUBLIC
   ..
   ../frontend/imgui/debugger
   ../../external
+  ../../external/capstone/include
   ../../external/imgui/imgui
   ../../external/imgui/imgui/backends)

src/n64/core/CMakeLists.txt

@@ -47,7 +47,7 @@ target_include_directories(core PUBLIC
   ../..
   ../../frontend/imgui/debugger
   ../../../external
-  ../../../external/capstone
+  ../../../external/capstone/include
   ../../../external/imgui/imgui
   ../../../external/imgui/imgui/debugger
   ../../../external/imgui/imgui/backends

src/n64/core/Cpu.hpp

@@ -2,10 +2,11 @@
 #include <Registers.hpp>
 #include <Mem.hpp>
 #include <util.hpp>
+#include <capstone/capstone.h>
 
 namespace n64 {
 struct Cpu {
-  Cpu() = default;
+  Cpu() { Reset(); }
   ~Cpu() = default;
   void Reset();
   void Step(Mem&);

src/n64/core/cpu/CMakeLists.txt

@@ -2,20 +2,21 @@ cmake_minimum_required(VERSION 3.20)
 project(cpu)
 
 add_library(cpu
+  decode.cpp
+  instructions.cpp
   Registers.cpp
   Registers.hpp
   registers/Cop0.cpp
   registers/Cop0.hpp
-  decode.cpp
   registers/cop0instructions.cpp
   registers/Cop1.cpp
   registers/Cop1.hpp
-  registers/cop1instructions.cpp
-  instructions.cpp)
+  registers/cop1instructions.cpp)
 
 target_include_directories(cpu PUBLIC registers
   . ..
   ../../../../external
+  ../../../../external/capstone/include
   ../../../../src
   ../../
 )

src/n64/core/cpu/instructions.cpp

@@ -578,7 +578,7 @@ void Cpu::dsra32(u32 instr) {
 }
 
 void Cpu::jr(u32 instr) {
-  u32 address = regs.gpr[RS(instr)];
+  s32 address = regs.gpr[RS(instr)];
   if ((address & 3) != 0) {
     HandleTLBException(regs, (s64)((s32)address));
     FireException(regs, ExceptionCode::AddressErrorStore, 0, regs.oldPC);