From 02cb20ec878b61aad1c3f3daffeb43d97fe224aa Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 1 Sep 2022 10:19:20 -0500
Subject: [PATCH] moved ProbeRecorder to own module

---
 src/common/baseplatform.ts  |   2 +-
 src/common/probe.ts         | 160 +++++++++++++++++++++++++++++++++++
 src/common/recorder.ts      | 161 ------------------------------------
 src/ide/views/debugviews.ts |   2 +-
 src/ide/views/treeviews.ts  |   2 +-
 src/platform/nes.ts         |   2 +-
 src/platform/vcs.ts         |   2 +-
 src/platform/vectrex.ts     |   2 +-
 8 files changed, 166 insertions(+), 167 deletions(-)
 create mode 100644 src/common/probe.ts

diff --git a/src/common/baseplatform.ts b/src/common/baseplatform.ts
index 06791e1d..f7cee339 100644
--- a/src/common/baseplatform.ts
+++ b/src/common/baseplatform.ts
@@ -10,7 +10,7 @@ import { Z80 } from "./cpu/ZilogZ80";
 import { Bus, Resettable, FrameBased, VideoSource, SampledAudioSource, AcceptsROM, AcceptsBIOS, AcceptsKeyInput, SavesState, SavesInputState, HasCPU, HasSerialIO, SerialIOInterface, AcceptsJoyInput } from "./devices";
 import { Probeable, RasterFrameBased, AcceptsPaddleInput } from "./devices";
 import { SampledAudio } from "./audio";
-import { ProbeRecorder } from "./recorder";
+import { ProbeRecorder } from "./probe";
 import { BaseWASMMachine } from "./wasmplatform";
 import { CPU6809 } from "./cpu/6809";
 import { _MOS6502 } from "./cpu/MOS6502";
