Refined the encoding some more.

src/parser.c

@@ -132,7 +132,7 @@ void HandleAssemblerDirective(void) {
     }
 }
 
-//REG       XXX0 0XXX
+//REG       XXX0 0XXX 1010 1111
 //Constant  XXX0 1XXX
 //Address   XXX1 0XXX
 void HandleOperation(void) {
@@ -144,7 +144,7 @@ void HandleOperation(void) {
 
     printf("[%#05X] %s ", ProgramCounter, inst->lexeme);
 
-    Memory[ProgramCounter] |= GetInstructionMask(inst->op, inst->parameter_one);
+    Memory[ProgramCounter] = GetInstructionMask(inst->op, inst->parameter_one);
 
     ProgramCounter++;
 
@@ -158,7 +158,7 @@ void HandleOperation(void) {
 
         if (inst->parameter_one & Reg) {
             //Encode the register number here.
-            Memory[ProgramCounter - 1] |= PeekToken()->type - 29;
+            Memory[ProgramCounter - 1] |= (PeekToken()->type - 29) & 0x07;
             printf("%s ", PeekToken()->lexeme);
         }
         else if (inst->parameter_one & Address || inst->parameter_one & Constant) {
@@ -170,7 +170,8 @@ void HandleOperation(void) {
                     exit(1);
                 }
 
-                Memory[ProgramCounter - 1] |= 0x10;//0b00010000;
+                if (inst->op == CMP) Memory[ProgramCounter - 1] |= 0x10;//0b00010000;
+
                 Memory[ProgramCounter] = 2 >> symbol->address & 0xFF;
                 Memory[ProgramCounter + 1] = symbol->address & 0xFF;
 
@@ -211,7 +212,8 @@ void HandleOperation(void) {
                     exit(1);
                 }
 
-                Memory[ProgramCounter - 1] |= 0x10;//0b00010000;
+                if (inst->op == CMP) Memory[ProgramCounter - 1] |= 0x10;//0b00010000;
+                
                 Memory[ProgramCounter] = 2 >> symbol->address & 0xFF;
                 Memory[ProgramCounter + 1] = symbol->address & 0xFF;
 
@@ -221,8 +223,8 @@ void HandleOperation(void) {
                 Memory[ProgramCounter - 1] |= 0x08; //0b00001000;
                 int* value = PeekToken()->value;
 
-                Memory[ProgramCounter] = 2 >> *value &0xFF;
-                Memory[ProgramCounter + 1] = *value &0xFF;
+                Memory[ProgramCounter] = 2 >> *value & 0xFF;
+                Memory[ProgramCounter + 1] = *value & 0xFF;
 
                 printf("%s ", PeekToken()->lexeme);
             }

src/token.c

@@ -39,7 +39,7 @@ TokenClass GetTokenClass(TokenType type) {
 void FreeToken(Token* token) {
     if (!token) return;
 
-    if (token->value && token->type >= STRING) free(token->value);
+    if (token->value && (token->type >= STRING || token->type == NUMBER)) free(token->value);
 
     free(token);
 }