n
/
cardiograph-computer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up debugging / print statements

This commit is contained in:
n loewen 2023-08-01 12:56:31 +01:00
parent b16f6927ee
commit 0834516c6b
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sketches/assembler.js
View File

@ -10,7 +10,6 @@
const printMemory = require('./print-memory.js'); const printMemory = require('./print-memory.js');
const { debug } = require("console");
// 0 = silent // 0 = silent
// 1 = verbose // 1 = verbose
@ -41,8 +40,6 @@ function decodeInstructions(str) {
console.group(`Input line ${i}, cursor ${byteCursor}`); console.group(`Input line ${i}, cursor ${byteCursor}`);
dbg(3, `> ${lines[i]}`); dbg(3, `> ${lines[i]}`);
let line = stripWhitespaceFromEnds(stripComments(lines[i])); let line = stripWhitespaceFromEnds(stripComments(lines[i]));
// console.log();
// console.log(`> ${line}`);
// Handle blank lines // Handle blank lines
if (line.length === 0) { if (line.length === 0) {
@ -66,11 +63,8 @@ function decodeInstructions(str) {
bytesToReplace: [], bytesToReplace: [],
}; };
} }
dbg(2, `pointsToByte: ${labels[label].pointsToByte}`);
dbg(2, ''); dbg(2, `bytesToReplace: ${labels[label].bytesToReplace}`);
dbg(2, `@label anchor: ${label}`);
dbg(2, labels);
dbg(2, '');
dbg(3, `cursor: ${byteCursor}, new code: none`); dbg(3, `cursor: ${byteCursor}, new code: none`);
console.groupEnd('Input line'); console.groupEnd('Input line');
continue; continue;
@ -94,11 +88,8 @@ function decodeInstructions(str) {
// TODO: validate label // validateLabel(line); // TODO: validate label // validateLabel(line);
label = arg_str.substring(1); // strip '@' label = arg_str.substring(1); // strip '@'
arg_num = 0; arg_num = 0;
dbg(2, '');
dbg(2, `@label reference: ${label}`);
if (label in labels) { if (label in labels) {
dbg(2, '');
dbg(1, `'${label}' already in labels object`); dbg(1, `'${label}' already in labels object`);
labels[label].bytesToReplace.push(byteCursor + 1); labels[label].bytesToReplace.push(byteCursor + 1);
} else { } else {
@ -107,11 +98,8 @@ function decodeInstructions(str) {
bytesToReplace: [byteCursor + 1], bytesToReplace: [byteCursor + 1],
}; };
} }
// dbg(2, labels); dbg(2, `pointsToByte: ${labels[label].pointsToByte}`);
dbg(2, `label pointsToByte: ${labels[label].pointsToByte}`); dbg(2, `bytesToReplace: ${labels[label].bytesToReplace}`);
dbg(2, `label bytesToReplace: ${labels[label].bytesToReplace}`);
dbg(2, '');
} else if (arg_str.startsWith("(")) { } else if (arg_str.startsWith("(")) {
// Handle indirect expressions // Handle indirect expressions
addressingMode = "indirect"; addressingMode = "indirect";
@ -137,12 +125,18 @@ function decodeInstructions(str) {
console.groupEnd('Input line'); console.groupEnd('Input line');
}; };
printMemory.printTable(machineCode); dbg(2, '');
dbgGroup(2, 'Memory before filling in label pointers');
dbgExec(2, () => printMemory.printTable(machineCode));
dbgGroupEnd(2, 'Memory before filling in label pointers');
// Backfill label pointers // Backfill label pointers
for (let k of Object.keys(labels)) { for (let k of Object.keys(labels)) {
dbgGroup(2, `@${k}`);
let label = labels[k]; let label = labels[k];
dbg(2, label); dbg(2, `pointsToByte: ${label.pointsToByte}`);
dbg(2, `bytesToReplace: ${label.bytesToReplace}`);
dbgGroupEnd(2, `label`);
for (let j = 0; j < label.bytesToReplace.length; j++) { for (let j = 0; j < label.bytesToReplace.length; j++) {
machineCode[label.bytesToReplace[j]] = label.pointsToByte; machineCode[label.bytesToReplace[j]] = label.pointsToByte;
} }
@ -164,9 +158,11 @@ function stripWhitespaceFromEnds(line) {
function hex2num(hex) { return parseInt(hex, 16) }; function hex2num(hex) { return parseInt(hex, 16) };
function dbg(debugLevel, string) { // Debug helpers
if (debugLevel >= DEBUG) console.log(string); const dbg = (lvl, s) => { if (lvl >= DEBUG) console.log(s) };
} const dbgGroup = (lvl, s) => { if (lvl >= DEBUG) console.group(s) };
const dbgGroupEnd = (lvl, s) => { if (lvl >= DEBUG) console.groupEnd(s) };
const dbgExec = (lvl, func) => { if (lvl >= DEBUG) func(); }
// RUN IT // RUN IT