diff --git a/src/common/probe.ts b/src/common/probe.ts
new file mode 100644
index 00000000..3967fffa
--- /dev/null
+++ b/src/common/probe.ts
@@ -0,0 +1,160 @@
+
+import { Probeable, ProbeAll } from "./devices";
+
+export enum ProbeFlags {
+  CLOCKS	  = 0x00000000,
+  EXECUTE	  = 0x01000000,
+  HAS_VALUE = 0x10000000,
+  MEM_READ	= 0x12000000,
+  MEM_WRITE	= 0x13000000,
+  IO_READ	  = 0x14000000,
+  IO_WRITE	= 0x15000000,
+  VRAM_READ	= 0x16000000,
+  VRAM_WRITE= 0x17000000,
+  INTERRUPT	= 0x08000000,
+  ILLEGAL	  = 0x09000000,
+  SP_PUSH	  = 0x0a000000,
+  SP_POP	  = 0x0b000000,
+  SCANLINE	= 0x7e000000,
+  FRAME		  = 0x7f000000,
+}
+
+class ProbeFrame {
+  data : Uint32Array;
+  len : number;
+}
+
+export class ProbeRecorder implements ProbeAll {
+
+  m : Probeable;      // machine to probe
+  buf : Uint32Array;  // buffer
+  idx : number = 0;   // index into buffer
+  sl : number = 0;    // scanline
+  cur_sp = -1;        // last stack pointer
+  singleFrame : boolean = true; // clear between frames
+
+  constructor(m:Probeable, buflen?:number) {
+    this.m = m;
+    this.reset(buflen || 0x100000);
+  }
+  start() {
+    this.m.connectProbe(this);
+  }
+  stop() {
+    this.m.connectProbe(null);
+  }
+  reset(newbuflen? : number) {
+    if (newbuflen) this.buf = new Uint32Array(newbuflen);
+    this.sl = 0;
+    this.cur_sp = -1;
+    this.clear();
+  }
+  clear() {
+    this.idx = 0;
+  }
+  logData(a:number) {
+    this.log(a);
+  }
+  log(a:number) {
+    // TODO: coalesce READ and EXECUTE and PUSH/POP
+    if (this.idx >= this.buf.length) return;
+    this.buf[this.idx++] = a;
+  }
+  relog(a:number) {
+    this.buf[this.idx-1] = a;
+  }
+  lastOp() {
+    if (this.idx > 0)
+      return this.buf[this.idx-1] & 0xff000000;
+    else
+      return -1;
+  }
+  lastAddr() {
+    if (this.idx > 0)
+      return this.buf[this.idx-1] & 0xffffff;
+    else
+      return -1;
+  }
+  addLogBuffer(src: Uint32Array) {
+    if (this.idx + src.length > this.buf.length) {
+      src = src.slice(0, this.buf.length - this.idx);
+    }
+    this.buf.set(src, this.idx);
+    this.idx += src.length;
+}
+  logClocks(clocks:number) {
+    clocks |= 0;
+    if (clocks > 0) {
+      if (this.lastOp() == ProbeFlags.CLOCKS)
+        this.relog((this.lastAddr() + clocks) | ProbeFlags.CLOCKS); // coalesce clocks
+      else
+        this.log(clocks | ProbeFlags.CLOCKS);
+    }
+  }
+  logNewScanline() {
+    this.log(ProbeFlags.SCANLINE);
+    this.sl++;
+  }
+  logNewFrame() {
+    this.log(ProbeFlags.FRAME);
+    this.sl = 0;
+    if (this.singleFrame) this.clear();
+  }
+  logExecute(address:number, SP:number) {
+    // record stack pushes/pops (from last instruction)
+    if (this.cur_sp !== SP) {
+      if (SP < this.cur_sp) {
+        this.log(ProbeFlags.SP_PUSH | SP);
+      }
+      if (SP > this.cur_sp) {
+        this.log(ProbeFlags.SP_POP | SP);
+      }
+      this.cur_sp = SP;
+    }
+    this.log(address | ProbeFlags.EXECUTE);
+  }
+  logInterrupt(type:number) {
+    this.log(type | ProbeFlags.INTERRUPT);
+  }
+  logValue(address:number, value:number, op:number) {
+    this.log((address & 0xffff) | ((value & 0xff)<<16) | op);
+  }
+  logRead(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.MEM_READ);
+  }
+  logWrite(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.MEM_WRITE);
+  }
+  logIORead(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.IO_READ);
+  }
+  logIOWrite(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.IO_WRITE);
+  }
+  logVRAMRead(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.VRAM_READ);
+  }
+  logVRAMWrite(address:number, value:number) {
+    this.logValue(address, value, ProbeFlags.VRAM_WRITE);
+  }
+  logIllegal(address:number) {
+    this.log(address | ProbeFlags.ILLEGAL);
+  }
+  countEvents(op : number) : number {
+    var count = 0;
+    for (var i=0; i<this.idx; i++) {
+      if ((this.buf[i] & 0xff000000) == op)
+        count++;
+    }
+    return count;
+  }
+  countClocks() : number {
+    var count = 0;
+    for (var i=0; i<this.idx; i++) {
+      if ((this.buf[i] & 0xff000000) == ProbeFlags.CLOCKS)
+        count += this.buf[i] & 0xffff;
+    }
+    return count;
+  }
+
+}
diff --git a/src/common/recorder.ts b/src/common/recorder.ts
index 9459ee4d..67131965 100644
--- a/src/common/recorder.ts
+++ b/src/common/recorder.ts
@@ -146,164 +146,3 @@ export class StateRecorderImpl implements EmuRecorder {
     }
 }
 
