Fixes for the 68K IRQ system. There's probably a little more to do though.

[virtualjaguar] / src / op.cpp

diff --git a/src/objectp.cpp b/src/op.cpp
similarity index 99%
rename from src/objectp.cpp
rename to src/op.cpp
index de366eec31e906e8d2cf5392d8fc470aa1f9dbe5..510b034b14685e479c0618fd53cc2b216009ec26 100644 (file)
--- a/src/objectp.cpp
+++ b/src/op.cpp
@@ -13,7 +13,7 @@
 // JLH  01/16/2010  Created this log ;-)
 //
 
-#include "objectp.h"
+#include "op.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -704,9 +704,13 @@ OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipp
 
                        if (p0 & 0x08)
                        {
-                               TOMSetPendingObjectInt();
-                               if (TOMIRQEnabled(IRQ_OPFLAG))// && jaguar_interrupt_handler_is_valid(64))
-                                       m68k_set_irq(7);                                // Cause an NMI to occur...
+                               // We need to check whether these interrupts are enabled or not, THEN
+                               // set an IRQ + pending flag if necessary...
+                               if (TOMIRQEnabled(IRQ_OPFLAG))
+                               {
+                                       TOMSetPendingObjectInt();
+                                       m68k_set_irq(2);                                // Cause a 68K IPL 2 to occur...
+                               }
                        }
 
                        return;