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

Fixed read/write breakpoints for instructions that snapshot the cycle count, and improved the disassembly of PC-relative operands

Browse source
This commit is contained in:
Jeff Parsons 2016-10-21 13:45:01 -07:00 • committed by Jeff Parsons
commit 22e24697fe
5 changed files with 286 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2091,7 +2091,8 @@ if (DEBUGGER) {
/*
* If getOperand() returns an Array rather than a string, then the first element is the original
* operand, and the second element contains an alternate representation of the operand (eg, target address).
* operand, and the second element contains an alternate representation of the operand (eg, target address,
* memory contents, etc).
*/
if (typeof sOperand != "string") {
sTarget = sOperand[1];
@ -2134,6 +2135,10 @@ if (DEBUGGER) {
* If getOperand() returns an Array rather than a string, then the first element is the original
* operand, and the second element is a comment containing an alternate representation of the operand.
*
* TODO: For PC-relative addresses, we now return the effective address directly, rather than as the
* second element of an Array; however, I still envision using Array return values to include current
* memory operands, so support for such values is being left in place.
*
* @this {DebuggerPDP11}
* @param {number} opCode
* @param {number} opType
@ -2229,9 +2234,20 @@ if (DEBUGGER) {
sOperand = this.toStrBase(wIndex, 0, true) + '(' + this.getRegName(reg) + ')';
if (reg == 7) {
/*
* When using R7 (aka PC), INDEX is known as RELATIVE
* When using R7 (aka PC), INDEX is known as RELATIVE. However, instead of displaying
* such an instruction like this:
*
* 016156: 010167 001300 MOV R1,1300(PC) ; @017462
*
* with the effective address display to the far right, let's display it like this instead:
*
* 016156: 010167 001300 MOV R1,017462
*
* because you can still clearly see PC-relative offset (eg, 001300) as part of the disassembly.
*
* sOperand = [sOperand, this.toStrBase((wIndex + dbgAddr.addr) & 0xffff)];
*/
sOperand = [sOperand, this.toStrBase((wIndex + dbgAddr.addr) & 0xffff)];
sOperand = this.toStrBase((wIndex + dbgAddr.addr) & 0xffff);
}
break;
case PDP11.OPMODE.INDEXD: // 0x7: INDEX DEFERRED
@ -2239,9 +2255,12 @@ if (DEBUGGER) {
sOperand = '@' + this.toStrBase(wIndex) + '(' + this.getRegName(reg) + ')';
if (reg == 7) {
/*
* When using R7 (aka PC), INDEX DEFERRED is known as RELATIVE DEFERRED
* When using R7 (aka PC), INDEX DEFERRED is known as RELATIVE DEFERRED. And for the same
* reasons articulated above, we now display the effective address inline.
*
* sOperand = [sOperand, this.toStrBase((wIndex + dbgAddr.addr) & 0xffff)];
*/
sOperand = [sOperand, this.toStrBase((wIndex + dbgAddr.addr) & 0xffff)];
sOperand = '@' + this.toStrBase((wIndex + dbgAddr.addr) & 0xffff);
}
break;
default: