Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger now actually prevents an undefined opcode from executing (until/unless you single-step it)

Browse source
This commit is contained in:
Jeff Parsons 2016-10-15 11:59:48 -07:00 • committed by Jeff Parsons
commit 1e080e720e
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/pdp11/lib/bus.js
View file

@ -281,7 +281,7 @@ BusPDP11.IOController = {
} }
return b; return b;
} }
b = bus.unknownAccess(addr, -1, true); b = bus.unknownAccess(addr, true);
if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) { if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) {
this.dbg.printMessage("warning: unconverted read access to byte @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(b), true, true); this.dbg.printMessage("warning: unconverted read access to byte @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(b), true, true);
} }
@ -354,7 +354,7 @@ BusPDP11.IOController = {
} }
return; return;
} }
bus.unknownAccess(addr, b, true); bus.unknownAccess(addr, true, b);
if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) { if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) {
this.dbg.printMessage("warning: unconverted write access to byte @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(b), true, true); this.dbg.printMessage("warning: unconverted write access to byte @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(b), true, true);
} }
@ -386,7 +386,7 @@ BusPDP11.IOController = {
} }
return w; return w;
} }
w = bus.unknownAccess(addr, -1); w = bus.unknownAccess(addr, false);
if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) { if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) {
this.dbg.printMessage("warning: unconverted read access to word @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(w), true, true); this.dbg.printMessage("warning: unconverted read access to word @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(w), true, true);
} }
@ -422,7 +422,7 @@ BusPDP11.IOController = {
} }
return; return;
} }
bus.unknownAccess(addr, w); bus.unknownAccess(addr, false, w);
if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) { if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.BUS)) {
this.dbg.printMessage("warning: unconverted write access to word @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(w), true, true); this.dbg.printMessage("warning: unconverted write access to word @" + this.dbg.toStrBase(addr) + ": " + this.dbg.toStrBase(w), true, true);
} }
@ -539,23 +539,23 @@ BusPDP11.prototype.reset = function()
}; };
/** /**
* unknownAccess(addr, data, fByte) * unknownAccess(addr, fByte, data)
* *
* This is our default I/O handler, called when there's an IOPAGE access without a corresponding entry in aIOHandlers. * This is our default I/O handler, called when there's an IOPAGE access without a corresponding entry in aIOHandlers.
* *
* @this {BusPDP11} * @this {BusPDP11}
* @param {number} addr (ie, an IOPAGE address) * @param {number} addr (ie, an IOPAGE address)
* @param {number} data (-1 if read, otherwise write)
* @param {boolean} [fByte] (true if byte access, otherwise word) * @param {boolean} [fByte] (true if byte access, otherwise word)
* @param {number} [data] (undefined if read, otherwise write)
* @return {number} * @return {number}
*/ */
BusPDP11.prototype.unknownAccess = function(addr, data, fByte) BusPDP11.prototype.unknownAccess = function(addr, fByte, data)
{ {
if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.WARN)) { if (DEBUGGER && this.dbg && this.dbg.messageEnabled(MessagesPDP11.WARN)) {
/* /*
* TODO: For 22-bit machines, let's display addr as a 3-byte value (for a total of 9 octal digits) * TODO: For 22-bit machines, let's display addr as a 3-byte value (for a total of 9 octal digits)
*/ */
this.dbg.printMessage("warning: unknown I/O access (" + this.dbg.toStrBase(addr, 3) + "," + this.dbg.toStrBase(data) + "," + fByte + ")", true, true); this.dbg.printMessage("warning: unknown I/O access (" + this.dbg.toStrBase(addr) + "," + this.dbg.toStrBase(data, fByte?1:2) + ")", true, true);
if (this.dbg.stopInstruction()) return 0; if (this.dbg.stopInstruction()) return 0;
} }
if (!this.nDisableTraps) { if (!this.nDisableTraps) {

2
modules/pdp11/lib/cpuops.js
View file

@ -1764,7 +1764,7 @@ PDP11.opXOR = function(opCode)
PDP11.opUndefined = function(opCode) PDP11.opUndefined = function(opCode)
{ {
if (DEBUGGER && this.dbg) { if (DEBUGGER && this.dbg) {
this.dbg.undefinedInstruction(opCode); if (this.dbg.undefinedInstruction(opCode)) return;
} }
this.trap(PDP11.TRAP.RESERVED, PDP11.REASON.RESERVED); this.trap(PDP11.TRAP.RESERVED, PDP11.REASON.RESERVED);
}; };

3
modules/pdp11/lib/debugger.js
View file

@ -1631,11 +1631,12 @@ if (DEBUGGER) {
* *
* @this {DebuggerPDP11} * @this {DebuggerPDP11}
* @param {number} opCode * @param {number} opCode
* @return {boolean} true if stopping is enabled, false if not
*/ */
DebuggerPDP11.prototype.undefinedInstruction = function(opCode) DebuggerPDP11.prototype.undefinedInstruction = function(opCode)
{ {
this.printMessage("undefined opcode " + this.toStrBase(opCode), true, true); this.printMessage("undefined opcode " + this.toStrBase(opCode), true, true);
this.stopInstruction(); // allow the caller to step over it if they really want a trap generated return this.stopInstruction(); // allow the caller to step over it if they really want a trap generated
}; };
/** /**