Avoid using (xentry) outside xcomp config

2020-04-23 12:09:31 -04:00 · 2020-04-23 12:09:31 -04:00 · dd6ce1b8fe
commit dd6ce1b8fe
parent fcd77f80ab
5 changed files with 4 additions and 6 deletions
--- a/drv/acia.z80
+++ b/drv/acia.z80
@ -12,7 +12,7 @@ ACIA_MEM
  +6 ACIA)
 )

-(xentry) ~ACIA
+(entry) ~ACIA
    AF PUSHqq,
    HL PUSHqq,
    DE PUSHqq,
--- a/emul/Makefile
+++ b/emul/Makefile
@ -3,7 +3,7 @@ TARGETS = forth/forth
 BOOTSRCS = ./forth/conf.fs \
 	./forth/xcomp.fs \
 	../forth/icore.fs \
-	./forth/xstop.fs
+	./forth/stop.fs

 FORTHSRCS = core.fs cmp.fs print.fs parse.fs readln.fs fmt.fs blk.fs
 FORTHSRC_PATHS = ${FORTHSRCS:%=../forth/%} forth/run.fs
--- a/emul/forth/xcomp.fs
+++ b/emul/forth/xcomp.fs
@ -1,6 +1,7 @@
 262 LOAD  ( xcomp )
 : CODE XCODE ;
 : IMMEDIATE XIMM ;
+: (entry) (xentry) ;
 : : [ ' X: , ] ;

 CURRENT @ XCURRENT !
--- a/emul/forth/xstop.fs
+++ b/emul/forth/xstop.fs
@ -1,3 +0,0 @@
-(xentry) _
-H@ 256 /MOD 2 PC! 2 PC!
-
--- a/recipes/rc2014/Makefile
+++ b/recipes/rc2014/Makefile
@ -9,7 +9,7 @@ BOOTSRCS = conf.fs \
 	$(BASEDIR)/drv/acia.z80 \
 	$(BASEDIR)/drv/sdc.z80 \
 	$(FDIR)/icore.fs \
-	$(EDIR)/xstop.fs
+	$(EDIR)/stop.fs

 PATHS = \
 	$(FDIR)/core.fs \