-/////
-
-import { Probeable, ProbeAll } from "./devices";
-
-export enum ProbeFlags {
-  CLOCKS	  = 0x00000000,
-  EXECUTE	  = 0x01000000,
-  HAS_VALUE = 0x10000000,
-  MEM_READ	= 0x12000000,
-  MEM_WRITE	= 0x13000000,
-  IO_READ	  = 0x14000000,
-  IO_WRITE	= 0x15000000,
-  VRAM_READ	= 0x16000000,
-  VRAM_WRITE= 0x17000000,
-  INTERRUPT	= 0x08000000,
-  ILLEGAL	  = 0x09000000,
-  SP_PUSH	  = 0x0a000000,
-  SP_POP	  = 0x0b000000,
-  SCANLINE	= 0x7e000000,
-  FRAME		  = 0x7f000000,
-}
-
-class ProbeFrame {
-  data : Uint32Array;
-  len : number;
-}
-
-export class ProbeRecorder implements ProbeAll {
-
-  m : Probeable;      // machine to probe
-  buf : Uint32Array;  // buffer
-  idx : number = 0;   // index into buffer
-  sl : number = 0;    // scanline
-  cur_sp = -1;        // last stack pointer
-  singleFrame : boolean = true; // clear between frames
-
-  constructor(m:Probeable, buflen?:number) {
-    this.m = m;
-    this.reset(buflen || 0x100000);
-  }
-  start() {
-    this.m.connectProbe(this);
-  }
-  stop() {
-    this.m.connectProbe(null);
-  }
-  reset(newbuflen? : number) {
-    if (newbuflen) this.buf = new Uint32Array(newbuflen);
-    this.sl = 0;
-    this.cur_sp = -1;
-    this.clear();
-  }
-  clear() {
-    this.idx = 0;
-  }
-  logData(a:number) {
-    this.log(a);
-  }
-  log(a:number) {
-    // TODO: coalesce READ and EXECUTE and PUSH/POP
-    if (this.idx >= this.buf.length) return;
-    this.buf[this.idx++] = a;
-  }
-  relog(a:number) {
-    this.buf[this.idx-1] = a;
-  }
-  lastOp() {
-    if (this.idx > 0)
-      return this.buf[this.idx-1] & 0xff000000;
-    else
-      return -1;
-  }
-  lastAddr() {
-    if (this.idx > 0)
-      return this.buf[this.idx-1] & 0xffffff;
-    else
-      return -1;
-  }
-  addLogBuffer(src: Uint32Array) {
-    if (this.idx + src.length > this.buf.length) {
-      src = src.slice(0, this.buf.length - this.idx);
-    }
-    this.buf.set(src, this.idx);
-    this.idx += src.length;
-}
-  logClocks(clocks:number) {
-    clocks |= 0;
-    if (clocks > 0) {
-      if (this.lastOp() == ProbeFlags.CLOCKS)
-        this.relog((this.lastAddr() + clocks) | ProbeFlags.CLOCKS); // coalesce clocks
-      else
-        this.log(clocks | ProbeFlags.CLOCKS);
-    }
-  }
-  logNewScanline() {
-    this.log(ProbeFlags.SCANLINE);
-    this.sl++;
-  }
-  logNewFrame() {
-    this.log(ProbeFlags.FRAME);
-    this.sl = 0;
-    if (this.singleFrame) this.clear();
-  }
-  logExecute(address:number, SP:number) {
-    // record stack pushes/pops (from last instruction)
-    if (this.cur_sp !== SP) {
-      if (SP < this.cur_sp) {
-        this.log(ProbeFlags.SP_PUSH | SP);
-      }
-      if (SP > this.cur_sp) {
-        this.log(ProbeFlags.SP_POP | SP);
-      }
-      this.cur_sp = SP;
-    }
-    this.log(address | ProbeFlags.EXECUTE);
-  }
-  logInterrupt(type:number) {
-    this.log(type | ProbeFlags.INTERRUPT);
-  }
-  logValue(address:number, value:number, op:number) {
-    this.log((address & 0xffff) | ((value & 0xff)<<16) | op);
-  }
-  logRead(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.MEM_READ);
-  }
-  logWrite(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.MEM_WRITE);
-  }
-  logIORead(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.IO_READ);
-  }
-  logIOWrite(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.IO_WRITE);
-  }
-  logVRAMRead(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.VRAM_READ);
-  }
-  logVRAMWrite(address:number, value:number) {
-    this.logValue(address, value, ProbeFlags.VRAM_WRITE);
-  }
-  logIllegal(address:number) {
-    this.log(address | ProbeFlags.ILLEGAL);
-  }
-  countEvents(op : number) : number {
-    var count = 0;
-    for (var i=0; i<this.idx; i++) {
-      if ((this.buf[i] & 0xff000000) == op)
-        count++;
-    }
-    return count;
-  }
-  countClocks() : number {
-    var count = 0;
-    for (var i=0; i<this.idx; i++) {
-      if ((this.buf[i] & 0xff000000) == ProbeFlags.CLOCKS)
-        count += this.buf[i] & 0xffff;
-    }
-    return count;
-  }
-
-}
diff --git a/src/ide/views/debugviews.ts b/src/ide/views/debugviews.ts
index d06574d0..d5135368 100644
--- a/src/ide/views/debugviews.ts
+++ b/src/ide/views/debugviews.ts
@@ -5,7 +5,7 @@ import { platform, compparams, current_project, projectWindows } from "../ui";
 import { hex, lpad, rpad } from "../../common/util";
 import { VirtualList } from "../../common/vlist";
 import { getMousePos, getVisibleEditorLineHeight, VirtualTextLine, VirtualTextScroller } from "../../common/emu";
