Major refactoring of V6809 code--still not 100% at this point

[stargem2] / src / stargem2.cpp

diff --git a/src/stargem2.cpp b/src/stargem2.cpp
index d1b7431a5bd092e45230c190f6d8c6dbee176f4f..4f3e50952d0dcf646cdc5976d29d7d62295f0fd5 100755 (executable)
--- a/src/stargem2.cpp
+++ b/src/stargem2.cpp
@@ -350,7 +350,7 @@ uint8 RdMem6809(uint16 addr)
        // More kludge...
        if ((addr == 0xC80C) && (gram[0xC80D] & 0x04))  // Read PORTA and DDR is set to Output
        {
-               ClearLine(V6809_ASSERT_LINE_IRQ);                       // Then clear the IRQ
+               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);         // Then clear the IRQ
 //OK, this ALSO fucks up the execution of the demo...
 // Which means that the timing is still off. :-/
 //             mainCPU.cpuFlags &= ~V6809_ASSERT_LINE_IRQ;                     // Then clear the IRQ
@@ -358,7 +358,7 @@ uint8 RdMem6809(uint16 addr)
 
        if ((addr == 0xC80E) && (gram[0xC80F] & 0x04))  // Read PORTB and DDR is set to Output
        {
-               ClearLine(V6809_ASSERT_LINE_IRQ);                       // Then clear the IRQ
+               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);         // Then clear the IRQ
 //OK, this ALSO fucks up the execution of the demo...
 //             mainCPU.cpuFlags &= ~V6809_ASSERT_LINE_IRQ;                     // Then clear the IRQ
        }
@@ -471,6 +471,11 @@ static void FrameCallback(void)
                soundCPU.cpuFlags |= V6808_ASSERT_LINE_NMI;
        if (keys[SDLK_F6])                                                      // Reset the 6808 (F6)
                soundCPU.cpuFlags |= V6808_ASSERT_LINE_RESET;
+//Temp, for testing...
+extern bool disasm;
+//disasm = true;
+       if (keys[SDLK_F9])
+               disasm = true;
 
        if (paletteDirty)
        {