stuff

Makefile

@@ -1,13 +1,13 @@
 # The OS/K Team licenses this file to you under the MIT license.
 # See the LICENSE file in the project root for more information.
 
-all: pc as
+all: kpc kas
 
-pc:
+kpc:
-    cd pc && make
+	@cd pc && make --no-print-directory
 
-as:
+kas:
-    cd as && make
+	@cd as && make --no-print-directory
 
 test: all
 

as/Makefile

@@ -0,0 +1,4 @@
+# The OS/K Team licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+all: k-as.py

as/k-as.py

@@ -1,4 +1,7 @@
 #!/usr/bin/python3
 
+# The OS/K Team licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
 
 

pc/Makefile

@@ -3,15 +3,14 @@
 
 all: k.exe
 
-src = instrs.c decd.c main.c regs.c \
+src = instrs.c decd.c main.c regs.c dump.c jumps.c
-		dump.c jumps.c
 
 obj = $(patsubst %.c,%.o,$(src))
 
-%.o: %.c instrs/i_arch.h */*.h $(src)
+%.o: %.c i_arch.h *.h $(src)
-	@gcc -O2 -Wall -I./karch -c $< -o $@
+	@gcc -O2 -Wall -c $< -o $@
 
-instrs/i_arch.h: INSTRS instrs.py
+i_arch.h: INSTRS instrs.py
 	@python3 instrs.py
 
 .PHONY: clean
@@ -20,6 +19,6 @@ clean:
 	@rm *.o
 
 k.exe: $(obj) i_arch.h INSTRS instrs.py
-	@gcc -O2 -Wall $(obj) -o ../k.exe
+	@gcc -O2 -Wall $(obj) -o k.exe
 	@rm *.o
 

pc/arch.h

@@ -198,5 +198,5 @@ static inline void writemem64(ctx_t *ctx, ulong val, ulong addr)
     ctx->mp[real++] = val & 0xFFFF;
 }
 
-#include "../instr/arch_i.h"
+#include "arch_i.h"
 

pc/instrs.py

@@ -3,8 +3,8 @@
 # The OS/K Team licences this file to you under the MIT license.
 # See the LICENSE file in the project root for more information.
 
-fi = open("instr/INSTRS")
+fi = open("INSTRS")
-hd = open("instr/arch_i.h", "w")
+hd = open("arch_i.h", "w")
 
 count = 0