-import { ProbeFlags, ProbeRecorder } from "../../common/recorder";
+import { ProbeFlags, ProbeRecorder } from "../../common/probe";
 import { BaseZ80MachinePlatform, BaseZ80Platform } from "../../common/baseplatform";
 
 ///
diff --git a/src/ide/views/treeviews.ts b/src/ide/views/treeviews.ts
index b6c54a36..57d67596 100644
--- a/src/ide/views/treeviews.ts
+++ b/src/ide/views/treeviews.ts
@@ -1,5 +1,5 @@
 import { dumpRAM } from "../../common/emu";
-import { ProbeFlags } from "../../common/recorder";
+import { ProbeFlags } from "../../common/probe";
 import { hex } from "../../common/util";
 import { platform } from "../ui";
 import { ProjectView } from "./baseviews";
diff --git a/src/platform/nes.ts b/src/platform/nes.ts
index 470f1661..9454e317 100644
--- a/src/platform/nes.ts
+++ b/src/platform/nes.ts
@@ -4,7 +4,7 @@ import { PLATFORMS, setKeyboardFromMap, AnimationTimer, RasterVideo, Keys, makeK
 import { hex, byteArrayToString } from "../common/util";
 import { CodeAnalyzer_nes } from "../common/analysis";
 import { SampleAudio } from "../common/audio";
-import { ProbeRecorder } from "../common/recorder";
+import { ProbeRecorder } from "../common/probe";
 import { NullProbe, Probeable, ProbeAll } from "../common/devices";
 import Mousetrap = require('mousetrap');
 import jsnes = require('../../jsnes');
diff --git a/src/platform/vcs.ts b/src/platform/vcs.ts
index cedd8bb4..f49964a6 100644
--- a/src/platform/vcs.ts
+++ b/src/platform/vcs.ts
@@ -4,7 +4,7 @@ import { PLATFORMS, dumpRAM, EmuHalt, RasterVideo, __createCanvas } from "../com
 import { hex, loadScript, lpad, tobin } from "../common/util";
 import { CodeAnalyzer_vcs } from "../common/analysis";
 import { disassemble6502 } from "../common/cpu/disasm6502";
-import { ProbeRecorder } from "../common/recorder";
+import { ProbeRecorder } from "../common/probe";
 import { NullProbe, ProbeAll } from "../common/devices";
 import { BaseMAME6502Platform } from "../common/mameplatform";
 
diff --git a/src/platform/vectrex.ts b/src/platform/vectrex.ts
index 2e097b79..f1c215d3 100644
--- a/src/platform/vectrex.ts
+++ b/src/platform/vectrex.ts
@@ -3,7 +3,7 @@ import { Platform, BaseZ80Platform, Base6502Platform, Base6809Platform } from ".
 import { PLATFORMS, newAddressDecoder, padBytes, noise, setKeyboardFromMap, AnimationTimer, VectorVideo, Keys, makeKeycodeMap } from "../common/emu";
 import { hex, lzgmini, stringToByteArray, safe_extend } from "../common/util";
 import { MasterAudio, AY38910_Audio } from "../common/audio";
-import { ProbeRecorder } from "../common/recorder";
+import { ProbeRecorder } from "../common/probe";
 import { NullProbe, Probeable, ProbeAll } from "../common/devices";
 
 // emulator from https://github.com/raz0red/jsvecx