Refactor interrupts to assert/deassert interrupt line

Author: callsop

CpuCommon.h

@@ -0,0 +1,54 @@
+#pragma once
+
+//
+// access cc flags 
+//
+static inline bool CC(char flag) 
+{
+	return cc[flag] ? true : false; 
+}
+
+//
+// interrupt lines (active low)
+//
+static inline bool FIRQ() { return InterruptLatch & Bit(INT_FIRQ) ? true : false; }
+static inline bool IRQ() { return InterruptLatch & Bit(INT_IRQ) ? true : false; }
+static inline bool NMI() { return InterruptLatch & Bit(INT_NMI) ? true : false; }
+
+//
+// latch the interrupt lines, done per instruction top of state A (see figure 15, 6809 spec)
+//
+static inline void LatchInterrupts()
+{
+	InterruptLatch = 0;
+	for (int is = 0; is < IS_MAX; ++is)
+		InterruptLatch |= InterruptLine[is];
+}
+
+//
+// clear the nmi interrupt
+//
+static inline void ClearNMI()
+{
+	InterruptLine[IS_NMI] &= BitMask(INT_NMI);
+}
+
+//
+// clear state of all interrupt lines
+//
+static inline void ClearInterrupt(Interrupt interrupt)
+{
+	for (int is = 0; is < IS_MAX; ++is)
+		InterruptLine[is] &= BitMask(interrupt);
+}
+
+//
+// clear state of all interrupt lines
+//
+static inline void ClearInterrupts()
+{
+	InterruptLatch = 0;
+	for (int is = 0; is < IS_MAX; ++is)
+		InterruptLine[is] = 0;
+}
+

FD502/fd502.cpp

@@ -30,15 +30,16 @@ This file is part of VCC (Virtual Color Computer).
 #include "wd1793.h"
 #include "distortc.h"
 #include "fd502.h"
-#include "..\fileops.h"
+#include "../fileops.h"
+#include "../MachineDefs.h"
 #define EXTROMSIZE 16384
 
 using namespace std;
 
 extern DiskInfo Drive[5];
 typedef unsigned char (*MEMREAD8)(unsigned short);
 typedef void (*MEMWRITE8)(unsigned char,unsigned short);
-typedef void (*ASSERTINTERUPT) (unsigned char,unsigned char);
+typedef void (*ASSERTINTERUPT)(InterruptSource, Interrupt);
 typedef void (*DMAMEMPOINTERS) ( MEMREAD8,MEMWRITE8);
 typedef void (*DYNAMICMENUCALLBACK)( char *,int, int);
 static unsigned char ExternalRom[EXTROMSIZE];
@@ -47,7 +48,7 @@ static unsigned char RGBDiskRom[EXTROMSIZE];
 static char FloppyPath[MAX_PATH];
 static char RomFileName[MAX_PATH]="";
 static char TempRomFileName[MAX_PATH]="";
-void (*AssertInt)(unsigned char,unsigned char)=NULL;
+void (*AssertInt)(InterruptSource,Interrupt)=NULL;
 static void (*DynamicMenuCallback)( char *,int, int)=NULL;
 static unsigned char (*MemRead8)(unsigned short);
 static void (*MemWrite8)(unsigned char,unsigned short);

FD502/fd502.h

@@ -17,7 +17,10 @@ This file is part of VCC (Virtual Color Computer).
     You should have received a copy of the GNU General Public License
     along with VCC (Virtual Color Computer).  If not, see <http://www.gnu.org/licenses/>.
 */
-extern "C" void (*AssertInt)(unsigned char, unsigned char);
+
+#include "../MachineDefs.h"
+
+extern "C" void (*AssertInt)(InterruptSource, Interrupt);
 void BuildDynaMenu(void);
 #define	HEAD 0
 #define SLAVE 1

FD502/wd1793.c

@@ -991,7 +991,7 @@ void DispatchCommand(unsigned char Tmp)
 			StatusReg=READY;
 			ExecTimeWaiter=1;
 			if ((Tmp & 15) != 0)
-				AssertInt(NMI,0);
+				AssertInt(IS_NMI, INT_NMI);
 //			WriteLog("FORCEINTERUPT",0);
 			break;
 
@@ -1394,9 +1394,9 @@ long GetSectorInfo (SectorInfo *Sector,unsigned char *TempBuffer)
 void CommandDone(void)
 {
 	if (InteruptEnable)
-		AssertInt(NMI,0);
-		TransferBufferSize=0;
-		CurrentCommand=IDLE;
+		AssertInt(IS_NMI, INT_NMI);
+	TransferBufferSize=0;
+	CurrentCommand=IDLE;
 }
 
 //Stolen from MESS

HardDisk/harddisk.cpp

