Move "forth" folder to project's root folder

It's not really an App.

README.md

@@ -39,6 +39,8 @@ path to giving Collapse OS a try.
            through a serial port.
 * `emul`: Emulated applications, such as zasm and the shell.
 * `tests`: Automated test suite for the whole project.
+* `forth`: Forth is slowly taking over this project (see issue #4). It comes
+           from this folder.
 
 ## Status
 

apps/forth/glue.asm

@@ -1,9 +0,0 @@
-.inc "user.h"
-jp	forthMain
-
-.equ FORTH_RAMSTART RAMSTART
-.inc "forth/main.asm"
-.inc "forth/util.asm"
-.inc "forth/stack.asm"
-.inc "forth/dict.asm"
-RAMSTART:

emul/Makefile

@@ -8,7 +8,7 @@ SHELLAPPS = zasm ed
 SHELLTGTS = ${SHELLAPPS:%=cfsin/%}
 # Those Forth source files are in a particular order
 FORTHSRCS = core.fs str.fs parse.fs fmt.fs
-FORTHSRC_PATHS = ${FORTHSRCS:%=$(APPS)/forth/%}
+FORTHSRC_PATHS = ${FORTHSRCS:%=../forth/%}
 CFSIN_CONTENTS = $(SHELLTGTS) cfsin/user.h
 OBJS = emul.o libz80/libz80.o
 SHELLOBJS = $(OBJS) $(CFSPACK_OBJ)
@@ -28,7 +28,7 @@ shell/shell: shell/shell.c $(SHELLOBJS) shell/shell-bin.h
 	$(CC) shell/shell.c $(SHELLOBJS) -o $@
 
 forth/forth0.bin: forth/glue0.asm $(ZASMBIN)
-	$(ZASMBIN) $(KERNEL) $(APPS) < forth/glue0.asm | tee $@ > /dev/null
+	$(ZASMBIN) $(KERNEL) ../forth < forth/glue0.asm | tee $@ > /dev/null
 
 forth/forth0-bin.h: forth/forth0.bin
 	./bin2c.sh KERNEL < forth/forth0.bin | tee $@ > /dev/null
@@ -43,7 +43,7 @@ forth/core.bin: $(FORTHSRC_PATHS) forth/stage1
 	cat $(FORTHSRC_PATHS) | ./forth/stage1 | tee $@ > /dev/null
 
 forth/forth1.bin: forth/glue1.asm forth/core.bin $(ZASMBIN)
-	$(ZASMBIN) $(KERNEL) $(APPS) forth/core.bin < forth/glue1.asm | tee $@ > /dev/null
+	$(ZASMBIN) $(KERNEL) ../forth forth/core.bin < forth/glue1.asm | tee $@ > /dev/null
 
 forth/forth1-bin.h: forth/forth1.bin
 	./bin2c.sh KERNEL < forth/forth1.bin | tee $@ > /dev/null

emul/forth/glue0.asm

@@ -22,10 +22,10 @@
 .inc "stdio.asm"
 
 .equ FORTH_RAMSTART STDIO_RAMEND
-.inc "forth/main.asm"
+.inc "main.asm"
-.inc "forth/util.asm"
+.inc "util.asm"
-.inc "forth/stack.asm"
+.inc "stack.asm"
-.inc "forth/dict.asm"
+.inc "dict.asm"
 
 
 init:

emul/forth/glue1.asm

@@ -12,10 +12,10 @@
 .inc "stdio.asm"
 
 .equ FORTH_RAMSTART STDIO_RAMEND
-.inc "forth/main.asm"
+.inc "main.asm"
-.inc "forth/util.asm"
+.inc "util.asm"
-.inc "forth/stack.asm"
+.inc "stack.asm"
-.inc "forth/dict.asm"
+.inc "dict.asm"
 
 
 init: