diff --git a/Source/3rdParty/mupen64plus-core/.gitrepo b/Source/3rdParty/mupen64plus-core/.gitrepo
index 6414e6dd..9721c621 100644
--- a/Source/3rdParty/mupen64plus-core/.gitrepo
+++ b/Source/3rdParty/mupen64plus-core/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:mupen64plus/mupen64plus-core.git
 	branch = master
-	commit = b0d68c20f49b8f833afa21450e0e8874c87c13c4
-	parent = d67187a90af71df5691ee0940f84f1c7572b47a8
+	commit = 312a5befde1b44db8beee7868b929c23d896991f
+	parent = 6e2d29dc603cb221b7409d2cca646f329073dd03
 	method = merge
 	cmdver = 0.4.6
diff --git a/Source/3rdParty/mupen64plus-core/src/device/r4300/cp1.c b/Source/3rdParty/mupen64plus-core/src/device/r4300/cp1.c
index c744f1b6..4426728e 100644
--- a/Source/3rdParty/mupen64plus-core/src/device/r4300/cp1.c
+++ b/Source/3rdParty/mupen64plus-core/src/device/r4300/cp1.c
@@ -110,7 +110,7 @@ void set_fpr_pointers(struct cp1* cp1, uint32_t newStatus)
     {
         for (i = 0; i < 32; i++)
         {
-            (r4300_cp1_regs_simple(cp1))[i] = &cp1->regs[i & ~1].float32[i & 1 ^ DOUBLE_HALF_XOR];
+            (r4300_cp1_regs_simple(cp1))[i] = &cp1->regs[i & ~1].float32[(i & 1) ^ DOUBLE_HALF_XOR];
             (r4300_cp1_regs_double(cp1))[i] = &cp1->regs[i & ~1].float64;
         }
     }