Restructing, keeping all emulator modules in emulator directory

src/Makefile

@@ -10,8 +10,7 @@ CFLAGS  ?= -std=c17 -g\
 all: assemble emulate
 
 assemble: assemble.o
-emulate: emulate.o
+emulate: emulate.o emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o
 
 clean:
-	$(RM) *.o assemble emulate
-	
+	$(RM) *.o assemble emulate emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o

src/emulate.c

@@ -1,12 +1,12 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "a64instruction.h"
-#include "emulator.h"
-#include "fileio.h"
+#include "emulator/a64instruction/a64instruction.h"
+#include "emulator/emulator.h"
+#include "emulator/fileio.h"
 #include "global.h"
-#include "print.h"
-#include "decode.h"
-#include "execute.h"
+#include "emulator/print.h"
+#include "emulator/decode.h"
+#include "emulator/execute.h"
 
 extern a64inst_instruction *decode(word w);
 

src/emulator/a64instruction/a64instruction_Branch.h

@@ -1,6 +1,6 @@
 #include <stdbool.h>
 #include "a64instruction_global.h"
-#include "global.h"
+#include "../../global.h"
 
 typedef enum {
     a64inst_UNCONDITIONAL = 0,

src/emulator/a64instruction/a64instruction_Directive.h

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "../../global.h"
 
 typedef struct {
     dword value;

src/emulator/a64instruction/a64instruction_SingleTransfer.h

@@ -1,6 +1,6 @@
 #include <stdbool.h>
 #include "a64instruction_global.h"
-#include "global.h"
+#include "../../global.h"
 
 typedef enum {
     a64inst_SINGLE_TRANSFER_SINGLE_DATA_TRANSFER = 1,

src/emulator/decode.h

@@ -1,5 +1,5 @@
-#include "global.h"
-#include "a64instruction.h"
+#include "../global.h"
+#include "a64instruction/a64instruction.h"
 
 #define HALT_WORD 0x8a000000
 

src/emulator/emulator.h

@@ -1,6 +1,6 @@
 #ifndef __EMULATOR__
 #define __EMULATOR__
-#include "global.h"
+#include "../global.h"
 #include <stdbool.h>
 
 /************************************

src/emulator/execute.h

@@ -1,6 +1,6 @@
 #ifndef __EXECUTE__
 #define __EXECUTE__
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 #include "emulator.h"
 
 void execute(Machine *state, a64inst_instruction *inst);

src/emulator/fileio.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "fileio.h"
-#include "global.h"
+#include "../global.h"
 
 /* Loads a binary file located at filePath to memory, taking up a block of exactly memorySize bytes,
    and returns the starting address of the data. If memorySize is insufficient to store the entire file,

src/emulator/fileio.h

@@ -1,7 +1,7 @@
 #ifndef __FILEIO__
 #define __FILEIO__
 #include <stdlib.h>
-#include "global.h"
+#include "../global.h"
 
 #define EXIT_FAILURE 1
 

src/emulator/print.c

@@ -1,7 +1,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <string.h>
 #include "print.h"
 #include "emulator.h"