Fix #523: Cpu emulator test runner doesn't recognize asm from assembl…

…er page (#525) fix #523: Test runner of cpu emulator page doesn't execute code that was passed from assembler page add isEmpty() to Memory class check for ROM.isEmpty() in cputst.step() Co-authored-by: Dorian Ignee <[email protected]>
nand2tetris · Dec 5, 2024 · 36e768d · 36e768d
1 parent 20f9059
commit 36e768d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/simulator/src/cpu/memory.ts b/simulator/src/cpu/memory.ts
@@ -127,6 +127,10 @@ export class Memory implements MemoryAdapter {
   [Symbol.iterator](): Iterable<number> {
     return this.map((_, v) => v);
   }
+
+  isEmpty(): boolean {
+    return this.memory.every((word) => word === 0);
+  }
 }
 
 export class SubMemory implements MemoryAdapter {

diff --git a/simulator/src/test/cputst.ts b/simulator/src/test/cputst.ts
@@ -55,7 +55,7 @@ export class CPUTest extends Test<CPUTestInstruction> {
   }
 
   override async step() {
-    if (!(this.hasLoad || this.fileLoaded)) {
+    if (!this.hasLoad && this.cpu.ROM.isEmpty()) {
       throw new Error(
         "Cannot execute the test without first loading an .asm or .hack file",
       );