diff --git a/expertWires.js b/expertWires.js index 343f3d6..9a0e13e 100644 --- a/expertWires.js +++ b/expertWires.js @@ -96,7 +96,7 @@ function setup_part3(){ // which saves a lot of memory and allows us to run on small systems updateChipLayoutVisibility(true); } - setStatus('resetting 6502...'); + setStatus('resetting ' + chipname + '...'); setTimeout(setup_part4, 0); } @@ -195,9 +195,9 @@ function setupParams(){ } else // setup input pin events, breakpoints, watchpoints if(name=="reset0" && parseInt(value)!=NaN){ - clockTriggers[value]=[clockTriggers[value],"setLow('res');"].join(""); + clockTriggers[value]=[clockTriggers[value],"setLow(nodenamereset);"].join(""); } else if(name=="reset1" && parseInt(value)!=NaN){ - clockTriggers[value]=[clockTriggers[value],"setHigh('res');"].join(""); + clockTriggers[value]=[clockTriggers[value],"setHigh(nodenamereset);"].join(""); } else if(name=="irq0" && parseInt(value)!=NaN){ clockTriggers[value]=[clockTriggers[value],"setLow('irq');"].join(""); } else if(name=="irq1" && parseInt(value)!=NaN){ diff --git a/macros.js b/macros.js index 301b844..db9884c 100644 --- a/macros.js +++ b/macros.js @@ -26,6 +26,8 @@ var trace = Array(); var logstream = Array(); var running = false; var logThese=[]; +var chipname='6502'; +var nodenamereset='res'; var presetLogLists=[ ['cycle'], ['ab','db','rw','Fetch','pc','a','x','y','s','p'], @@ -35,7 +37,7 @@ var presetLogLists=[ ['alucin','alua','alub','alucout','aluvout','dasb'], ['plaOutputs','DPControl'], ['idb','dor'], - ['irq','nmi','res'], + ['irq','nmi',nodenamereset], ]; function loadProgram(){ @@ -147,13 +149,13 @@ function initChip(){ nodes[npwr].state = true; nodes[npwr].float = false; for(var tn in transistors) transistors[tn].on = false; - setLow('res'); + setLow(nodenamereset); setLow('clk0'); setHigh('rdy'); setLow('so'); setHigh('irq'); setHigh('nmi'); recalcNodeList(allNodes()); for(var i=0;i<8;i++){setHigh('clk0'), setLow('clk0');} - setHigh('res'); + setHigh(nodenamereset); for(var i=0;i<18;i++){halfStep();} // avoid updating graphics and trace buffer before user code refresh(); cycle = 0; @@ -424,7 +426,7 @@ function stopChip(){ function resetChip(){ stopChip(); - setStatus('resetting 6502...'); + setStatus('resetting ' + chipname + '...'); setTimeout(initChip,0); }