ac6502 1.9.3 → 1.11.0

package/src/tests/IO/Empty.test.ts

@@ -8,21 +8,8 @@ describe('Empty', () => {
   })
 
   describe('Initialization', () => {
-    it('should have IRQ callback', () => {
-      expect(typeof empty.raiseIRQ).toBe('function')
-    })
-
-    it('should have NMI callback', () => {
-      expect(typeof empty.raiseNMI).toBe('function')
-    })
-
-    it('should not throw when calling raiseIRQ', () => {
-      expect(() => empty.raiseIRQ()).not.toThrow()
-    })
-
-    it('should not throw when calling raiseNMI', () => {
-      expect(() => empty.raiseNMI()).not.toThrow()
-    })
+    // raiseIRQ/raiseNMI callbacks removed; interrupts are now
+    // communicated via tick() return value
   })
 
   describe('Reading', () => {
@@ -120,8 +107,6 @@ describe('Empty', () => {
         const value = empty.read(0x00)
         expect(value).toBe(0)
         empty.tick(1000000)
-        empty.raiseIRQ()
-        empty.raiseNMI()
         empty.reset(false)
       }).not.toThrow()
     })

package/src/tests/IO/RAMBank.test.ts

@@ -35,11 +35,6 @@ describe('RAMBank', () => {
     it('should start on bank 0', () => {
       expect(ramCard.currentBank).toBe(0)
     })
-
-    it('should have IRQ and NMI callbacks', () => {
-      expect(typeof ramCard.raiseIRQ).toBe('function')
-      expect(typeof ramCard.raiseNMI).toBe('function')
-    })
   })
 
   describe('Reading', () => {
@@ -58,14 +53,15 @@ describe('RAMBank', () => {
       expect(ramCard.read(0x3FE)).toBe(0xCD)
     })
 
-    it('should read bank control register and return current bank', () => {
-      ramCard.currentBank = 0
+    it('should read $3FF from data array (contains bank number after write-through)', () => {
+      // Writing to $3FF sets the bank and writes the value into the new bank's data
+      ramCard.write(RAMBank.BANK_CONTROL_REGISTER, 0)
       expect(ramCard.read(RAMBank.BANK_CONTROL_REGISTER)).toBe(0)
 
-      ramCard.currentBank = 42
+      ramCard.write(RAMBank.BANK_CONTROL_REGISTER, 42)
       expect(ramCard.read(RAMBank.BANK_CONTROL_REGISTER)).toBe(42)
 
-      ramCard.currentBank = 255
+      ramCard.write(RAMBank.BANK_CONTROL_REGISTER, 255)
       expect(ramCard.read(RAMBank.BANK_CONTROL_REGISTER)).toBe(255)
     })
   })
@@ -238,11 +234,6 @@ describe('RAMBank', () => {
       expect(typeof ramCard.tick).toBe('function')
       expect(typeof ramCard.reset).toBe('function')
     })
-
-    it('should have raiseIRQ and raiseNMI callbacks', () => {
-      expect(ramCard.raiseIRQ()).toBeUndefined()
-      expect(ramCard.raiseNMI()).toBeUndefined()
-    })
   })
 
   describe('Integration', () => {

package/src/tests/IO/RTC.test.ts

@@ -80,13 +80,9 @@ describe('RTC', () => {
 		})
 
 		it('should raise IRQ when KSF is set and KIE enabled', () => {
-			const mockIRQ = jest.fn()
-			rtc.raiseIRQ = mockIRQ
-
 			rtc.reset(true)
 			rtc.write(0x0f, 0x04)
 
-			expect(mockIRQ).toHaveBeenCalledTimes(1)
 			const controlA = rtc.read(0x0e)
 			expect(controlA & 0x01).toBe(0x01)
 		})
@@ -155,9 +151,6 @@ describe('RTC', () => {
 
 	describe('Alarm', () => {
 		it('should set TDF and raise IRQ when alarm matches', () => {
-			const mockIRQ = jest.fn()
-			rtc.raiseIRQ = mockIRQ
-
 			setTime(rtc, {
 				seconds: 0x00,
 				minutes: 0x00,
@@ -175,9 +168,9 @@ describe('RTC', () => {
 			rtc.write(0x0b, 0x01)
 			rtc.write(0x0f, 0x88)
 
-			rtc.tick(1)
+			const result = rtc.tick(1)
 
-			expect(mockIRQ).toHaveBeenCalledTimes(1)
+			expect(result & 0x80).toBe(0x80) // IRQ signalled via return value
 			const controlA = rtc.read(0x0e)
 			expect(controlA & 0x08).toBe(0x08)
 			expect(controlA & 0x01).toBe(0x01)
@@ -186,32 +179,26 @@ describe('RTC', () => {
 
 	describe('Watchdog', () => {
 		it('should raise IRQ when watchdog expires with WDS=0', () => {
-			const mockIRQ = jest.fn()
-			rtc.raiseIRQ = mockIRQ
-
 			rtc.write(0x0f, 0x02)
 			rtc.write(0x0c, 0x01)
 			rtc.write(0x0d, 0x00)
 
-			rtc.tick(1)
+			const result = rtc.tick(1)
 
-			expect(mockIRQ).toHaveBeenCalledTimes(1)
+			expect(result & 0x80).toBe(0x80) // IRQ signalled via return value
 			const controlA = rtc.read(0x0e)
 			expect(controlA & 0x02).toBe(0x02)
 			expect(controlA & 0x01).toBe(0x01)
 		})
 
-		it('should raise NMI and clear WDE when WDS=1', () => {
-			const mockNMI = jest.fn()
-			rtc.raiseNMI = mockNMI
-
+		it('should signal NMI and clear WDE when WDS=1', () => {
 			rtc.write(0x0f, 0x03)
 			rtc.write(0x0c, 0x01)
 			rtc.write(0x0d, 0x00)
 
-			rtc.tick(1)
+			const result = rtc.tick(1)
 
-			expect(mockNMI).toHaveBeenCalledTimes(1)
+			expect(result & 0x40).toBe(0x40) // NMI signalled via return value bit 6
 			expect(rtc.read(0x0f) & 0x02).toBe(0)
 		})
 	})

package/src/tests/IO/Sound.test.ts

@@ -35,11 +35,11 @@ const CTRL_PULSE = 0x40
 const CTRL_NOISE = 0x80
 
 /**
- * Helper: tick the Sound for a given number of macro-ticks
- * Each tick processes 128 SID clock cycles internally
+ * Helper: tick the Sound for a given number of macro-ticks.
+ * Each macro-tick = 128 individual ticks (matching the old CYCLES_PER_TICK batch size).
  */
 const tickN = (sid: Sound, n: number): void => {
-  for (let i = 0; i < n; i++) {
+  for (let i = 0; i < n * 128; i++) {
     sid.tick(SID_CLOCK_NTSC)
   }
 }
@@ -632,11 +632,9 @@ describe('Sound (MOS 6581 SID)', () => {
 
   describe('IO interface', () => {
 
-    test('should have raiseIRQ and raiseNMI callbacks', () => {
-      expect(sid.raiseIRQ).toBeDefined()
-      expect(sid.raiseNMI).toBeDefined()
-      expect(typeof sid.raiseIRQ).toBe('function')
-      expect(typeof sid.raiseNMI).toBe('function')
+    test('tick should return interrupt status', () => {
+      // Sound does not generate interrupts
+      expect(sid.tick(1000000)).toBe(0)
     })
 
     test('read should handle any address value', () => {

package/src/tests/IO/Storage.test.ts

@@ -22,11 +22,6 @@ describe('Storage (Compact Flash in IDE Mode)', () => {
       expect(storageCard.read(0x07) & 0x40).toBe(0x40) // Status (RDY bit)
     })
 
-    it('should have IRQ and NMI callbacks', () => {
-      expect(typeof storageCard.raiseIRQ).toBe('function')
-      expect(typeof storageCard.raiseNMI).toBe('function')
-    })
-
     it('should initialize with all storage zeroed', () => {
       // Verify first sector is all zeros
       storageCard.write(0x02, 1) // Sector count = 1
@@ -554,8 +549,6 @@ describe('Storage (Compact Flash in IDE Mode)', () => {
       expect(typeof storageCard.write).toBe('function')
       expect(typeof storageCard.tick).toBe('function')
       expect(typeof storageCard.reset).toBe('function')
-      expect(typeof storageCard.raiseIRQ).toBe('function')
-      expect(typeof storageCard.raiseNMI).toBe('function')
     })
   })
 

package/src/tests/IO/VIA.test.ts

@@ -374,31 +374,25 @@ describe('VIA (6522 VIA)', () => {
   })
 
   describe('IRQ Generation', () => {
-    it('should call raiseIRQ when enabled interrupt is triggered', () => {
-      const mockIRQ = jest.fn()
-      gpio.raiseIRQ = mockIRQ
-
+    it('should return IRQ status from tick when enabled interrupt is triggered', () => {
       gpio.write(0x0E, 0xC0) // Enable T1 interrupt
       gpio.write(0x04, 0x01)
       gpio.write(0x05, 0x00)
 
       gpio.tick(1000000)
-      gpio.tick(1000000)
+      const result = gpio.tick(1000000)
 
-      expect(mockIRQ).toHaveBeenCalled()
+      expect(result & 0x80).toBe(0x80)
     })
 
-    it('should not call raiseIRQ when interrupt is not enabled', () => {
-      const mockIRQ = jest.fn()
-      gpio.raiseIRQ = mockIRQ
-
+    it('should not return IRQ status from tick when interrupt is not enabled', () => {
       gpio.write(0x04, 0x01)
       gpio.write(0x05, 0x00)
 
       gpio.tick(1000000)
-      gpio.tick(1000000)
+      const result = gpio.tick(1000000)
 
-      expect(mockIRQ).not.toHaveBeenCalled()
+      expect(result & 0x80).toBe(0)
     })
   })
 

package/src/tests/IO/Video.test.ts

@@ -79,9 +79,9 @@ const setupTextMode = (vdp: Video): void => {
  * frame clears the status register during sprite processing).
  */
 const renderOneFrame = (vdp: Video, frequency: number = 1000000): void => {
-  // At 2MHz: cyclesPerFrame ≈ 33333, each tick = 128 cycles → ~261 ticks/frame
-  const ticksPerFrame = Math.ceil((frequency / 60) / 128)
-  for (let i = 0; i < ticksPerFrame; i++) {
+  // Each tick = 1 cycle. Cycles per frame = frequency / 60.
+  const cyclesPerFrame = Math.ceil(frequency / 60)
+  for (let i = 0; i < cyclesPerFrame; i++) {
     vdp.tick(frequency)
   }
 }
@@ -389,16 +389,15 @@ describe('Video (TMS9918 VDP)', () => {
       expect(vdp.getStatus() & 0x80).toBe(0)
     })
 
-    it('should call raiseIRQ when interrupt flag is set', () => {
-      const irqFn = jest.fn()
-      vdp.raiseIRQ = irqFn
-
+    it('should return IRQ status from tick when interrupt flag is set', () => {
       writeRegister(vdp, 1, 0x60) // Display active + interrupts enabled
       clearSprites(vdp)
 
       renderOneFrame(vdp)
 
-      expect(irqFn).toHaveBeenCalled()
+      // After frame, tick should return 0x80 indicating IRQ
+      const result = vdp.tick(1000000)
+      expect(result & 0x80).toBe(0x80)
     })
   })