Refactored the assembler, yet again, and implemented

support for comma separated values.

The assembler now uses a linked list of tokenized
lines, each containing a linked list of tokens for
that line.

I also moved all of the large tables into the higher
parts of memory, in order to free up the lower part of
memory for the user.

Comma sepparated values only work with directives, and
only with the byte", word, dword, and qword directives.

I also added support for getting the upper, and lower
halves of an address. The tokens for both of those are
'<', and '>' respectively.

1 files changed, 34 insertions, 19 deletions

diff --git a/disasm.c b/disasm.c
index c055d07..0a4b6ef 100644
--- a/disasm.c
+++ b/disasm.c
@@ -69,30 +69,45 @@ void disasm(struct sux *cpu, uint64_t *operands, uint8_t lines, uint8_t opcode,
 	if (subdbg) {
 		uint8_t ln = 33;
 		uint16_t line_idx = 0;
-		uint16_t tmpad = 0x2000;
+		uint32_t tmpad = 0x31000;
 		int row, col;
 		uint8_t iscursor = 0;
-		uint64_t ptr;
-		uint8_t adr;
+		union reg ptr;
+		uint32_t adr;
 		wmove(scr, 30, 0);
-		adr = 0x1F;
-		ptr = (uint64_t)addr[adr+0] << 0x00 | (uint64_t)addr[adr+1] << 0x08 | (uint64_t)addr[adr+2] << 0x10 | (uint64_t)addr[adr+3] << 0x18 |
-		      (uint64_t)addr[adr+4] << 0x20 | (uint64_t)addr[adr+5] << 0x28 | (uint64_t)addr[adr+6] << 0x30 | (uint64_t)addr[adr+7] << 0x38;
-		wprintw(scr, "ptr1: $%04"PRIX64, ptr);
-		adr = 0x27;
-		ptr = (uint64_t)addr[adr+0] << 0x00 | (uint64_t)addr[adr+1] << 0x08 | (uint64_t)addr[adr+2] << 0x10 | (uint64_t)addr[adr+3] << 0x18 |
-		      (uint64_t)addr[adr+4] << 0x20 | (uint64_t)addr[adr+5] << 0x28 | (uint64_t)addr[adr+6] << 0x30 | (uint64_t)addr[adr+7] << 0x38;
-		wprintw(scr, ", ptr2: $%04"PRIX64, ptr);
-		adr = 0x2F;
-		ptr = (uint64_t)addr[adr+0] << 0x00 | (uint64_t)addr[adr+1] << 0x08 | (uint64_t)addr[adr+2] << 0x10 | (uint64_t)addr[adr+3] << 0x18 |
-		      (uint64_t)addr[adr+4] << 0x20 | (uint64_t)addr[adr+5] << 0x28 | (uint64_t)addr[adr+6] << 0x30 | (uint64_t)addr[adr+7] << 0x38;
-		wprintw(scr, ", ptr3: $%04"PRIX64, ptr);
+		wclrtoeol(scr);
+		adr = 0x25;
+		ptr.u8[0] = addr[adr+0]; ptr.u8[1] = addr[adr+1];
+		ptr.u8[2] = addr[adr+2]; ptr.u8[3] = addr[adr+3];
+		ptr.u8[4] = addr[adr+4]; ptr.u8[5] = addr[adr+5];
+		ptr.u8[6] = addr[adr+6]; ptr.u8[7] = addr[adr+7];
+		wprintw(scr, "ptr1: $%04"PRIX64, ptr.u64);
+		adr = 0x2D;
+		ptr.u8[0] = addr[adr+0]; ptr.u8[1] = addr[adr+1];
+		ptr.u8[2] = addr[adr+2]; ptr.u8[3] = addr[adr+3];
+		ptr.u8[4] = addr[adr+4]; ptr.u8[5] = addr[adr+5];
+		ptr.u8[6] = addr[adr+6]; ptr.u8[7] = addr[adr+7];
+		wprintw(scr, ", ptr2: $%04"PRIX64, ptr.u64);
+		adr = 0x35;
+		ptr.u8[0] = addr[adr+0]; ptr.u8[1] = addr[adr+1];
+		ptr.u8[2] = addr[adr+2]; ptr.u8[3] = addr[adr+3];
+		ptr.u8[4] = addr[adr+4]; ptr.u8[5] = addr[adr+5];
+		ptr.u8[6] = addr[adr+6]; ptr.u8[7] = addr[adr+7];
+		wprintw(scr, ", ptr3: $%04"PRIX64, ptr.u64);
+		adr = 0x3349A;
+		ptr.u8[0] = addr[adr+0]; ptr.u8[1] = addr[adr+1];
+		ptr.u8[2] = addr[adr+2]; ptr.u8[3] = addr[adr+3];
+		ptr.u8[4] = addr[adr+4]; ptr.u8[5] = addr[adr+5];
+		ptr.u8[6] = addr[adr+6]; ptr.u8[7] = addr[adr+7];
+		wprintw(scr, ", idx0: $%04"PRIX64, ptr.u64);
 		if (address == CTRL_ADDR || addr[STEP_ADDR]) {
 			mvwprintw(scr, 29, 0, "address: $%04"PRIX64", scr_row: %02u, scr_col: %02u, scr_str: %02u, scr_end: %02u\r", address, addr[0], addr[1], addr[0x1C], addr[0x1D]);
-			mvwprintw(scr, 32, 0, "bitabl: %02X%02X%02X%02X%02X%02X%02X%02X"
-						"%02X%02X%02X%02X%02X%02X%02X%02X"
-						, addr[0x1000], addr[0x1001], addr[0x1002], addr[0x1003], addr[0x1004], addr[0x1005], addr[0x1006], addr[0x1007]
-						, addr[0x1008], addr[0x1009], addr[0x100A], addr[0x100B], addr[0x100C], addr[0x100D], addr[0x100E], addr[0x100F]);
+			adr = 0x300000;
+			wmove(scr, 32, 0);
+			wprintw(scr, "bitabl: ");
+			for (uint8_t i = 0; i < 16; i++) {
+				wprintw(scr, "%02X", addr[adr+i]);
+			}
 			mvwprintw(scr, ln++, 0, "buffer:\r");
 			wmove(scr, ln++, 0);
 			for (uint8_t i = 0; i < 10; i++) {