Update CPStatus before processing the FIFO events and force an exception check on interrupts.

Added more information into the FIFO unknown opcode error message.

1 files changed, 12 insertions, 3 deletions

diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
index 5c3544aecb..a7dd5b6a85 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -118,10 +118,19 @@ static void UnknownOpcode(u8 cmd_byte, void *buffer, bool preprocess)
 		    "bFF_BPEnable: %s\n"
 		    "bFF_BPInt: %s\n"
 		    "bFF_Breakpoint: %s\n"
+		    "bFF_GPLinkEnable: %s\n"
+		    "bFF_HiWatermarkInt: %s\n"
+		    "bFF_LoWatermarkInt: %s\n"
 		    ,cmd_byte, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
-		    ,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint, fifo.bFF_GPReadEnable ? "true" : "false"
-		    ,fifo.bFF_BPEnable ? "true" : "false" ,fifo.bFF_BPInt ? "true" : "false"
-		    ,fifo.bFF_Breakpoint ? "true" : "false");
+		    ,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint
+		    ,fifo.bFF_GPReadEnable ? "true" : "false"
+		    ,fifo.bFF_BPEnable ? "true" : "false"
+		    ,fifo.bFF_BPInt ? "true" : "false"
+		    ,fifo.bFF_Breakpoint ? "true" : "false"
+		    ,fifo.bFF_GPLinkEnable ? "true" : "false"
+		    ,fifo.bFF_HiWatermarkInt ? "true" : "false"
+		    ,fifo.bFF_LoWatermarkInt ? "true" : "false"
+		    );
 	}
 }