Changed something around for months because people are lazy

Author: Mekapaedia

examples/offsettest.asm

@@ -1,2 +1,3 @@
-LOD beep[0d2]
-beep: .data 0o3 0b1110
+INF 1000
+LOD &(beep[0])[0]
+beep: .data 4 0xABCD

src/as4.c

@@ -729,36 +729,14 @@ int main(int argc, char **argv)
 					fprintf(stderr, "Used but undeclared label %s.\n", unknownlabels[i].str);
 					exit(20);
 				}
-				/* Once we have made sure this label has been declared correctly, free the allocated memory for the label string. */
-				/* We don't need it anymore. */
-				if(unknownlabels[i].str != NULL)
-				{
-					/*free(unknownlabels[i].str);*/
-				}
 			}
-			/* Once we've checked all the unknown labels, free the entire structure array. We don't need it anymore. */
-			free(unknownlabels);
 		}
 
 		/* Once we're sure everything is in order, write the buffer to a file. */
 		for(i = 0; i < bytes; i++)
 		{
 			fputc(outbuf[i], output);
 		}
-		
-		/* Once we've written everything to a file, we don't need the known labels anymore, so get rid of them. */
-		/* Iterate through and free all the label things and the array itself. */
-		if(labels != NULL)
-		{
-			for(i = 0; i < numlabels; i++)
-			{
-				if(labels[i].str != NULL)
-				{
-					/*free(labels[i].str);*/
-				}
-			}
-			free(labels);
-		}
 		/* We now have no use for the output buffer, as we wrote it to a file. Set it free. */
 		free(outbuf);
 		/* It's also a nice thing to close your file handles. We're done writing the buffer to the output, so close it. */

src/label.c

@@ -131,13 +131,13 @@ void addlabel(char *outbuf, label **labels, label **unknownlabels, unsigned long
 							{
 								char *nstr = calloc(1, 6);
 								/* As this is getting a portion of the address of the label accessed, we get the label's address and bitwise and that section then shift it back. */
-								sprintf(nstr, "N_[%X]", (labeladdr & (0xF << ((*unknownlabels)[i].addroffset * 4))) >> ((*unknownlabels)[i].addroffset * 4));
+								sprintf(nstr, "N_[%X]", (labeladdr & (0xF << ( (3 - (*unknownlabels)[i].addroffset) * 4))) >> ( ( 3 - (*unknownlabels)[i].addroffset) * 4));
 								labeladdr = findlabel(unknownlabels, labels, nstr, (*numlabels), numunknownlabels, instaddress * 4UL, ((*unknownlabels)[i].type) & 1);
 								continue;
 							}
 							else
 							{
-								labeladdr = ((labeladdr & (0xF << ((*unknownlabels)[i].addroffset * 4))) >> ((*unknownlabels)[i].addroffset * 4)) + N_START;
+								labeladdr = ((labeladdr & (0xF << ((3 - (*unknownlabels)[i].addroffset) * 4))) >> ((3 - (*unknownlabels)[i].addroffset) * 4)) + N_START;
 							}
 						}
 						/* The address it was referenced at is actually the opcode of the instruction, so go up one nibble to point to the address section. */