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

Fixed PDP-11 Debugger display of alternate target addresses

Browse source
This commit is contained in:
Jeff 2016-10-03 15:45:05 -07:00 • committed by Jeff Parsons
commit 9dd582eda8
3 changed files with 293 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1972,7 +1972,7 @@ if (DEBUGGER) {
if (!opDesc) opDesc = [DebuggerPDP11.OPS.NONE];
var sOperands = "";
var sOperands = "", sTarget = "";
var sOpName = opNames[opDesc[0]];
var cOperands = opDesc.length - 1;
@ -1990,14 +1990,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.
* operand, and the second element contains an alternate representation of the operand (eg, target address).
*/
if (typeof sOperand != "string") {
/*
* TODO: Stop overriding the comment and sequence values once cycle counts become legitimate.
*/
/* if (!sComment) */ sComment = sOperand[1];
nSequence = null;
sTarget = sOperand[1];
sOperand = sOperand[0];
}
@ -2018,14 +2014,15 @@ if (DEBUGGER) {
sLine += str.pad(sOpName, 5);
if (sOperands) sLine += ' ' + sOperands;
if (sComment) {
sLine = str.pad(sLine, 60) + ';' + sComment;
if (sComment || sTarget) {
sLine = str.pad(sLine, 60) + ';' + (sComment || "");
if (!this.cpu.flags.checksum) {
sLine += (nSequence != null? '=' + nSequence.toString() : "");
} else {
var nCycles = this.cpu.getCycles();
sLine += "cycles=" + nCycles.toString() + " cs=" + str.toHex(this.cpu.nChecksum);
}
if (sTarget) sLine += " @" + sTarget;
}
return sLine;
};