@@ -25,7 +25,8 @@ This file is part of VCC (Virtual Color Computer).
 #include "cc3vhd.h"
 #include "defines.h"
 #include "cloud9.h"
-#include "..\fileops.h"
+#include "../fileops.h"
+#include "../MachineDefs.h"
 
 #define DEF_HD_SIZE 132480
 
@@ -38,10 +39,10 @@ static char HardDiskPath[MAX_PATH];
 
 typedef unsigned char (*MEMREAD8)(unsigned short);
 typedef void (*MEMWRITE8)(unsigned char,unsigned short);
-typedef void (*ASSERTINTERUPT) (unsigned char,unsigned char);
+typedef void (*ASSERTINTERUPT)(InterruptSource, Interrupt);
 typedef void (*DMAMEMPOINTERS) ( MEMREAD8,MEMWRITE8);
 typedef void (*DYNAMICMENUCALLBACK)( char *,int, int);
-static void (*AssertInt)(unsigned char,unsigned char)=NULL;
+static void (*AssertInt)(InterruptSource, Interrupt)=NULL;
 static unsigned char (*MemRead8)(unsigned short);
 static void (*MemWrite8)(unsigned char,unsigned short);
 static unsigned char *Memory=NULL;

MachineDefs.h

@@ -73,7 +73,10 @@ namespace VCC
 }
 
 // Common CPU defs (counting from 1 because legacy)
-enum { IRQ = 1, FIRQ, NMI };
+enum Interrupt { INT_IRQ = 1, INT_FIRQ, INT_NMI };
+
+// Interrupt sources keep track of their own state, NMI is its own source and always uses this.
+enum InterruptSource { IS_NMI, IS_PIA0_HSYNC, IS_PIA0_VSYNC, IS_PIA1_CD, IS_PIA1_CART, IS_GIME, IS_MAX };
 
 // make nth bit 0-7
 inline constexpr uint8_t Bit(uint8_t n) { return 1 << n; }
@@ -84,8 +87,8 @@ inline constexpr uint8_t BitMask(uint8_t n) { return ~Bit(n); }
 extern void (*CPUInit)(void);
 extern int  (*CPUExec)(int);
 extern void (*CPUReset)(void);
-extern void (*CPUAssertInterupt)(unsigned char, unsigned char);
-extern void (*CPUDeAssertInterupt)(unsigned char);
+extern void (*CPUAssertInterupt)(InterruptSource, Interrupt);
+extern void (*CPUDeAssertInterupt)(InterruptSource, Interrupt);
 extern void (*CPUForcePC)(unsigned short);
 extern void (*CPUSetBreakpoints)(const std::vector<unsigned short>&);
 extern void (*CPUSetTraceTriggers)(const std::vector<unsigned short>&);

OpDecoder.cpp

@@ -123,11 +123,11 @@ namespace VCC { namespace Debugger
 	{
 		switch (irq)
 		{
-		case IRQ:
+		case INT_IRQ:
 			return IRQType::InterruptRequest;
-		case FIRQ:
+		case INT_FIRQ:
 			return IRQType::FastInterruptRequest;
-		case NMI:
+		case INT_NMI:
 			return IRQType::NonMaskableInterrupt;
 		}
 		return IRQType();

Vcc.c

@@ -104,8 +104,8 @@ void (*CPUReset)(void)=NULL;
 void (*CPUSetBreakpoints)(const std::vector<unsigned short>&) = NULL;
 void (*CPUSetTraceTriggers)(const std::vector<unsigned short>&) = NULL;
 VCC::CPUState (*CPUGetState)() = NULL;
-void (*CPUAssertInterupt)(unsigned char,unsigned char)=NULL;
-void (*CPUDeAssertInterupt)(unsigned char)=NULL;
+void (*CPUAssertInterupt)(InterruptSource, Interrupt)=NULL;
+void (*CPUDeAssertInterupt)(InterruptSource, Interrupt)=NULL;
 void (*CPUForcePC)(unsigned short)=NULL;
 void FullScreenToggle(void);
 void save_key_down(unsigned char kb_char, unsigned char OEMscan);

Vcc.vcxproj

@@ -376,6 +376,7 @@
   <ItemGroup>
     <ClInclude Include="audio.h" />
     <ClInclude Include="BuildConfig.h" />
+    <ClInclude Include="CpuCommon.h" />
     <ClInclude Include="DirectX.h" />
     <ClInclude Include="IDisplay.h" />
     <ClInclude Include="IDisplayDebug.h" />

Vcc.vcxproj.filters

@@ -262,6 +262,9 @@
     <ClInclude Include="DirectX.h">
       <Filter>Source</Filter>
     </ClInclude>
+    <ClInclude Include="CpuCommon.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="resources\3guys.bmp">