rk86 2.0.7 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rk86",
-    "version": "2.0.7",
+    "version": "2.0.8",
     "description": "Эмулятор Радио-86РК (Intel 8080) для терминала",
     "bin": {
         "rk86": "rk86.js"

package/rk86.js

@@ -2468,6 +2468,18 @@ var extract_rk86_word = function(v, i) {
 };
 var to_text = (binary) => binary.reduce((a, x) => a + String.fromCharCode(x), "");
 var is_hex_file = (image) => to_text(image.slice(0, 6)) === "#!rk86";
+var parse = (binary) => {
+  try {
+    if (!binary)
+      return { ok: false };
+    if (binary instanceof Uint8Array)
+      binary = Array.from(binary);
+    const text = to_text(binary);
+    return { ok: true, json: JSON.parse(text) };
+  } catch {
+    return { ok: false };
+  }
+};
 var convert_hex_to_binary = function(text) {
   const lines = text.split(`
 `).filter((line) => line.trim().length).filter((line) => !line.startsWith(";") && !line.startsWith("#"));
@@ -2659,7 +2671,7 @@ function create(array, width = 16) {
   }
   return v;
 }
-function parse(hex2) {
+function parse2(hex2) {
   const array = [];
   for (let [label, line] of Object.entries(hex2)) {
     const address = parseInt(label.slice(1), 16);
@@ -2773,7 +2785,7 @@ class Memory {
     this.video_screen_cursor_y = snapshot.video_screen_cursor_y;
     this.last_access_address = h(snapshot.last_access_address);
     this.last_access_operation = snapshot.last_access_operation;
-    this.buf = parse(snapshot.memory);
+    this.buf = parse2(snapshot.memory);
   };
   invalidate_access_variables() {
     this.last_access_address = 0;
@@ -3208,6 +3220,29 @@ class Screen {
   }
 }
 
+// src/lib/rk86_snapshot.ts
+function rk86_snapshot_restore(snapshot, machine, keys_injector) {
+  try {
+    const json = typeof snapshot === "string" ? JSON.parse(snapshot) : snapshot;
+    if (json.id != "rk86")
+      return false;
+    if (!machine)
+      return false;
+    const { screen, cpu, memory, keyboard } = machine;
+    cpu.import(json.cpu);
+    keyboard.import(json.keyboard);
+    screen.import(json.screen);
+    memory.import(json.memory);
+    screen.apply_import();
+    if (keys_injector && json.boot?.keyboard)
+      keys_injector(json.boot?.keyboard);
+    return true;
+  } catch (e) {
+    console.error("failed restoring snapshot", e);
+    return false;
+  }
+}
+
 // src/lib/rk86_tape.ts
 class Tape {
   machine;
@@ -3684,10 +3719,17 @@ async function main() {
   let entryPoint;
   if (programFile) {
     const content = await fetchFile(programFile);
-    const file = parse_rk86_binary(programFile, content);
-    machine.memory.load_file(file);
-    entryPoint = file.entry;
-    console.error(`\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D: ${programFile} (${file.start.toString(16)}-${file.end.toString(16)}, G${file.entry.toString(16)})`);
+    const { ok, json } = parse(content);
+    if (ok) {
+      rk86_snapshot_restore(json, machine);
+      entryPoint = parseInt(json.cpu.pc);
+      console.error(`\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D \u043E\u0431\u0440\u0430\u0437: ${programFile} (PC=${entryPoint.toString(16)})`);
+    } else {
+      const file = parse_rk86_binary(programFile, content);
+      machine.memory.load_file(file);
+      entryPoint = file.entry;
+      console.error(`\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D: ${programFile} (${file.start.toString(16)}-${file.end.toString(16)}, G${file.entry.toString(16)})`);
+    }
   }
   process.stdout.write("\x1B[?25l");
   process.stdout.write("\x1B[2J");