diff --git a/README.md b/README.md index 2e8fb927..380925f0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibu | [ Linux ](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-linux.zip) | ## Socials -We have a [Discord server](https://discord.gg/xEvJDPp6) +We have a [Discord server](https://discord.gg/htzNd2rRF6) ## Sister projects - [**n64**](https://github.com/dillonb/n64): Low-level, fast, accurate and easy to use Nintendo 64 emulator diff --git a/external/parallel-rdp/parallel-rdp-standalone b/external/parallel-rdp/parallel-rdp-standalone index 63f8935d..799de405 160000 --- a/external/parallel-rdp/parallel-rdp-standalone +++ b/external/parallel-rdp/parallel-rdp-standalone @@ -1 +1 @@ -Subproject commit 63f8935dbb7bd3ed07ca8547f77498bef09eaa84 +Subproject commit 799de4052e5a13925eb3d4b7ff961cd096b67da2 diff --git a/src/backend/MupenMovie.cpp b/src/backend/MupenMovie.cpp index 968a91d1..f6476683 100644 --- a/src/backend/MupenMovie.cpp +++ b/src/backend/MupenMovie.cpp @@ -120,22 +120,22 @@ bool TasMovieLoaded() { } FORCE_INLINE void LogController(const n64::Controller& controller) { - Util::info("c_right: {}", controller.c_right); - Util::info("c_left: {}", controller.c_left); - Util::info("c_down: {}", controller.c_down); - Util::info("c_up: {}", controller.c_up); - Util::info("r: {}", controller.r); - Util::info("l: {}", controller.l); - Util::info("dp_right: {}", controller.dp_right); - Util::info("dp_left: {}", controller.dp_left); - Util::info("dp_down: {}", controller.dp_down); - Util::info("dp_up: {}", controller.dp_up); - Util::info("z: {}", controller.z); - Util::info("b: {}", controller.b); - Util::info("a: {}", controller.a); - Util::info("start: {}", controller.start); - Util::info("joy_x: {}", controller.joy_x); - Util::info("joy_y: {}", controller.joy_y); + Util::debug("c_right: {}", controller.c_right); + Util::debug("c_left: {}", controller.c_left); + Util::debug("c_down: {}", controller.c_down); + Util::debug("c_up: {}", controller.c_up); + Util::debug("r: {}", controller.r); + Util::debug("l: {}", controller.l); + Util::debug("dp_right: {}", controller.dp_right); + Util::debug("dp_left: {}", controller.dp_left); + Util::debug("dp_down: {}", controller.dp_down); + Util::debug("dp_up: {}", controller.dp_up); + Util::debug("z: {}", controller.z); + Util::debug("b: {}", controller.b); + Util::debug("a: {}", controller.a); + Util::debug("start: {}", controller.start); + Util::debug("joy_x: {}", controller.joy_x); + Util::debug("joy_y: {}", controller.joy_y); } n64::Controller TasNextInputs() { diff --git a/src/backend/core/registers/cop/cop1instructions.cpp b/src/backend/core/registers/cop/cop1instructions.cpp index b86dc09c..25977240 100644 --- a/src/backend/core/registers/cop/cop1instructions.cpp +++ b/src/backend/core/registers/cop/cop1instructions.cpp @@ -364,7 +364,7 @@ void Cop1::ctc1(Registers& regs, u32 instr) { case 0: break; case 31: { fcr31.write(val); - FireFPUException(regs); + CheckFPUException(); } break; default: Util::panic("Undefined CTC1 with rd != 0 or 31"); }