iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update prdp

Browse Source
This commit is contained in:
CocoSimone
2022-09-08 00:06:35 +02:00
parent 01e918d7f2
commit 314f6629f0
9 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontend/CMakeLists.txt
View File

@@ -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

1
src/frontend/imgui/CMakeLists.txt
View File

@@ -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

1
src/n64/CMakeLists.txt
View File

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

2
src/n64/core/CMakeLists.txt
View File

@@ -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

3
src/n64/core/Cpu.hpp
View File

@@ -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&);

7
src/n64/core/cpu/CMakeLists.txt
View File

@@ -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
../../
)

2
src/n64/core/cpu/instructions.cpp
View File

@@ -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);