1
0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-11-29 14:51:17 +00:00

debug: click to breakpoint in probe views

This commit is contained in:
Steven Hugg 2022-09-01 13:43:09 -05:00
parent 664cecf4f7
commit 363691b964
6 changed files with 58 additions and 5 deletions

View File

@ -133,6 +133,7 @@ export interface Platform {
resize?() : void;
getRasterScanline?() : number;
getRasterLineClock?() : number;
setBreakpoint?(id : string, cond : DebugCondition);
clearBreakpoint?(id : string);
hasBreakpoint?(id : string) : boolean;

View File

@ -1491,7 +1491,7 @@ function setupDebugCallback(btnid? : DebugCommandType) {
}
}
function setupBreakpoint(btnid? : DebugCommandType) {
export function setupBreakpoint(btnid? : DebugCommandType) {
if (!checkRunReady()) return;
_disableRecording();
setupDebugCallback(btnid);
@ -1591,7 +1591,7 @@ function runStepBackwards() {
platform.stepBack();
}
function clearBreakpoint() {
export function clearBreakpoint() {
lastDebugState = null;
if (platform.clearDebug) platform.clearDebug();
setupDebugCallback(); // in case of BRK/trap

View File

@ -1,7 +1,7 @@
import { newDiv, ProjectView } from "./baseviews";
import { Segment } from "../../common/workertypes";
import { platform, compparams, current_project, projectWindows } from "../ui";
import { platform, compparams, current_project, projectWindows, runToPC, setupBreakpoint } from "../ui";
import { hex, lpad, rpad } from "../../common/util";
import { VirtualList } from "../../common/vlist";
import { getMousePos, getVisibleEditorLineHeight, VirtualTextLine, VirtualTextScroller } from "../../common/emu";
@ -471,6 +471,18 @@ abstract class ProbeViewBase extends ProbeViewBaseBase {
return null;
}
getOpAtPos(x:number, y:number, mask:number) : number {
x = x|0;
y = y|0;
let result = 0;
this.redraw( (op,addr,col,row,clk,value) => {
if (!result && row == y && col >= x && (op & mask) != 0) {
result = op | addr;
}
});
return result;
}
clear() {
}
@ -546,6 +558,15 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
return this.createCanvas(parent, 256, 256);
}
initCanvas() {
super.initCanvas();
this.canvas.onclick = (e) => {
var pos = getMousePos(this.canvas, e);
var opaddr = Math.floor(pos.x) + Math.floor(pos.y) * 256;
runToPC(opaddr & 0xffff);
}
}
clear() {
for (var i=0; i<=0xffff; i++) {
var v = platform.readAddress(i);
@ -555,6 +576,7 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
}
}
// TODO: show current PC
drawEvent(op, addr, col, row) {
var rgb = this.getOpRGB(op, addr);
if (!rgb) return;
@ -598,6 +620,27 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
export class RasterPCHeatMapView extends ProbeBitmapViewBase implements ProjectView {
initCanvas() {
super.initCanvas();
// TODO: run to exact x/y position
this.canvas.onclick = (e) => {
var pos = getMousePos(this.canvas, e);
var x = Math.floor(pos.x);
var y = Math.floor(pos.y);
var opaddr = this.getOpAtPos(pos.x, pos.y, ProbeFlags.EXECUTE);
if (opaddr) {
//runToPC(opaddr & 0xffff);
setupBreakpoint("toline");
platform.runEval(() => {
let onrow = platform.getRasterScanline && platform.getRasterScanline() >= y;
if (onrow && platform.getRasterLineClock) {
return onrow && platform.getRasterLineClock() > x;
} else return onrow;
});
}
}
}
drawEvent(op, addr, col, row) {
var rgb = this.getOpRGB(op, addr);
if (!rgb) return;

View File

@ -247,6 +247,9 @@ export class Atari800 extends BasicScanlineMachine {
getRasterScanline() {
return this.antic.v;
}
getRasterLineClock() {
return this.antic.h;
}
getDebugCategories() {
return ['CPU', 'Stack', 'ANTIC', 'GTIA', 'POKEY'];
}

View File

@ -295,6 +295,9 @@ class JSNESPlatform extends Base6502Platform implements Platform, Probeable {
getRasterScanline() : number {
return this.nes.ppu.scanline;
}
getRasterLineClock() : number {
return this.nes.ppu.curX;
}
getCPUState() {
var c = this.nes.cpu.toJSON();

View File

@ -156,6 +156,9 @@ class VCSPlatform extends BasePlatform {
getRasterScanline() : number {
return this.getRasterPosition().y;
}
getRasterLineClock() : number {
return this.getRasterPosition().x;
}
// TODO: Clock changes this on event, so it may not be current
isRunning() {