diff --git a/macros.js b/macros.js index b936397..219db8b 100644 --- a/macros.js +++ b/macros.js @@ -265,11 +265,14 @@ function chipStatus(){ ' NMI:' + readBit('nmi'); var machine4 = ' IR:' + hexByte(255 - readBits('notir', 8)) + - ' idl:' + hexByte(255 - readBits('idl', 8)) + - ' alu:' + hexByte(255 - readBits('alu', 8)) + ' TCstate:' + readBit('clock1') + readBit('clock2') + readBit('t2') + readBit('t3') + readBit('t4') + readBit('t5'); var machine5 = + ' idl:' + hexByte(readBits('idl', 8)) + + ' alu:' + hexByte(readBits('alu', 8)) + + ' idb:' +hexByte(readBits('idb',8)) + + ' dor:' + hexByte(readBits('dor',8)); + var machine6 = ' notRdy0:' + readBit('notRdy0') + ' fetch:' + readBit('fetch') + ' clearIR:' + readBit('clearIR') + diff --git a/nodenames.js b/nodenames.js index d6638c0..190bc8c 100644 --- a/nodenames.js +++ b/nodenames.js @@ -185,14 +185,22 @@ sb4: 1405, sb5: 166, sb6: 1336, sb7: 1001, -alu0: 394, // datapath state: ALU output -alu1: 697, -alu2: 276, -alu3: 495, -alu4: 1490, -alu5: 893, -alu6: 68, -alu7: 1123, +notalu0: 394, // datapath state: alu output storage node (inverse) +notalu1: 697, +notalu2: 276, +notalu3: 495, +notalu4: 1490, +notalu5: 893, +notalu6: 68, +notalu7: 1123, +alu0: 401, // datapath signal: ALU output +alu1: 872, +alu2: 1637, +alu3: 1414, +alu4: 606, +alu5: 314, +alu6: 331, +alu7: 765, adl0: 413, // internal state: address latch low adl1: 1282, adl2: 1242, @@ -217,14 +225,22 @@ idb4: 892, idb5: 1503, idb6: 833, idb7: 493, -dor0: 222, // internal state: data output register -dor1: 527, -dor2: 1288, -dor3: 823, -dor4: 873, -dor5: 1266, -dor6: 1418, -dor7: 158, +notdor0: 222, // internal state: data output register (storage node) +notdor1: 527, +notdor2: 1288, +notdor3: 823, +notdor4: 873, +notdor5: 1266, +notdor6: 1418, +notdor7: 158, +dor0: 97, // internal signal: data output register +dor1: 746, +dor2: 1634, +dor3: 444, +dor4: 1088, +dor5: 1453, +dor6: 1415, +dor7: 63, pd0: 758, // internal state: predecode register pd1: 361, pd2: 955,