move all DOM Element out of the class

This commit is contained in:
wixette 2020-03-07 00:20:04 +08:00
parent 843c478cdd
commit 99e0ffff4a
2 changed files with 43 additions and 24 deletions

View File

@ -180,12 +180,20 @@
} }
} }
var dumpCpuElem = document.getElementById('cpu'); function dumpCpuCallback(dumpHtml) {
var dumpMemElem = document.getElementById('mem'); var dumpCpuElem = document.getElementById('cpu');
dumpCpuElem.innerHTML = dumpHtml;
}
function dumpMemCallback(dumpHtml) {
var dumpMemElem = document.getElementById('mem');
dumpMemElem.innerHTML = dumpHtml;
}
var sim = new Sim8800(256, 1000000, var sim = new Sim8800(256, 1000000,
setAddressLedsCallback, setDataLedsCallback, setAddressLedsCallback, setDataLedsCallback,
setWaitLedCallback, setStatusLedsCallback, setWaitLedCallback, setStatusLedsCallback,
dumpCpuElem, dumpMemElem); dumpCpuCallback, dumpMemCallback);
function powerOn() { function powerOn() {
sim.powerOn(); sim.powerOn();

View File

@ -32,24 +32,25 @@ class Sim8800 {
* set the WAIT LED. * set the WAIT LED.
* @param {function(boolean)?} setStatusLedsCallback The callback to * @param {function(boolean)?} setStatusLedsCallback The callback to
* set the STATUS LEDs. * set the STATUS LEDs.
* @param {Element?} dumpCpuElem The DOM element used to render * @param {function(string)?} dumpCpuCallback The callback to receive
* dumped CPU status. null to disable the feature. * CPU status dump, in HTML string.
* @param {Element?} dumpMemElem The DOM element used to render * @param {function(string)?} dumpMemCallback The callback to receive
* dumped memory contents. null to disable the feature. * memory contents dump, in HTML string.
*/ */
constructor(memSize, clockRate, constructor(memSize, clockRate,
setAddressLedsCallback, setDataLedsCallback, setAddressLedsCallback, setDataLedsCallback,
setWaitLedCallback, setStatusLedsCallback, setWaitLedCallback, setStatusLedsCallback,
dumpCpuElem, dumpMemElem) { dumpCpuCallback, dumpMemCallback) {
this.clockRate = clockRate; this.clockRate = clockRate;
this.mem = new Array(memSize); this.mem = new Array(memSize);
this.setAddressLedsCallback = setAddressLedsCallback; this.setAddressLedsCallback = setAddressLedsCallback;
this.setDataLedsCallback = setDataLedsCallback; this.setDataLedsCallback = setDataLedsCallback;
this.setWaitLedCallback = setWaitLedCallback; this.setWaitLedCallback = setWaitLedCallback;
this.setStatusLedsCallback = setStatusLedsCallback; this.setStatusLedsCallback = setStatusLedsCallback;
this.dumpCpuElem = dumpCpuElem; this.dumpCpuCallback = dumpCpuCallback;
this.dumpMemElem = dumpMemElem; this.dumpMemCallback = dumpMemCallback;
this.running = false; this.isPoweredOn = false;
this.isRunning = false;
this.initMem(); this.initMem();
CPU8080.init(this.getWriteByteCallback(), CPU8080.init(this.getWriteByteCallback(),
this.getReadByteCallback(), this.getReadByteCallback(),
@ -125,7 +126,7 @@ class Sim8800 {
* Dumps the memory to HTML, for debugging or monitoring. * Dumps the memory to HTML, for debugging or monitoring.
*/ */
dumpMem() { dumpMem() {
if (this.dumpMemElem) { if (this.dumpMemCallback) {
var sb = ['<pre>\n']; var sb = ['<pre>\n'];
for (let i = 0; i < this.mem.length; i += 16) { for (let i = 0; i < this.mem.length; i += 16) {
sb.push(Sim8800.toHex(i, 4)); sb.push(Sim8800.toHex(i, 4));
@ -139,7 +140,7 @@ class Sim8800 {
sb.push('\n'); sb.push('\n');
} }
sb.push('</pre>\n'); sb.push('</pre>\n');
this.dumpMemElem.innerHTML = sb.join(''); this.dumpMemCallback(sb.join(''));
} }
} }
@ -162,7 +163,7 @@ class Sim8800 {
* Dumps the internal CPU status to HTML, for debugging or mornitoring. * Dumps the internal CPU status to HTML, for debugging or mornitoring.
*/ */
dumpCpu() { dumpCpu() {
if (this.dumpCpuElem) { if (this.dumpCpuCallback) {
var cpu = CPU8080.status(); var cpu = CPU8080.status();
var sb = ['<pre>\n']; var sb = ['<pre>\n'];
sb.push('PC = ' + Sim8800.toHex(cpu.pc, 4) + ' '); sb.push('PC = ' + Sim8800.toHex(cpu.pc, 4) + ' ');
@ -183,7 +184,7 @@ class Sim8800 {
if (flags.parity) sb.push('PARITY '); if (flags.parity) sb.push('PARITY ');
if (flags.carry) sb.push('CARRY '); if (flags.carry) sb.push('CARRY ');
sb.push('</pre>\n'); sb.push('</pre>\n');
this.dumpCpuElem.innerHTML = sb.join(''); this.dumpCpuCallback(sb.join(''));
} }
} }
@ -248,7 +249,7 @@ class Sim8800 {
getClockTickerCallback() { getClockTickerCallback() {
var self = this; var self = this;
return function(timestamp) { return function(timestamp) {
if (self.running) { if (self.isRunning) {
var cycles = self.clockRate / 1000; var cycles = self.clockRate / 1000;
self.step(cycles); self.step(cycles);
window.setTimeout(self.getClockTickerCallback(), 1); window.setTimeout(self.getClockTickerCallback(), 1);
@ -261,6 +262,8 @@ class Sim8800 {
* @param {number} cycles The number of CPU cycles to step on. * @param {number} cycles The number of CPU cycles to step on.
*/ */
step(cycles) { step(cycles) {
if (!this.isPoweredOn)
return;
CPU8080.steps(cycles); CPU8080.steps(cycles);
this.dumpCpu(); this.dumpCpu();
this.dumpMem(); this.dumpMem();
@ -286,6 +289,7 @@ class Sim8800 {
} }
this.dumpCpu(); this.dumpCpu();
this.dumpMem(); this.dumpMem();
this.isPoweredOn = true;
} }
/** /**
@ -307,18 +311,21 @@ class Sim8800 {
if (this.setDataLedsCallback) { if (this.setDataLedsCallback) {
this.setDataLedsCallback(new Array(8).fill(0)); this.setDataLedsCallback(new Array(8).fill(0));
} }
if (this.dumpCpuElem) { if (this.dumpCpuCallback) {
this.dumpCpuElem.innerHTML = ''; this.dumpCpuCallback('');
} }
if (this.dumpMemElem) { if (this.dumpMemCallback) {
this.dumpMemElem.innerHTML = ''; this.dumpMemCallback('');
} }
this.isPoweredOn = false;
} }
/** /**
* Resets the machine. * Resets the machine.
*/ */
reset() { reset() {
if (!this.isPoweredOn)
return;
CPU8080.reset(); CPU8080.reset();
} }
@ -326,9 +333,11 @@ class Sim8800 {
* Stops the CPU. * Stops the CPU.
*/ */
stop() { stop() {
this.running = false; if (!this.isPoweredOn)
return;
this.isRunning = false;
if (this.setWaitLedCallback) { if (this.setWaitLedCallback) {
this.setWaitLedCallback(this.running); this.setWaitLedCallback(this.isRunning);
} }
} }
@ -336,9 +345,11 @@ class Sim8800 {
* Starts the CPU. * Starts the CPU.
*/ */
start() { start() {
this.running = true; if (!this.isPoweredOn)
return;
this.isRunning = true;
if (this.setWaitLedCallback) { if (this.setWaitLedCallback) {
this.setWaitLedCallback(this.running); this.setWaitLedCallback(this.isRunning);
} }
window.setTimeout(this.getClockTickerCallback(), 1); window.setTimeout(this.getClockTickerCallback(), 1);
} }