Removed most of the commented code, and optimized the

emulator some more.

I optimized the emulator by replacing the main loop
from a conditional while loop, to an unconditional for
loop.

1 files changed, 0 insertions, 21 deletions

diff --git a/lexer.c b/lexer.c
index 3e460d6..8b5b840 100644
--- a/lexer.c
+++ b/lexer.c
@@ -107,7 +107,6 @@ uint8_t set_symval(const char *name, uint16_t id, uint64_t val, uint8_t useid, u
 }
 
 char *get_symname(uint16_t id, uint8_t dbg) {
-	/*struct symbol *s = mksymbol("", 0, 0, 1, id, dbg);*/
 	if (symbols[id]->def) {
 		return symbols[id]->name;
 	} else {
@@ -208,28 +207,11 @@ uint16_t get_string(const char *str, uint8_t dbg) {
 uint16_t reslv_fixups(uint8_t dbg) {
 	uint16_t i = 0, j = 0;
 	for (; fixups[j]; j++) {
-		/*printf("f: $%016"PRIX64", f->nxt: $%016"PRIX64", f->s->name: %s, f->s->val: $%016"PRIX64"\n", &f, &f->nxt, f->s->name, f->s->val);*/
 		if (fixups[j]->s->def) {
 			if (dbg) {
 				printf("reslv_fixups(): Symbol ID: $%X, Symbol Name: %s.\n", fixups[j]->s->id, fixups[j]->s->name);
 			}
 			tokline[fixups[j]->ln].sym = fixups[j]->s->id;
-			/*if (f->ln == 0xFFFF) {
-				addr[f->adr] = f->s->val & 0xFF;
-				if (f->s->val & 0xFF00)
-					addr[f->adr+1] = f->s->val >> 8;
-				if (f->s->val & 0xFF000000) {
-					addr[f->adr+2] = f->s->val >> 16;
-					addr[f->adr+3] = f->s->val >> 24;
-				}
-				if (f->s->val & 0xFF00000000000000) {
-					addr[f->adr+4] = f->s->val >> 32;
-					addr[f->adr+5] = f->s->val >> 40;
-					addr[f->adr+6] = f->s->val >> 48;
-					addr[f->adr+7] = f->s->val >> 56;
-				}
-			} else {
-			}*/
 		} else {
 			if (dbg) {
 				printf("reslv_fixups(): oof, undefined reference to '%s', at $%016"PRIX64".\n", fixups[j]->s->name, fixups[j]->adr);
@@ -293,7 +275,6 @@ uint64_t update_addr(uint64_t address, uint8_t fixup, uint16_t l, uint8_t dbg) {
 			value = 0;
 		} else {
 			value = use_symbol("", symid, address, 1, dbg);
-			/*value = symbols[symid]->val;*/
 		}
 	} else {
 		value = tokline[l].op;
@@ -390,7 +371,6 @@ uint64_t update_addr(uint64_t address, uint8_t fixup, uint16_t l, uint8_t dbg) {
 							printf("update_addr(): ");
 							puts("Addressing Mode has been set to Zero Matrix.");
 						}
-						/*address += !(opsize-1);*/
 					}
 					break;
 				case 1:
@@ -897,7 +877,6 @@ uint64_t lex(char *str, uint64_t address, uint8_t dbg) {
 			printf("lex(): lexeme: %s, lex_type: %s\n", lexeme, (lex_type != 0xFF) ? lex_tok[lex_type] : "TOK_NONE");
 		}
 		isstart = 0;
-		/*lex_type = 0xFF;*/
 		j = 0;
 		if (lex_type == TOK_OPCODE && !isop) {
 			j = 0;