From 2e27b0d2bb14779b6454275fb0352b9cd73882d6 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 9 Jul 2020 07:03:09 -0500
Subject: [PATCH] show >8 bit arrays in debug, check for non-typed arrays in
 state, fix embed iframe

---
 doc/notes.txt             |  1 +
 embed.html                |  2 +-
 jsnes                     |  2 +-
 src/common/emu.ts         | 12 +++++++-----
 src/common/recorder.ts    |  1 +
 src/ide/views.ts          |  5 +++--
 src/machine/apple2.ts     |  5 +++--
 test/cli/testplatforms.js | 13 +++++++++++++
 8 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/doc/notes.txt b/doc/notes.txt
index f7cc5a88..15a96465 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -192,6 +192,7 @@ TODO:
   - copy to gen/ directory (allowJs is weird)
 - can we debug first frame via replay?
 - ca65 line numbers are not aligned with source code
+  - segments not read properly
 - Debug Browser
   - hex viewer
   - show 16/32 typed arrays
diff --git a/embed.html b/embed.html
index d8e664b5..e72a007f 100644
--- a/embed.html
+++ b/embed.html
@@ -17,7 +17,7 @@
   flex-grow: 1;
 }
 .emuvideo {
-  width:90%;
+  width: calc(100% - 70px);
   border-radius:20px;
   border: 4px solid #222;
   outline-color: #666;
diff --git a/jsnes b/jsnes
index 03614b82..a6a026b6 160000
--- a/jsnes
+++ b/jsnes
@@ -1 +1 @@
-Subproject commit 03614b82158dabc4fc78c728be0b6a847538b957
+Subproject commit a6a026b698f9a68372cc94b46182e3abedc26672
diff --git a/src/common/emu.ts b/src/common/emu.ts
index 4be86303..ed05ca06 100644
--- a/src/common/emu.ts
+++ b/src/common/emu.ts
@@ -305,15 +305,17 @@ export class AnimationTimer {
 
 // TODO: move to util?
 
-export function dumpRAM(ram:Uint8Array|number[], ramofs:number, ramlen:number) : string {
+export function dumpRAM(ram:ArrayLike<number>, ramofs:number, ramlen:number) : string {
   var s = "";
+  var bpel = ram['BYTES_PER_ELEMENT'] || 1;
+  var perline = Math.ceil(16 / bpel);
   // TODO: show scrollable RAM for other platforms
-  for (var ofs=0; ofs<ramlen; ofs+=0x10) {
+  for (var ofs=0; ofs<ramlen; ofs+=perline) {
     s += '$' + hex(ofs+ramofs) + ':';
-    for (var i=0; i<0x10; i++) {
+    for (var i=0; i<perline; i++) {
       if (ofs+i < ram.length) {
-        if (i == 8) s += " ";
-        s += " " + hex(ram[ofs+i]);
+        if (i == perline/2) s += " ";
+        s += " " + hex(ram[ofs+i], bpel*2);
       }
     }
     s += "\n";
diff --git a/src/common/recorder.ts b/src/common/recorder.ts
index 1d0ce9d7..62669a49 100644
--- a/src/common/recorder.ts
+++ b/src/common/recorder.ts
@@ -224,6 +224,7 @@ export class ProbeRecorder implements ProbeAll {
     if (this.singleFrame) this.reset();
   }
   logExecute(address:number, SP:number) {
+    // TODO? record stack pushes (not all platforms use logExecute)
     if (this.cur_sp !== SP) {
       if (SP < this.cur_sp) {
         this.log(ProbeFlags.SP_PUSH | (this.cur_sp - SP));
diff --git a/src/ide/views.ts b/src/ide/views.ts
index c1bb26c7..a9e61615 100644
--- a/src/ide/views.ts
+++ b/src/ide/views.ts
@@ -1161,6 +1161,7 @@ export class RasterPCHeatMapView extends ProbeBitmapViewBase implements ProjectV
   }
 }
 
+// TODO?
 export class RasterStackMapView extends ProbeBitmapViewBase implements ProjectView {
   pcstack = [];
   pushed = false;
@@ -1401,8 +1402,8 @@ class TreeNode {
         text = obj;
       else
         text = obj.substring(0, MAX_STRING_LEN) + "...";
-    // byte array (TODO: other kinds)
-    } else if (obj instanceof Uint8Array && obj.length <= MAX_CHILDREN) {
+    // typed byte array (TODO: other kinds)
+    } else if (obj.buffer && obj.length <= MAX_CHILDREN) {
       text = dumpRAM(obj, 0, obj.length);
     // recurse into object? (or function)
     } else if (typeof obj == 'object' || typeof obj == 'function') {
diff --git a/src/machine/apple2.ts b/src/machine/apple2.ts
index 3bae22df..fc25552a 100644
--- a/src/machine/apple2.ts
+++ b/src/machine/apple2.ts
@@ -8,9 +8,10 @@ const cpuFrequency = 1023000;
 const cpuCyclesPerLine = 65; // approx: http://www.cs.columbia.edu/~sedwards/apple2fpga/
 const cpuCyclesPerFrame = 65*262;
 
+// TODO: read prodos/ca65 header?
 const VM_BASE = 0x803; // where to JMP after pr#6
-const LOAD_BASE = VM_BASE; //0x7c9; // where to load ROM
-const PGM_BASE = VM_BASE; //0x800; // where to load ROM
+const LOAD_BASE = VM_BASE;
+const PGM_BASE = VM_BASE;
 const HDR_SIZE = PGM_BASE - LOAD_BASE;
 
 interface AppleIIStateBase {
diff --git a/test/cli/testplatforms.js b/test/cli/testplatforms.js
index 3c15a4e4..43829529 100644
--- a/test/cli/testplatforms.js
+++ b/test/cli/testplatforms.js
@@ -117,6 +117,17 @@ global.Mousetrap = function() {
 
 //
 
+function checkForBigNonTypedArrays(obj, path='') {
+  if (typeof obj != 'object' || obj == null) return;
+  Object.entries(obj).forEach((entry) => {
+    if (entry[1] instanceof Array && entry[1].length > 200) {
+      if (typeof entry[1][0] == 'number' && entry[1].buffer == null)
+        throw new Error("array in save state not typed: " + path + '/' + entry[0]);
+    }
+    checkForBigNonTypedArrays(entry[1], path + '/' + entry[0]);
+  });
+}
+
 async function testPlatform(platid, romname, maxframes, callback) {
     var platform = new emu.PLATFORMS[platid](emudiv);
     await platform.start();
@@ -127,6 +138,7 @@ async function testPlatform(platid, romname, maxframes, callback) {
     rom = new Uint8Array(rom);
     platform.loadROM("ROM", rom);
     var state0a = platform.saveState();
+    checkForBigNonTypedArrays(state0a);
     platform.reset(); // reset again
     var state0b = platform.saveState();
     //TODO: vcs fails assert.deepEqual(state0a, state0b);
@@ -152,6 +164,7 @@ async function testPlatform(platid, romname, maxframes, callback) {
     assert.equal(maxframes, rec.loadFrame(maxframes));
     var state2 = platform.saveState();
     assert.deepEqual(state1, state2);
+    checkForBigNonTypedArrays(state2);
     // test memory reads not clearing stuff
     for (var i=0; i<=0xffff; i++)
       if (platform.readAddress) platform.readAddress(i);