From c6ec9c0686a19b61db75f07ba2120c1742cd4231 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Wed, 27 Mar 2024 15:18:32 +0100 Subject: [PATCH] 3rdParty: update mupen64plus-rsp-parallel --- Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo | 4 ++-- Source/3rdParty/mupen64plus-rsp-parallel/rsp/cp0.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo b/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo index e8f473fb3..901afd738 100644 --- a/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo +++ b/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:/Rosalie241/parallel-rsp.git branch = RMG - commit = 71f52c492ac5896a02725152a0e6c59036ee9576 - parent = e8f10693c73eeed017f45cf8289a3763ae16c257 + commit = f7c164cf0c4131f6cfbcaefba9af3c8eaf6df1b0 + parent = eb6dd8068ef4d82e47807ebccca0444d2e3300e2 method = merge cmdver = 0.4.6 diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/rsp/cp0.cpp b/Source/3rdParty/mupen64plus-rsp-parallel/rsp/cp0.cpp index e7bcafac0..6647d5842 100644 --- a/Source/3rdParty/mupen64plus-rsp-parallel/rsp/cp0.cpp +++ b/Source/3rdParty/mupen64plus-rsp-parallel/rsp/cp0.cpp @@ -40,6 +40,7 @@ extern "C" } #endif +#if 0 // FIXME: this is broken with upstream mupen64plus-core if (rd == CP0_REGISTER_SP_SEMAPHORE) { if (*rsp->cp0.cr[CP0_REGISTER_SP_SEMAPHORE]) @@ -56,6 +57,7 @@ extern "C" else *rsp->cp0.cr[CP0_REGISTER_SP_SEMAPHORE] = 1; } +#endif //if (rd == 4) // SP_STATUS_REG // fprintf(stderr, "READING STATUS REG!\n");