Merge branch 'main' of https://chookspace.com/SpookyDervish/MyLittleCPU

src/main.c

@@ -24,6 +24,8 @@ int main(int argc, char** argv) {
         {INST_HLT, {}, 0, false}
     };
 
+    RomFile* f = readProgramFromFile("../add.o");
+    memcpy(emu->mem + MEM_PROGRAM_START, f->instructions, sizeof(SerializedInst) * f->header.numInstructions);
     memoryLoadProgram(emu->mem, program, sizeof(program)/sizeof(program[0]));
     */
 
@@ -33,7 +35,7 @@ int main(int argc, char** argv) {
         return 1;
     }
 
-    memoryLoadProgram(emu->mem, rom->instructions, rom->header.numInstructions);
+    memcpy(emu->mem + MEM_PROGRAM_START, rom->instructions, sizeof(SerializedInst) * rom->header.numInstructions);
 
     startEmulator(emu);
     freeEmulator(emu);

src/memory.c

@@ -53,6 +53,7 @@ uint32_t memorySerializeInst(Memory* m, Instruction inst, uint32_t offset) {
 void memoryLoadProgram(Memory* m, Instruction program[], size_t numInstructions) {
     size_t offset = 0;
     for (size_t i = 0; i < numInstructions; i++) {
+        printf("%zu.  %s\n", i, instructionToCStr(program[i]));
         offset = memorySerializeInst(m, program[i], offset);
     }
 }

src/util.c

@@ -21,7 +21,7 @@ RomFile* readProgramFromFile(char* path) {
     fclose(f);
 
     ROMFileHeader* header = (ROMFileHeader*)buffer;
-    Instruction* instructions = calloc(header->numInstructions, sizeof(SerializedInst));
+    SerializedInst* instructions = calloc(header->numInstructions, sizeof(SerializedInst));
     if (!instructions) {
         free(buffer);
         return NULL;

src/util.h

@@ -13,7 +13,7 @@ typedef struct {
 
 typedef struct {
     ROMFileHeader header;
-    Instruction* instructions;
+    SerializedInst* instructions;
 } RomFile;
 
 // -- FUNCTIONS -- //

tests/add.asm

@@ -1,5 +1,3 @@
-dingus:
-
 mvi a 2
 mvi b 2