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

Changed toStrBase() to accept a number of bits rather than a number of bytes, because bytes aren't always 8 bits (see PDP-10)

Browse source
This commit is contained in:
Jeff Parsons 2017-02-24 10:58:56 -08:00 • committed by Jeff Parsons
commit c0de732f76
14 changed files with 260 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1596,7 +1596,7 @@ class CPUStatePDP11 extends CPUPDP11 {
if (DEBUG && this.dbg) {
if (this.messageEnabled(MessagesPDP11.TRAP)) {
var sReason = reason < 0? PDP11.REASONS[-reason] : this.dbg.toStrBase(reason);
this.printMessage("trap to vector " + this.dbg.toStrBase(vector, 1) + " (" + sReason + ")", MessagesPDP11.TRAP, true);
this.printMessage("trap to vector " + this.dbg.toStrBase(vector, 8) + " (" + sReason + ")", MessagesPDP11.TRAP, true);
}
}

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

@ -1212,7 +1212,7 @@ class DebuggerPDP11 extends Debugger {
if (trapStatus) {
var reason = trapStatus >> 8;
var sReason = reason < 0? PDP11.REASONS[-reason] : this.toStrBase(reason);
this.println("trapped to " + this.toStrBase(trapStatus & 0xff, 1) + " (" + sReason + ")");
this.println("trapped to " + this.toStrBase(trapStatus & 0xff, 8) + " (" + sReason + ")");
}
this.dbgAddrNextCode = this.newAddr(this.cpu.getPC());
@ -2073,15 +2073,15 @@ class DebuggerPDP11 extends Debugger {
}
else if (opTypeOther == DebuggerPDP11.OP_DSTNUM3) {
disp = (opCode & 0x07);
sOperand = this.toStrBase(disp, 1);
sOperand = this.toStrBase(disp, 3);
}
else if (opTypeOther == DebuggerPDP11.OP_DSTNUM6) {
disp = (opCode & 0x3f);
sOperand = this.toStrBase(disp, 1);
sOperand = this.toStrBase(disp, 6);
}
else if (opTypeOther == DebuggerPDP11.OP_DSTNUM8) {
disp = (opCode & 0xff);
sOperand = this.toStrBase(disp, 1);
sOperand = this.toStrBase(disp, 8);
}
else {
/*
@ -2123,7 +2123,7 @@ class DebuggerPDP11 extends Debugger {
* When using R7 (aka PC), POST-INCREMENT is known as IMMEDIATE
*/
wIndex = this.getWord(dbgAddr, 2);
sOperand = '#' + this.toStrBase(wIndex, 0, true);
sOperand = '#' + this.toStrBase(wIndex, -1);
}
break;
@ -2135,7 +2135,7 @@ class DebuggerPDP11 extends Debugger {
* When using R7 (aka PC), POST-INCREMENT DEFERRED is known as ABSOLUTE
*/
wIndex = this.getWord(dbgAddr, 2);
sOperand = "@#" + this.toStrBase(wIndex, 0, true);
sOperand = "@#" + this.toStrBase(wIndex, -1);
sTarget = this.getTarget(wIndex);
}
break;
@ -2150,7 +2150,7 @@ class DebuggerPDP11 extends Debugger {
case PDP11.OPMODE.INDEX: // 0x6: INDEX
wIndex = this.getWord(dbgAddr, 2);
sOperand = this.toStrBase(wIndex, 0, true) + '(' + this.getRegName(reg) + ')';
sOperand = this.toStrBase(wIndex, -1) + '(' + this.getRegName(reg) + ')';
if (reg == 7) {
/*
* When using R7 (aka PC), INDEX is known as RELATIVE. However, instead of displaying
@ -2936,9 +2936,9 @@ class DebuggerPDP11 extends Debugger {
if (shift == size) {
if (fJSON) {
if (sData) sData += ",";
sData += "0x"+ Str.toHex(data, size * 2);
sData += "0x"+ Str.toHex(data, size << 1);
} else {
sData += this.toStrBase(data, size);
sData += this.toStrBase(data, size << 3);
sData += (size == 1? (i == 9? '-' : ' ') : " ");
}
data = shift = 0;
@ -3007,7 +3007,7 @@ class DebuggerPDP11 extends Debugger {
if (vNew & ~mask) {
this.println("warning: " + Str.toHex(vNew) + " exceeds " + size + "-byte value");
}
this.println("changing " + this.toStrAddr(dbgAddr) + (this.messageEnabled(MessagesPDP11.BUS)? "" : (" from " + this.toStrBase(fnGet.call(this, dbgAddr), size))) + " to " + this.toStrBase(vNew, size));
this.println("changing " + this.toStrAddr(dbgAddr) + (this.messageEnabled(MessagesPDP11.BUS)? "" : (" from " + this.toStrBase(fnGet.call(this, dbgAddr), size << 3))) + " to " + this.toStrBase(vNew, size << 3));
//noinspection JSUnresolvedFunction
fnSet.call(this, dbgAddr, vNew, size);
}

6
modules/pdp11/lib/device.js
View file

@ -146,16 +146,16 @@ class DevicePDP11 extends Component {
if (DEBUGGER) {
var dbg = this.dbg;
if (sFilter && sName.indexOf(sFilter.toUpperCase()) < 0) return;
var nBits = 0;
var nRegs = 8;
var sDump = "";
var fIndex = false;
var nBytes = 0;
var nWidth = 8;
if (offset < 0) {
nBits = 22;
nRegs = aRegs.length;
offset = 0;
fIndex = true;
nBytes = 3;
nWidth = 4;
}
for (var i = 0; i < nRegs; i++) {
@ -163,7 +163,7 @@ class DevicePDP11 extends Component {
if (sDump) sDump += '\n';
sDump += sName + (fIndex? ('[' + Str.toDec(i, 2) + ']') : '') + ':';
}
sDump += ' ' + dbg.toStrBase(aRegs[offset + i], nBytes);
sDump += ' ' + dbg.toStrBase(aRegs[offset + i], nBits);
}
dbg.println(sDump + (fBreak? '\n' : ''));
}