Implement resetRam test command (#462)

nand2tetris · Sep 17, 2024 · 752ce6f · 752ce6f
1 parent fab8cec
commit 752ce6f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/simulator/src/languages/grammars/tst.ohm b/simulator/src/languages/grammars/tst.ohm
@@ -18,6 +18,7 @@ Tst <: Base {
     | TstEchoOperation
     | TstClearEchoOperation
     | TstLoadROMOperation
+    | TstResetRAMOperation
 
   TstLoadROMOperation = ROM32K Load FileName
   TstFileOperation = FileOperation FileName?
@@ -31,6 +32,7 @@ Tst <: Base {
   TstOutputOperation = Output
   TstEchoOperation = Echo String
   TstClearEchoOperation = ClearEcho
+  TstResetRAMOperation = ResetRAM
 
   FileName = Name
   FileOperation = "load" | "output-file" | "compare-to"
@@ -50,6 +52,7 @@ Tst <: Base {
   ROM32K = "ROM32K"
   Load = "load"
   While = "while"
+  ResetRAM = "resetRam"
 
   CompareOp = "<>" | "<=" | ">=" | "=" | "<" | ">"
 }
diff --git a/simulator/src/languages/grammars/tst.ohm.js b/simulator/src/languages/grammars/tst.ohm.js
@@ -19,6 +19,7 @@ Tst <: Base {
     | TstEchoOperation
     | TstClearEchoOperation
     | TstLoadROMOperation
+    | TstResetRAMOperation
 
   TstLoadROMOperation = ROM32K Load FileName
   TstFileOperation = FileOperation FileName?
@@ -32,6 +33,7 @@ Tst <: Base {
   TstOutputOperation = Output
   TstEchoOperation = Echo String
   TstClearEchoOperation = ClearEcho
+  TstResetRAMOperation = ResetRAM
 
   FileName = Name
   FileOperation = "load" | "output-file" | "compare-to"
@@ -51,6 +53,7 @@ Tst <: Base {
   ROM32K = "ROM32K"
   Load = "load"
   While = "while"
+  ResetRAM = "resetRam"
 
   CompareOp = "<>" | "<=" | ">=" | "=" | "<" | ">"
 }`;

diff --git a/simulator/src/languages/tst.ts b/simulator/src/languages/tst.ts
@@ -56,6 +56,10 @@ export interface TstFileOperation {
   file?: string;
 }
 
+export interface TstResetRamOperation {
+  op: "resetRam";
+}
+
 export type TstOperation =
   | TstFileOperation
   | TstEvalOperation
@@ -64,7 +68,8 @@ export type TstOperation =
   | TstOutputOperation
   | TstSetOperation
   | TstOutputListOperation
-  | TstLoadROMOperation;
+  | TstLoadROMOperation
+  | TstResetRamOperation;
 
 export type Separator = "," | ";" | "!";
 
@@ -198,6 +203,11 @@ tstSemantics.addAttribute<TstOperation>("operation", {
       file: file?.sourceString,
     };
   },
+  TstResetRAMOperation(_) {
+    return {
+      op: "resetRam",
+    };
+  },
 });
 
 tstSemantics.addAttribute<TstCommand>("command", {

diff --git a/simulator/src/test/builder.ts b/simulator/src/test/builder.ts
@@ -12,7 +12,7 @@ import {
   TestTickInstruction,
   TestTockInstruction,
 } from "./chiptst.js";
-import { TestTickTockInstruction } from "./cputst.js";
+import { TestResetRamInstruction, TestTickTockInstruction } from "./cputst.js";
 import {
   Condition,
   TestBreakInstruction,
@@ -69,6 +69,8 @@ function makeInstruction(inst: TstOperation) {
     case "output-file":
     case "compare-to":
       return undefined;
+    case "resetRam":
+      return new TestResetRamInstruction();
     default:
       checkExhaustive(op, `Unknown tst operation ${op}`);
   }

diff --git a/simulator/src/test/cputst.ts b/simulator/src/test/cputst.ts
@@ -123,3 +123,14 @@ export class TestTickTockInstruction implements CPUTestInstruction {
     yield this;
   }
 }
+
+export class TestResetRamInstruction implements CPUTestInstruction {
+  readonly _cpuTestInstruction_ = true;
+  async do(test: CPUTest) {
+    test.cpu.RAM.reset();
+  }
+
+  *steps() {
+    yield this;
+  }
+}
diff --git a/web/src/languages/tst.ts b/web/src/languages/tst.ts
@@ -13,6 +13,7 @@ export const TstLanguage: monaco.languages.IMonarchLanguage = {
     "repeat",
     "while",
     "load",
+    "resetRam",
   ],
 
   // The main tokenizer for our languages