Merge pull request #71 from wokwi/interrupt-refactor

refactor: central interrupt handling #38

1 files changed, 5 insertions, 9 deletions

diff --git a/src/utils/test-utils.ts b/src/utils/test-utils.ts
index 2bec178..4b2efff 100644
--- a/src/utils/test-utils.ts
+++ b/src/utils/test-utils.ts
@@ -13,33 +13,29 @@ export function asmProgram(source: string) {
 }
 
 export class TestProgramRunner {
-  constructor(
-    private readonly cpu: CPU,
-    private readonly peripheral: { tick: () => void },
-    private readonly onBreak?: (cpu: CPU) => void
-  ) {}
+  constructor(private readonly cpu: CPU, private readonly onBreak?: (cpu: CPU) => void) {}
 
   runInstructions(count: number) {
-    const { cpu, peripheral, onBreak } = this;
+    const { cpu, onBreak } = this;
     for (let i = 0; i < count; i++) {
       if (cpu.progMem[cpu.pc] === BREAK_OPCODE) {
         onBreak?.(cpu);
         throw new Error('BREAK instruction encountered');
       }
       avrInstruction(cpu);
-      peripheral.tick();
+      cpu.tick();
     }
   }
 
   runToBreak(maxIterations = 5000) {
-    const { cpu, peripheral, onBreak } = this;
+    const { cpu, onBreak } = this;
     for (let i = 0; i < maxIterations; i++) {
       if (cpu.progMem[cpu.pc] === BREAK_OPCODE) {
         onBreak?.(cpu);
         return;
       }
       avrInstruction(cpu);
-      peripheral.tick();
+      cpu.tick();
     }
     throw new Error('Program ran for too long without a BREAK instruction');
   }