From b335e538b478616da949c37af8961fe385d290dd Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 18 Mar 2020 22:25:44 -0400
Subject: [PATCH] Move "forth" folder to project's root folder

It's not really an App.
---
 README.md                            | 2 ++
 apps/forth/glue.asm                  | 9 ---------
 emul/Makefile                        | 6 +++---
 emul/forth/glue0.asm                 | 8 ++++----
 emul/forth/glue1.asm                 | 8 ++++----
 {apps/forth => forth}/README.md      | 0
 {apps/forth => forth}/core.fs        | 0
 {apps/forth => forth}/dict.asm       | 0
 {apps/forth => forth}/dictionary.txt | 0
 {apps/forth => forth}/fmt.fs         | 0
 {apps/forth => forth}/main.asm       | 0
 {apps/forth => forth}/parse.fs       | 0
 {apps/forth => forth}/stack.asm      | 0
 {apps/forth => forth}/str.fs         | 0
 {apps/forth => forth}/util.asm       | 0
 15 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 apps/forth/glue.asm
 rename {apps/forth => forth}/README.md (100%)
 rename {apps/forth => forth}/core.fs (100%)
 rename {apps/forth => forth}/dict.asm (100%)
 rename {apps/forth => forth}/dictionary.txt (100%)
 rename {apps/forth => forth}/fmt.fs (100%)
 rename {apps/forth => forth}/main.asm (100%)
 rename {apps/forth => forth}/parse.fs (100%)
 rename {apps/forth => forth}/stack.asm (100%)
 rename {apps/forth => forth}/str.fs (100%)
 rename {apps/forth => forth}/util.asm (100%)

diff --git a/README.md b/README.md
index c87b30e..aa96b30 100644
--- a/README.md
+++ b/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
 
diff --git a/apps/forth/glue.asm b/apps/forth/glue.asm
deleted file mode 100644
index c268543..0000000
--- a/apps/forth/glue.asm
+++ /dev/null
@@ -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:
diff --git a/emul/Makefile b/emul/Makefile
index 14b5fb4..17c12c5 100644
--- a/emul/Makefile
+++ b/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
diff --git a/emul/forth/glue0.asm b/emul/forth/glue0.asm
index 7731b34..095d37c 100644
--- a/emul/forth/glue0.asm
+++ b/emul/forth/glue0.asm
@@ -22,10 +22,10 @@
 .inc "stdio.asm"
 
 .equ FORTH_RAMSTART STDIO_RAMEND
-.inc "forth/main.asm"
-.inc "forth/util.asm"
-.inc "forth/stack.asm"
-.inc "forth/dict.asm"
+.inc "main.asm"
+.inc "util.asm"
+.inc "stack.asm"
+.inc "dict.asm"
 
 
 init:
diff --git a/emul/forth/glue1.asm b/emul/forth/glue1.asm
index a03deea..b9d730f 100644
--- a/emul/forth/glue1.asm
+++ b/emul/forth/glue1.asm
@@ -12,10 +12,10 @@
 .inc "stdio.asm"
 
 .equ FORTH_RAMSTART STDIO_RAMEND
-.inc "forth/main.asm"
-.inc "forth/util.asm"
-.inc "forth/stack.asm"
-.inc "forth/dict.asm"
+.inc "main.asm"
+.inc "util.asm"
+.inc "stack.asm"
+.inc "dict.asm"
 
 
 init:
diff --git a/apps/forth/README.md b/forth/README.md
similarity index 100%
rename from apps/forth/README.md
rename to forth/README.md
diff --git a/apps/forth/core.fs b/forth/core.fs
similarity index 100%
rename from apps/forth/core.fs
rename to forth/core.fs
diff --git a/apps/forth/dict.asm b/forth/dict.asm
similarity index 100%
rename from apps/forth/dict.asm
rename to forth/dict.asm
diff --git a/apps/forth/dictionary.txt b/forth/dictionary.txt
similarity index 100%
rename from apps/forth/dictionary.txt
rename to forth/dictionary.txt
diff --git a/apps/forth/fmt.fs b/forth/fmt.fs
similarity index 100%
rename from apps/forth/fmt.fs
rename to forth/fmt.fs
diff --git a/apps/forth/main.asm b/forth/main.asm
similarity index 100%
rename from apps/forth/main.asm
rename to forth/main.asm
diff --git a/apps/forth/parse.fs b/forth/parse.fs
similarity index 100%
rename from apps/forth/parse.fs
rename to forth/parse.fs
diff --git a/apps/forth/stack.asm b/forth/stack.asm
similarity index 100%
rename from apps/forth/stack.asm
rename to forth/stack.asm
diff --git a/apps/forth/str.fs b/forth/str.fs
similarity index 100%
rename from apps/forth/str.fs
rename to forth/str.fs
diff --git a/apps/forth/util.asm b/forth/util.asm
similarity index 100%
rename from apps/forth/util.asm
rename to forth/util.asm