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

Cleaned up interrupt handling, register initialization, MMU initialization, etc

Browse source
This commit is contained in:
Jeff 2016-09-26 16:53:37 -07:00 • committed by Jeff Parsons
commit 3497466113
8 changed files with 1642 additions and 1620 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1087,8 +1087,12 @@ CPUPDP11.prototype.runCPU = function(fUpdateFocus)
this.stepCPU(nCyclesPerBurst);
}
catch(exception) {
/*
* We assume that any numeric exception was explicitly thrown by the CPU to interrupt the
* current instruction (and by extension, the current burst, but not the current run). All
* other exceptions are re-thrown to the catch below, which will attempt a stack dump.
*/
if (typeof exception != "number") throw exception;
if (DEBUG) this.println("CPU exception: " + str.toHexWord(exception));
}
/*

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

File diff suppressed because it is too large Load diff

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

@ -1200,12 +1200,14 @@ if (DEBUGGER) {
}
}
catch(exception) {
/*
* We assume that any numeric exception was explicitly thrown by the CPU to interrupt the
* current instruction. For all other exceptions, we attempt a stack dump.
*/
if (typeof exception != "number") {
var e = exception;
this.nCycles = 0;
this.cpu.setError(e.stack || e.message);
} else {
if (DEBUG) this.println("CPU exception: " + str.toHexWord(exception));
}
}
@ -1980,11 +1982,11 @@ if (DEBUGGER) {
}
else if (opTypeOther == DebuggerPDP11.OP_DSTNUM3) {
disp = (opCode & 0x7);
sOperand = this.toStrBase(disp, 2);
sOperand = this.toStrBase(disp, 1);
}
else if (opTypeOther == DebuggerPDP11.OP_DSTNUM6) {
disp = (opCode & 0x3f);
sOperand = this.toStrBase(disp);
sOperand = this.toStrBase(disp, 1);
}
else {
/*

8
modules/pdp11/lib/defines.js
View file

@ -157,14 +157,6 @@ var PDP11 = {
CMODE: 14
}
},
/*
* Interrupt-related flags (stored in intFlags)
*/
INTFLAG: {
NONE: 0x0000,
INTR: 0x00ff, // mask for 8 bits, representing interrupt levels 0-7
HALT: 0x0100 // halt requested; see opHLT()
},
/*
* Internal operation state flags
*/

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

@ -233,6 +233,38 @@ DevicePDP11.prototype.writeLKS = function(data, addr)
this.kw11.lks = data & ~PDP11.KW11.LKS.MONITOR;
};
/**
* readMMR0(addr)
*
* @this {DevicePDP11}
* @param {number} addr (eg, PDP11.UNIBUS.MMR0 or 177572)
* @return {number}
*/
DevicePDP11.prototype.readMMR0 = function(addr)
{
return this.cpu.getMMR0();
};
/**
* writeMMR0(data, addr)
*
* @this {DevicePDP11}
* @param {number} data
* @param {number} addr (eg, PDP11.UNIBUS.MMR0 or 177572)
*/
DevicePDP11.prototype.writeMMR0 = function(data, addr)
{
/*
* Set idx to 1 (22-bit), 2 (18-bit), or 4 (16-bit)
*/
var idx = 4;
data = this.cpu.setMMR0(data);
if (data & PDP11.MMR0.ENABLED | PDP11.MMR0.DSTMODE) {
idx = (this.cpu.MMR3 & PDP11.MMR3.MMU_22BIT)? 1 : 2;
}
this.display.misc = (this.display.misc & ~7) | idx;
};
/**
* readXCSR(addr)
*
@ -890,24 +922,23 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
switch (physicalAddress & ~0x3F) /*077*/ {
case 0x3FFFC0: /*017777700*/ // 017777700 - 017777777
switch (physicalAddress & ~1) {
/*
* Superseded by UNIBUS_TABLE (more of this code will be commented out
* as it is replaced by read/write handlers in the UNIBUS_TABLE; stay tuned).
*
case 0x3FFFFE: // 017777776 // PSW
result = cpu.getPSW();
if (data >= 0) {
if (physicalAddress & 1) {
data = (data << 8) | (result & 0xff);
} else {
if (byteFlag) data = (result & 0xff00) | (data & 0xff);
}
data = (data & 0xf8ef) | (result & 0x0710);
cpu.setPSW(data);
return -1; // KLUDGE - no trap but abort any CC updates
}
break;
*/
//
// Superseded by UNIBUS_TABLE (more of this code will be commented out
// as it is replaced by read/write handlers in UNIBUS_TABLE; stay tuned).
//
// case 0x3FFFFE: // 017777776 // PSW
// result = cpu.getPSW();
// if (data >= 0) {
// if (physicalAddress & 1) {
// data = (data << 8) | (result & 0xff);
// } else {
// if (byteFlag) data = (result & 0xff00) | (data & 0xff);
// }
// data = (data & 0xf8ef) | (result & 0x0710);
// cpu.setPSW(data);
// return -1; // KLUDGE - no trap but abort any CC updates
// }
// break;
case 0x3FFFFC: /*017777774*/ // stack limit
if (data < 0) {
result = cpu.regSL & 0xff00;
@ -941,9 +972,9 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
case 0x3FFFF6: /*017777766*/ // CPU error
if (cpu.cpuType !== 70) return cpu.trap(PDP11.TRAP.BUS_ERROR, 222);
if (data < 0) {
result = cpu.regCPUErr;
result = cpu.regErr;
} else {
result = cpu.regCPUErr = 0; // TODO: Always writes as zero?
result = cpu.regErr = 0; // TODO: Always writes as zero?
}
break;
case 0x3FFFF4: /*017777764*/ // System I/D
@ -1038,7 +1069,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
}
return result;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 124);
}
break;
@ -1062,32 +1093,32 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
result = cpu.MMR1;
if (result & 0xff00) result = ((result << 8) | (result >> 8)) & 0xffff;
break;
case 0x3FFF7A: /*017777572*/ // MMR0
cpu.MMR0 = (cpu.MMR0 & 0xf381) | (cpu.mmuLastMode << 5) | (cpu.mmuLastPage << 1);
if (data < 0) {
result = cpu.MMR0;
} else {
result = this.insertData(cpu.MMR0, physicalAddress, data, byteFlag);
if (result >= 0) {
cpu.MMR0 = result &= 0xf381;
cpu.mmuLastMode = (result >> 5) & 3;
cpu.mmuLastPage = (result >> 1) & 0xf;
if (result & 0x101) {
idx = 2; // 18 bit
if (cpu.MMR3 & 0x10) idx = 1; // 22 bit
if (result & 0x1) {
cpu.mmuEnable = PDP11.ACCESS.READ | PDP11.ACCESS.WRITE;
} else {
cpu.mmuEnable = PDP11.ACCESS.WRITE;
}
} else {
cpu.mmuEnable = 0;
idx = 4; // 16 bit
}
this.display.misc = (this.display.misc & ~7) | idx;
}
}
break;
// case 0x3FFF7A: /*017777572*/ // MMR0
// cpu.MMR0 = (cpu.MMR0 & 0xf381) | (cpu.mmuLastMode << 5) | (cpu.mmuLastPage << 1);
// if (data < 0) {
// result = cpu.MMR0;
// } else {
// result = this.insertData(cpu.MMR0, physicalAddress, data, byteFlag);
// if (result >= 0) {
// cpu.MMR0 = result &= 0xf381;
// cpu.mmuLastMode = (result >> 5) & 3;
// cpu.mmuLastPage = (result >> 1) & 0xf;
// if (result & 0x101) {
// idx = 2; // 18 bit
// if (cpu.MMR3 & 0x10) idx = 1; // 22 bit
// if (result & 0x1) {
// cpu.mmuEnable = PDP11.ACCESS.READ | PDP11.ACCESS.WRITE;
// } else {
// cpu.mmuEnable = PDP11.ACCESS.WRITE;
// }
// } else {
// cpu.mmuEnable = 0;
// idx = 4; // 16 bit
// }
// this.display.misc = (this.display.misc & ~7) | idx;
// }
// }
// break;
case 0x3FFF78: /*017777570*/ // console display/switch;
if (data < 0) {
result = this.display.switches & 0xffff;
@ -1191,7 +1222,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
// }
// break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 126);
}
break;
@ -1234,7 +1265,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
if (result >= 0) rk11.rkdb = result;
break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 128);
}
break;
@ -1339,7 +1370,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
if (result >= 0) rp11.rpcs3 = result;
break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 132);
}
break;
@ -1378,7 +1409,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
}
break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 134);
}
break;
@ -1404,7 +1435,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
}
break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 136);
}
break;
@ -1454,12 +1485,12 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
idx = (physicalAddress >> 1) & 0xff;
result = DevicePDP11.M9312[idx];
} else {
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 138);
}
break;
default:
cpu.regCPUErr |= PDP11.CPUERR.TIMEOUT;
cpu.regErr |= PDP11.CPUERR.TIMEOUT;
return cpu.trap(PDP11.TRAP.BUS_ERROR, 142);
}
if (byteFlag && result >= 0) { // make any required byte adjustment
@ -1480,6 +1511,7 @@ DevicePDP11.prototype.access = function(physicalAddress, data, byteFlag)
*/
DevicePDP11.UNIBUS_TABLE = {
[PDP11.UNIBUS.LKS]: [null, null, DevicePDP11.prototype.readLKS, DevicePDP11.prototype.writeLKS],
[PDP11.UNIBUS.MMR0]: [null, null, DevicePDP11.prototype.readMMR0, DevicePDP11.prototype.writeMMR0],
[PDP11.UNIBUS.XCSR]: [null, null, DevicePDP11.prototype.readXCSR, DevicePDP11.prototype.writeXCSR],
[PDP11.UNIBUS.PSW]: [null, null, DevicePDP11.prototype.readPSW, DevicePDP11.prototype.writePSW]
};

14
modules/shared/lib/debugger.js
View file

@ -659,25 +659,25 @@ if (DEBUGGER) {
};
/**
* toStrBase(n, cch)
* toStrBase(n, nBytes)
*
* Use this instead of str.toHex() or str.toOct() to convert words to the default base.
* Use this instead of str.toHex() or str.toOct() to convert bytes/words to the Debugger's default base.
*
* @this {Debugger}
* @param {number|null|undefined} n
* @param {number} [cch] is the desired number of hex digits (0 or undefined for default)
* @param {number} [nBytes] is the number of bytes to display, which we translate into a number of characters
* @return {string}
*/
Debugger.prototype.toStrBase = function(n, cch)
Debugger.prototype.toStrBase = function(n, nBytes)
{
switch(this.nBase) {
case 8:
return str.toOct(n, cch);
return str.toOct(n, nBytes * 3);
case 10:
return n.toString(); // TODO: Do we want to support any formatting based on cch?
return n.toString();
case 16:
default:
return str.toHex(n, cch);
return str.toHex(n, nBytes * 2);
}
};