Move /emul to /emul/z80

I'm planning on adding other subfolders. 8086 for example...
2020-10-24 16:50:22 -04:00 · 2020-10-24 16:50:22 -04:00 · efe4b13a4e
commit efe4b13a4e
parent 329219fa89
48 changed files with 7 additions and 7 deletions
--- a/emul/z80/.gitignore
+++ b/emul/z80/.gitignore
--- a/emul/z80/Makefile
+++ b/emul/z80/Makefile
@ -1,6 +1,6 @@
 TARGETS = forth 
 OBJS = emul.o z80.o
-CDIR = ../cvm
+CDIR = ../../cvm
 STAGE = $(CDIR)/stage
 BLKFS = $(CDIR)/blkfs

--- a/emul/z80/README.md
+++ b/emul/z80/README.md
--- a/emul/z80/emul.c
+++ b/emul/z80/emul.c
--- a/emul/z80/emul.h
+++ b/emul/z80/emul.h
--- a/emul/z80/forth.c
+++ b/emul/z80/forth.c
--- a/emul/z80/opcodes_decl.h
+++ b/emul/z80/opcodes_decl.h
--- a/emul/z80/opcodes_impl.c
+++ b/emul/z80/opcodes_impl.c
--- a/emul/z80/opcodes_table.h
+++ b/emul/z80/opcodes_table.h
--- a/emul/z80/rc2014/.gitignore
+++ b/emul/z80/rc2014/.gitignore
--- a/emul/z80/rc2014/Makefile
+++ b/emul/z80/rc2014/Makefile
--- a/emul/z80/rc2014/README.md
+++ b/emul/z80/rc2014/README.md
--- a/emul/z80/rc2014/acia.c
+++ b/emul/z80/rc2014/acia.c
--- a/emul/z80/rc2014/acia.h
+++ b/emul/z80/rc2014/acia.h
--- a/emul/z80/rc2014/classic.c
+++ b/emul/z80/rc2014/classic.c
--- a/emul/z80/rc2014/sdc.c
+++ b/emul/z80/rc2014/sdc.c
--- a/emul/z80/rc2014/sdc.h
+++ b/emul/z80/rc2014/sdc.h
--- a/emul/z80/rc2014/sio.c
+++ b/emul/z80/rc2014/sio.c
--- a/emul/z80/rc2014/sio.h
+++ b/emul/z80/rc2014/sio.h
--- a/emul/z80/sms/.gitignore
+++ b/emul/z80/sms/.gitignore
--- a/emul/z80/sms/Makefile
+++ b/emul/z80/sms/Makefile
--- a/emul/z80/sms/README.md
+++ b/emul/z80/sms/README.md
--- a/emul/z80/sms/kbd.c
+++ b/emul/z80/sms/kbd.c
--- a/emul/z80/sms/kbd.h
+++ b/emul/z80/sms/kbd.h
--- a/emul/z80/sms/pad.c
+++ b/emul/z80/sms/pad.c
--- a/emul/z80/sms/pad.h
+++ b/emul/z80/sms/pad.h
--- a/emul/z80/sms/port.c
+++ b/emul/z80/sms/port.c
--- a/emul/z80/sms/port.h
+++ b/emul/z80/sms/port.h
--- a/emul/z80/sms/sms.c
+++ b/emul/z80/sms/sms.c
--- a/emul/z80/sms/vdp.c
+++ b/emul/z80/sms/vdp.c
--- a/emul/z80/sms/vdp.h
+++ b/emul/z80/sms/vdp.h
--- a/emul/z80/ti/.gitignore
+++ b/emul/z80/ti/.gitignore
--- a/emul/z80/ti/Makefile
+++ b/emul/z80/ti/Makefile
--- a/emul/z80/ti/README.md
+++ b/emul/z80/ti/README.md
--- a/emul/z80/ti/kbd.c
+++ b/emul/z80/ti/kbd.c
--- a/emul/z80/ti/kbd.h
+++ b/emul/z80/ti/kbd.h
--- a/emul/z80/ti/t6a04.c
+++ b/emul/z80/ti/t6a04.c
--- a/emul/z80/ti/t6a04.h
+++ b/emul/z80/ti/t6a04.h
--- a/emul/z80/ti/ti84.c
+++ b/emul/z80/ti/ti84.c
--- a/emul/z80/xcomp.fs
+++ b/emul/z80/xcomp.fs
--- a/emul/z80/z80.c
+++ b/emul/z80/z80.c
--- a/emul/z80/z80.h
+++ b/emul/z80/z80.h
--- a/recipes/rc2014/Makefile
+++ b/recipes/rc2014/Makefile
@ -1,7 +1,7 @@
 TARGET = os.bin
 BASE = ../..
 CDIR = $(BASE)/cvm
-EDIR = $(BASE)/emul
+EDIR = $(BASE)/emul/z80
 STAGE = $(CDIR)/stage
 BLKPACK = $(BASE)/tools/blkpack
 EMUL = $(EDIR)/rc2014/classic
--- a/recipes/sms/Makefile
+++ b/recipes/sms/Makefile
@ -3,7 +3,7 @@ BASE = ../..
 STAGE = $(BASE)/cvm/stage
 BLKPACK = $(BASE)/tools/blkpack
 SMSROM = $(BASE)/tools/smsrom
-EMUL = $(BASE)/emul/sms/sms
+EMUL = $(BASE)/emul/z80/sms/sms

 .PHONY: all
 all: $(TARGET) 
--- a/recipes/ti84/Makefile
+++ b/recipes/ti84/Makefile
@ -3,7 +3,7 @@ BASE = ../..
 CDIR = $(BASE)/cvm
 STAGE = $(CDIR)/stage
 BLKPACK = $(BASE)/tools/blkpack
-EMUL = $(BASE)/emul/ti/ti84
+EMUL = $(BASE)/emul/z80/ti/ti84
 MKTIUPGRADE = mktiupgrade

 .PHONY: all
--- a/tests/Makefile
+++ b/tests/Makefile
@ -1,6 +1,6 @@
 .PHONY: run
 run:
 	$(MAKE) -C ../cvm all
-	$(MAKE) -C ../emul all
+	$(MAKE) -C ../emul/z80 all
 	cd all && ./runtests.sh
 	cd z80 && ./runtests.sh
--- a/tests/all/runtests.sh
+++ b/tests/all/runtests.sh
@ -2,7 +2,7 @@

 BASE=../..
 CVM="${BASE}/cvm/forth"
-Z80="${BASE}/emul/forth"
+Z80="${BASE}/emul/z80/forth"
 TMP=$(mktemp)

 chk() {
--- a/tests/z80/runtests.sh
+++ b/tests/z80/runtests.sh
@ -1,7 +1,7 @@
 #!/bin/sh -e

 BASE=../..
-EXEC="${BASE}/emul/forth"
+EXEC="${BASE}/emul/z80/forth"
 TMP=$(mktemp)

 chk() {