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

Merge branch 'master' into gh-pages, and fix a few issues related to autoStart

Browse source 
# Conflicts:
#	_posts/2016-12-02-the-pdp-11-and-vt100-revisited.md
#	docs/pcx86/examples/pcx86-dbg.js
#	docs/pcx86/examples/pcx86.js
This commit is contained in:
Jeff Parsons 2016-12-04 11:26:10 -08:00 • committed by Jeff Parsons
commit 9ed580066c
33 changed files with 348 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,21 +195,6 @@ CPUPDP11.prototype.initBus = function(cmp, bus, cpu, dbg)
if (control) this.cmp.setBinding(null, CPUPDP11.BUTTONS[i], control);
}
/*
* We've already saved the parmsCPU 'autoStart' setting, but there may be a machine (or URL) override.
*/
var sAutoStart = cmp.getMachineParm('autoStart');
if (sAutoStart != null) {
this.flags.autoStart = (sAutoStart == "true"? true : (sAutoStart == "false"? false : !!sAutoStart));
}
/*
* Start running automatically on power-up, assuming there's no Debugger and no "Run" button.
*/
if ((!DEBUGGER || !this.dbg) && this.bindings["run"] === undefined) {
this.flags.autoStart = true;
}
this.setReady();
};
@ -272,6 +257,21 @@ CPUPDP11.prototype.restore = function(data)
*/
CPUPDP11.prototype.powerUp = function(data, fRepower)
{
/*
* We've already saved the parmsCPU 'autoStart' setting, but there may be a machine (or URL) override.
*/
var sAutoStart = this.cmp.getMachineParm('autoStart');
if (sAutoStart != null) {
this.flags.autoStart = (sAutoStart == "true"? true : (sAutoStart == "false"? false : !!sAutoStart));
}
else if (this.flags.autoStart == null) {
/*
* If there's no explicit parmsCPU setting either, then we will autoStart if there's no Debugger and
* no "Run" button.
*/
this.flags.autoStart = ((!DEBUGGER || !this.dbg) && this.bindings["run"] === undefined);
}
if (!fRepower) {
this.finish();
if (!data || !this.restore) {
@ -298,6 +298,11 @@ CPUPDP11.prototype.powerUp = function(data, fRepower)
*/
this.println("No debugger detected");
}
if (this.flags.autoStart) {
this.println("CPU will auto-start");
} else {
this.println("CPU will not be auto-started, click Run to start");
}
}
/*
* The Computer component (which is responsible for all powerDown and powerUp notifications)
@ -1184,6 +1189,7 @@ CPUPDP11.prototype.startCPU = function(fUpdateFocus)
if (fUpdateFocus) this.cmp.setFocus(true);
this.cmp.start(this.msStartRun, this.getCycles());
}
if (!this.dbg) this.status("Started");
setTimeout(this.onRunTimeout, 0);
return true;
};