git subrepo clone --branch=master --force https://github.com/mupen64p…

…lus-ae/mupen64plus-core.git mupen64plus-core/upstream subrepo: subdir: "mupen64plus-core/upstream" merged: "a5814ad1d" upstream: origin: "https://github.com/mupen64plus-ae/mupen64plus-core.git" branch: "master" commit: "a5814ad1d" git-subrepo: version: "0.4.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "5d6aba9"
mupen64plus-ae · Jan 30, 2020 · ab03140 · ab03140
1 parent 140ba56
commit ab03140
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/mupen64plus-core/upstream/.gitrepo b/mupen64plus-core/upstream/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/mupen64plus-ae/mupen64plus-core.git
 	branch = master
-	commit = 1f669c0a4bc1bf703f7fe43d2edc5cdd5cfc91c4
-	parent = 4db1253ee5a839f5a5627c9f5ede9ca342235e8b
+	commit = a5814ad1dbce1cdb17161ec7b1f1139dac43200c
+	parent = 935d3dd981ad8d323b6fdce0bf26a4ed29ec7074
 	method = merge
 	cmdver = 0.4.0
diff --git a/mupen64plus-core/upstream/src/device/r4300/interrupt.c b/mupen64plus-core/upstream/src/device/r4300/interrupt.c
@@ -505,6 +505,10 @@ void gen_interrupt(struct r4300_core* r4300)
 {
     uint32_t* cp0_regs = r4300_cp0_regs(&r4300->cp0);
     unsigned int* cp0_next_interrupt = r4300_cp0_next_interrupt(&r4300->cp0);
+    if(r4300->cp0.q.first->data.type == SPECIAL_INT && *cp0_next_interrupt)
+    {
+        *cp0_next_interrupt = 0;
+    }
 
     if (*r4300_stop(r4300) == 1)
     {

diff --git a/mupen64plus-core/upstream/src/device/r4300/tlb.c b/mupen64plus-core/upstream/src/device/r4300/tlb.c
@@ -140,7 +140,27 @@ uint32_t virtual_to_physical_address(struct r4300_core* r4300, uint32_t address,
     //printf("tlb exception !!! @ %x, %x, add:%x\n", address, w, r4300->pc->addr);
     //getchar();
 
+    /* 
+      XXX HACK/HOTFIX: Prevents OoT crash under certain circumstances with NEW_DYNAREC...
+      This will also fix Rat Attack for NEW_DYNAREC, interpreter needs to ignore TLB_refill_exception
+      as well, under these circumstances. Is a simliar using_tlb there?
+      Needs fixes upstream, but this will do for now.
+    */
+#ifdef NEW_DYNAREC
+    if (r4300->emumode == EMUMODE_DYNAREC)
+    {
+        if(using_tlb)
+        {
+            TLB_refill_exception(r4300, address, w);
+        }
+    }
+    else
+    {
+        TLB_refill_exception(r4300, address, w);
+    }
+#else
     TLB_refill_exception(r4300, address, w);
+#endif // NEW_DYNAREC
 
     //return 0x80000000;
     return 0x00000000;

diff --git a/mupen64plus-core/upstream/src/main/main.c b/mupen64plus-core/upstream/src/main/main.c
@@ -1015,7 +1015,7 @@ static void load_dd_rom(uint8_t* rom, size_t* rom_size)
         goto no_dd;
     }
 
-    DebugMessage(M64MSG_ERROR, "DD IPL ROM: %s", dd_ipl_rom_filename);
+    DebugMessage(M64MSG_INFO, "DD IPL ROM: %s", dd_ipl_rom_filename);
 
     /* load and swap DD IPL ROM */
     *rom_size = g_ifile_storage_ro.size(&dd_rom);