Remove all debugger.js files when running uncompiled without the Debugger, and some PDP-11 layout fixes
This commit is contained in:
parent
4731531764
commit
49b5e34ba2
7 changed files with 22 additions and 11 deletions
|
|
@ -1929,13 +1929,13 @@ HTMLOut.prototype.processMachines = function(aMachines, buildOptions, done)
|
|||
}
|
||||
}
|
||||
/*
|
||||
* Step 2: If there's a "debugger.js" source file in the list of uncompiled files, we need to remove
|
||||
* it, which we do by using the Array splice() method, removing the 1 matching element from the array.
|
||||
* Step 2: If there are "debugger.js" source files in the list of uncompiled files, we need to remove
|
||||
* them, which we do by using the Array splice() method, removing the matching element(s) from the array.
|
||||
*/
|
||||
for (i = 0; i < asFiles.length; i++) {
|
||||
if (asFiles[i].indexOf("/debugger.js") >= 0) {
|
||||
asFiles.splice(i, 1);
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -332,6 +332,17 @@ CPUStatePDP11.prototype.getMMR1 = function()
|
|||
return result;
|
||||
};
|
||||
|
||||
/**
|
||||
* getMMR3()
|
||||
*
|
||||
* @this {CPUStatePDP11}
|
||||
* @return {number}
|
||||
*/
|
||||
CPUStatePDP11.prototype.getMMR3 = function()
|
||||
{
|
||||
return this.regMMR3;
|
||||
};
|
||||
|
||||
/**
|
||||
* setMMR3()
|
||||
*
|
||||
|
|
@ -1133,7 +1144,7 @@ CPUStatePDP11.prototype.trap = function(vector, reason)
|
|||
doubleTrap = true;
|
||||
}
|
||||
|
||||
if (!(this.regMMR0 & 0xe000)) {
|
||||
if (!(this.regMMR0 & PDP11.MMR0.ABORT)) {
|
||||
this.regMMR1 = 0xf6f6;
|
||||
this.regMMR2 = vector;
|
||||
}
|
||||
|
|
@ -2103,7 +2114,7 @@ CPUStatePDP11.prototype.stepCPU = function(nMinCycles)
|
|||
|
||||
do {
|
||||
if (DEBUGGER && nDebugCheck) {
|
||||
if (this.dbg.checkInstruction(this.getPC(), nDebugState)) {
|
||||
if (this.dbg && this.dbg.checkInstruction(this.getPC(), nDebugState)) {
|
||||
this.stopCPU();
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ DevicePDP11.prototype.writeMMR2 = function(data, addr)
|
|||
*/
|
||||
DevicePDP11.prototype.readMMR3 = function(addr)
|
||||
{
|
||||
return this.cpu.regMMR3;
|
||||
return this.cpu.getMMR3();
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue