From bb4e0ee773eaf35086d4a6cb742a8754946f7cde Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sun, 7 Jan 2024 13:53:58 -0800
Subject: [PATCH] Add syspath to SRC" search and move system scripts there

---
 images/apple/PLFORTH.PO       | Bin 143360 -> 143360 bytes
 src/mkrel                     |  44 ++++++++++++++++++++++------------
 src/toolsrc/plforth.pla       |   8 +++++++
 src/vmsrc/apple/a1cmd.pla     |   2 +-
 src/vmsrc/apple/cmd.pla       |   2 +-
 src/vmsrc/apple/cmdjit.pla    |   2 +-
 src/vmsrc/apple/sossys.pla    |   2 +-
 src/vmsrc/apple/sossysjit.pla |   2 +-
 8 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/images/apple/PLFORTH.PO b/images/apple/PLFORTH.PO
index 643f673dc89c53a1ec847666ac559ffaaefbb5f1..980ed0294c058b363489013cdfb9814d279a7d69 100755
GIT binary patch
delta 1254
zcmXZWe@xVM9LMqZ_j})iGlE^h2+jN6_lr`9<L)~MNLH=8iwlxCgbTxF(J(HksfjJN
zn#Z>(wNbk7Zh^~T(_xvzjqP%5MJ}t6uKs9Bwc6ZRN*m>mpw%KNdLsSt_<mon_viij
z-t|s-dZ#?2PrKFf?DRA4V`JW~3c1HB%U&y&g}^lTlWS|T5~ljB$d=W|<x)E9$C9k%
zOsN)$HN<88Dv^9k+x&Q4Tq?*3%N+{Gn&J|obX%U{Tdi=tJVx)gGM1~cl{RAWiTa17
zi+s*fij5w^M#~j$t&x4iNlR<4jct*)$OVBFOSw57ifocYt0XDof!mfQP0OQUc5Vbb
zOOx7AbFG}F=LfZTQ>;P0BsT`#<Y-jBr?dt$n&UN%99^ch2QzOq4u7NW2)e>eo8({O
zP|!_eEqk@da4=)3uvI`S%CuZ{@rV?WOD$JpI3nf5a?9OPU)LO$2Pq*d{lw3Is>*mO
zHuJZVNI&|^3yP9Rjr}@7*?aX7l`?VtKFZ?tD@*0dY#q<QTm{eVa{&%gbERBKpZ&eT
zt%OtF`NC+z>X5D+X}P=F`(c%L*Yc~acf=zd(pKV))>~4ncBv8<v5M7zr@MW3=dL~7
z!R6lZ|2$PWzgr2XKbUu^N>A$4&3E|4+69AW=fYh|e`^22VPz(5{!^uHn<*8wARy{E
zZXiD>Y9m_FjveU15QdRyv4c{SV<SRHpd0-d!8uH(PcN3`B%KzYIIX^1r_-0`yoi^5
ze)|=l*n9CB_Tx<)WN(18!{j44iea3@DU2eGF?@tG_zV-=yX4cHpD^un+1Hr;fxmFm
zmlWHji=77@CN`iF)d-_r7w0Kmv)jpg$gk?EW9ypJr>ph={axMdyiY%=yX;TdIgbm>
zr<hN(Gf!S5Ykt+v@rzxEd;Q{s{B9>|Fx<?b1zXXE?RXwL@zUUISjkV?Z;%h*Z5+Z8
z9K{Jf^p#(;FOt8*6s9qQtC;27WoWj?5IYMw$i<!Tq0kVg#87RET#5Tp!z^ZKP7C**
zq(5gQ`9lnM8ta^W3|}V?v2YB>4VQg_rBS5uG0xx%oX6Mfeq*e&zvcY{_vg8@KsHRx
zDKfL{VpE(AyaT+;OutiQ-fmZ$Vn0BC$n-f8Q@5jQ7}PPSH`m%t<W_7$8`=l&@G5<S
d2O`P}&&A0LpP!9;^9BdJ%3R+{<-L`v{vY{-T$TU;

delta 1158
zcmXBOe`wTo9LMqZ_j}))Yn$`3!JK;E``+}*g?HamQ$y&-c5dx-?rir>vni{YLskd|
z(Hi3I6EaCC`uYtP4J2ARNTlFPjROBz;3V*$Vi{D_U?Q#Aa+fuy%j<dbkH_cxdcEJD
z&vAVdrF|2npLYcHstW(5;Kw7O{A2P+vZ`W@Ov+;LAG-MG>hf4rKP0ku<yjf@%YS;b
zJU1LSQkhmq>S{#BZR6SJ(vEB<$CAPNhD@6y^^^_C(shfiwoZ1@)5((i)p~)}o#ZE4
zwo5m;KdG&=dI)oNpkZI5oFJY~8rkN|UU`RnHU2;`XPx@gPWhlla?+b9D^A+(k3Qkf
zg+ys_(p;ZymM`ez3Bzg2w8~|2r5z+UHOY^ZYP%%sH11|KNsHP`78}c()b;#<ww-d1
z*lq`jTwA(Qq|+`b7H+Me#V*-_w3Ct;dD;%_Zb-={;;bFq(~{0Q@+75T`_EthSJ!&I
z%+wt%=I{99RZWX|BhzD)<2RnsDPuE_QwlTJisjmDnlq8#%=vOY!NSYOdE$@$-5S(%
zFEn3k#FAa&^~}Gf>HhS5K-ac-f8G6%`==Hx&hrbaw6u45VNe_P5B|4RKQJ5@{VIAB
zqF=x`Ds9oL5yg6JK|4Be3FDZ?Eap%^EGha1q|uFjoc8Am8!K~aM_AOZu((b*qV|#Z
zqXV5dj8||3NAWs(a14Do!Mnk*;eLdna6p}B=Hp9zg;9KuU+^2Ia0|B~rl>MAC+=#~
zP*KW8Q`~K)?mlH2?sijG4*h@`bPv%Fn*nv4J16lT^E1qcxHCe&NdAU=h1~@5%nHnm
zh_04JL{(u0Ow^(dacsiY9LF|1fv1r|6IzhP9_&X4x+3Df9Wj(kejjHrgkgM&&)AQ$
zA0vN@EBFpS;Ac#*|D8WIL%xMO$OSBMms*BfWf`i*67?|Zn8mHNZUeJMay$DManK5=
zF7`)o6mQ}f-oi<o;_kcFTIKN_;Qa`1z9#?5chV|X*U3|SZ}7coMcjX^iiEn&!@CUb
vSz%X;n#zcZS`rnvEV@R8$kkW{6VZV;LR$a8vIn(UFQoVMFW1g3*UkR{KfXc3

diff --git a/src/mkrel b/src/mkrel
index 626ef429..54191150 100755
--- a/src/mkrel
+++ b/src/mkrel
@@ -55,6 +55,15 @@ cp rel/HRFORTH#FE1000             prodos/sys/HRFORTH.REL
 cp rel/HR2FORTH#FE1000            prodos/sys/HR2FORTH.REL
 cp rel/PLFORTH#FE1000             prodos/sys/PLFORTH.REL
 
+mkdir prodos/sys/scripts
+cp scripts/plasma.4th    	  prodos/sys/scripts/PLASMA.4TH.TXT
+cp scripts/conio.4th     	  prodos/sys/scripts/CONIO.4TH.TXT
+cp scripts/fileio.4th    	  prodos/sys/scripts/FILEIO.4TH.TXT
+cp scripts/grlib.4th     	  prodos/sys/scripts/GRLIB.4TH.TXT
+cp scripts/hgrlib.4th    	  prodos/sys/scripts/HGRLIB.4TH.TXT
+cp scripts/int32.4th     	  prodos/sys/scripts/INT32.4TH.TXT
+cp scripts/fpu.4th       	  prodos/sys/scripts/FPU.4TH.TXT
+
 rm -rf prodos/syspro
 mkdir prodos/syspro
 cp ../sysfiles/PRODOS#FF0000      prodos/syspro/PRODOS.SYS
@@ -97,9 +106,22 @@ cp rel/apple/JITUNE#FE1000        prodos/syspro/sys/JITUNE.REL
 cp rel/apple/ZIPCHIP#FE1000       prodos/syspro/sys/ZIPCHIP.REL
 cp rel/LZ4#FE1000                 prodos/syspro/sys/LZ4.REL
 cp rel/INT32#FE1000               prodos/syspro/sys/INT32.REL
-cp rel/HRFORTH#FE1000             prodos/syspro/HRFORTH.REL
-cp rel/HR2FORTH#FE1000            prodos/syspro/HR2FORTH.REL
-cp rel/PLFORTH#FE1000             prodos/syspro/sys/PLFORTH.REL
+
+rm -rf prodos/sysforth
+mkdir prodos/sysforth
+mkdir prodos/sysforth/sys
+cp rel/HRFORTH#FE1000             prodos/sysforth/sys/HRFORTH.REL
+cp rel/HR2FORTH#FE1000            prodos/sysforth/sys/HR2FORTH.REL
+cp rel/PLFORTH#FE1000             prodos/sysforth/sys/PLFORTH.REL
+
+mkdir prodos/sysforth/sys/scripts
+cp scripts/plasma.4th    	  prodos/sysforth/sys/scripts/PLASMA.4TH.TXT
+cp scripts/conio.4th     	  prodos/sysforth/sys/scripts/CONIO.4TH.TXT
+cp scripts/fileio.4th    	  prodos/sysforth/sys/scripts/FILEIO.4TH.TXT
+cp scripts/grlib.4th     	  prodos/sysforth/sys/scripts/GRLIB.4TH.TXT
+cp scripts/hgrlib.4th    	  prodos/sysforth/sys/scripts/HGRLIB.4TH.TXT
+cp scripts/int32.4th     	  prodos/sysforth/sys/scripts/INT32.4TH.TXT
+cp scripts/fpu.4th       	  prodos/sysforth/sys/scripts/FPU.4TH.TXT
 
 rm -rf prodos/sysinet
 mkdir prodos/sysinet
@@ -209,18 +231,10 @@ cp samplesrc/fppow.pla     prodos/bld/samples/FPPOW.PLA.TXT
 cp utilsrc/apple/mon.pla   prodos/bld/samples/MON.PLA.TXT
 cp utilsrc/apple/zipchip.pla prodos/bld/samples/ZIPCHIP.PLA.TXT
 
-rm -rf prodos/scripts
-mkdir prodos/scripts
-cp scripts/plasma.4th    prodos/scripts/PLASMA.4TH.TXT
-cp scripts/conio.4th     prodos/scripts/CONIO.4TH.TXT
-cp scripts/fileio.4th    prodos/scripts/FILEIO.4TH.TXT
-cp scripts/grlib.4th     prodos/scripts/GRLIB.4TH.TXT
-cp scripts/hgrlib.4th    prodos/scripts/HGRLIB.4TH.TXT
-cp scripts/int32.4th     prodos/scripts/INT32.4TH.TXT
-cp scripts/fpu.4th       prodos/scripts/FPU.4TH.TXT
-cp scripts/rod.4th       prodos/scripts/ROD.4TH.TXT
-cp scripts/bounce.4th    prodos/scripts/BOUNCE.4TH.TXT
-cp scripts/hrbounce.4th  prodos/scripts/HRBOUNCE.4TH.TXT
+mkdir prodos/bld/scripts
+cp scripts/rod.4th       prodos/bld/scripts/ROD.4TH.TXT
+cp scripts/bounce.4th    prodos/bld/scripts/BOUNCE.4TH.TXT
+cp scripts/hrbounce.4th  prodos/bld/scripts/HRBOUNCE.4TH.TXT
 
 #mkdir prodos/bld/examples
 #cp samplesrc/examples/ex.1.pla  prodos/bld/examples/EX.1.PLA.TXT
diff --git a/src/toolsrc/plforth.pla b/src/toolsrc/plforth.pla
index 534c328b..a0535f16 100644
--- a/src/toolsrc/plforth.pla
+++ b/src/toolsrc/plforth.pla
@@ -1768,11 +1768,19 @@ def _lookup_#1
   return cmdsys:lookupsym(stodci(symname, @dci))
 end
 def _src_(a)#0
+  char[64] syssrc
+
   if srclevel >= SRCREFS
     puts("Too many nested SRC")
     _quit_
   fin
   inref[srclevel] = fileio:open(a)
+  if !inref[srclevel] and ^a < 16
+    strcpy(@syssrc, cmdsys:syspath)
+    strcat(@syssrc, "scripts/")
+    strcat(@syssrc, a)
+    inref[srclevel] = fileio:open(@syssrc)
+  fin
   if inref[srclevel]
     fileio:newline(inref[srclevel], $7F, $0D)
     infunc               = @filein
diff --git a/src/vmsrc/apple/a1cmd.pla b/src/vmsrc/apple/a1cmd.pla
index 8c9bd95f..24d4821e 100755
--- a/src/vmsrc/apple/a1cmd.pla
+++ b/src/vmsrc/apple/a1cmd.pla
@@ -1155,7 +1155,7 @@ def parsecmd(strptr)#1
     return cmd
 end
 def execmod(modfile)#1
-    byte moddci[17]
+    byte moddci[63]
     word saveheap, savesym, saveflags
 
     perr = 1
diff --git a/src/vmsrc/apple/cmd.pla b/src/vmsrc/apple/cmd.pla
index 91743a01..673d5325 100755
--- a/src/vmsrc/apple/cmd.pla
+++ b/src/vmsrc/apple/cmd.pla
@@ -1298,7 +1298,7 @@ def execsys(sysfile)#0
     fin
 end
 def execmod(modfile)#1
-    byte moddci[17]
+    byte moddci[63]
     word saveheap, savesym, saveflags
 
     perr = 1
diff --git a/src/vmsrc/apple/cmdjit.pla b/src/vmsrc/apple/cmdjit.pla
index d574be3c..63ac8b95 100755
--- a/src/vmsrc/apple/cmdjit.pla
+++ b/src/vmsrc/apple/cmdjit.pla
@@ -1364,7 +1364,7 @@ def execsys(sysfile)#0
     fin
 end
 def execmod(modfile)#1
-    byte moddci[17]
+    byte moddci[63]
     word saveheap, savexheap, savesym, saveflags
 
     perr = 1
diff --git a/src/vmsrc/apple/sossys.pla b/src/vmsrc/apple/sossys.pla
index 8be64645..a89ef5e8 100755
--- a/src/vmsrc/apple/sossys.pla
+++ b/src/vmsrc/apple/sossys.pla
@@ -1224,7 +1224,7 @@ def loadmod(mod)#1
     return initcode
 end
 def execmod(modfile)#1
-    byte moddci[17]
+    byte moddci[63]
     word saveheap, savesym, saveflags
 
     perr = 1
diff --git a/src/vmsrc/apple/sossysjit.pla b/src/vmsrc/apple/sossysjit.pla
index be9d6415..38cf259c 100755
--- a/src/vmsrc/apple/sossysjit.pla
+++ b/src/vmsrc/apple/sossysjit.pla
@@ -1247,7 +1247,7 @@ def loadmod(mod)#1
     return initcode
 end
 def execmod(modfile)#1
-    byte moddci[17]
+    byte moddci[63]
     word saveheap, savesym, saveflags
 
     perr = 1