Moved inst module to lib

As it has no dependencies on vm specifically, and it's more necessary
for any vendors who wish to target the virtual machine, it makes more
sense for inst to be a lib module rather than a vm module.
This commit is contained in:
2023-10-31 21:14:14 +00:00
parent 14a3820e74
commit 5d800d4366
7 changed files with 7 additions and 7 deletions

View File

@@ -14,7 +14,7 @@ TERM_RESET:=$(shell echo -e "\e[0;0m")
## Lib setup ## Lib setup
LIB_DIST=$(DIST)/lib LIB_DIST=$(DIST)/lib
LIB_SRC=lib LIB_SRC=lib
LIB_CODE:=$(addprefix $(LIB_SRC)/, base.c darr.c) LIB_CODE:=$(addprefix $(LIB_SRC)/, base.c darr.c inst.c)
LIB_OBJECTS:=$(LIB_CODE:$(LIB_SRC)/%.c=$(LIB_DIST)/%.o) LIB_OBJECTS:=$(LIB_CODE:$(LIB_SRC)/%.c=$(LIB_DIST)/%.o)
LIB_DEPS:=$(LIB_OBJECTS:%.o=%.d) LIB_DEPS:=$(LIB_OBJECTS:%.o=%.d)
LIB_CFLAGS=$(CFLAGS) LIB_CFLAGS=$(CFLAGS)
@@ -22,7 +22,7 @@ LIB_CFLAGS=$(CFLAGS)
## VM setup ## VM setup
VM_DIST=$(DIST)/vm VM_DIST=$(DIST)/vm
VM_SRC=vm VM_SRC=vm
VM_CODE:=$(addprefix $(VM_SRC)/, inst.c runtime.c) VM_CODE:=$(addprefix $(VM_SRC)/, runtime.c)
VM_OBJECTS:=$(VM_CODE:$(VM_SRC)/%.c=$(VM_DIST)/%.o) VM_OBJECTS:=$(VM_CODE:$(VM_SRC)/%.c=$(VM_DIST)/%.o)
VM_DEPS:=$(VM_OBJECTS:%.o=%.d) $(VM_DIST)/main.d VM_DEPS:=$(VM_OBJECTS:%.o=%.d) $(VM_DIST)/main.d
VM_CFLAGS:=$(CFLAGS) VM_CFLAGS:=$(CFLAGS)
@@ -71,7 +71,7 @@ $(VM_DIST)/%.o: $(VM_SRC)/%.c
@echo -e "$(TERM_GREEN)$@$(TERM_RESET): $<" @echo -e "$(TERM_GREEN)$@$(TERM_RESET): $<"
## ASSEMBLY Recipes ## ASSEMBLY Recipes
$(ASM_OUT): $(LIB_OBJECTS) $(VM_DIST)/inst.o $(ASM_OBJECTS) $(ASM_DIST)/main.o $(ASM_OUT): $(LIB_OBJECTS) $(ASM_OBJECTS) $(ASM_DIST)/main.o
@$(CC) $(ASM_CFLAGS) $^ -o $@ $(LIBS) @$(CC) $(ASM_CFLAGS) $^ -o $@ $(LIBS)
@echo -e "$(TERM_GREEN)$@$(TERM_RESET): $^" @echo -e "$(TERM_GREEN)$@$(TERM_RESET): $^"

View File

@@ -15,7 +15,7 @@
#include "./lexer.h" #include "./lexer.h"
#include <vm/inst.h> #include <lib/inst.h>
typedef enum typedef enum
{ {

View File

@@ -16,7 +16,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <vm/inst.h> #include <lib/inst.h>
#include <vm/runtime.h> #include <vm/runtime.h>
int main(void) int main(void)

View File

@@ -14,8 +14,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "./inst.h"
#include "./runtime.h" #include "./runtime.h"
#include <lib/inst.h>
int interpret_bytecode(const char *filepath) int interpret_bytecode(const char *filepath)
{ {

View File

@@ -16,7 +16,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "./inst.h" #include <lib/inst.h>
typedef enum typedef enum
{ {