From 8d92e854ae595634538a652af5eab70b7aa50144 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Thu, 25 Jan 2024 15:15:14 -0800 Subject: [PATCH] Fix ?EXEC definition self referencing --- images/apple/PLASMA-2.1-INST.po | Bin 143360 -> 143360 bytes images/apple/PLASMA2.2mg | Bin 819264 -> 819264 bytes src/scripts/hdinstall2.4th | 12 +++++++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images/apple/PLASMA-2.1-INST.po b/images/apple/PLASMA-2.1-INST.po index 1a13d1bfd5384669b55c095fb5c290c9732029b7..bd6e1e5e491430388547c0081640fe8aa7741720 100644 GIT binary patch delta 1481 zcmZXTNlX(_7{|Zwb*L4sxB}KCLnIW55(Exz5o=rM;Itj59ff!z@u0?dQcfliTvo zc2Qx=1Wl-5p`VOxwHh%gd>g0@sL|qUmIMTV(S(XYV6Ml-`2s-)&li^mJrsBWCiqIy zu~1#cq{Xkn47Snf2Ly5)QqV6-J~b5c0T6N$^=O5W5E7x!Y%>!aj!Yl>y~WoB-)Mfm z<*E!|bJ9$fVYgaoz83qeYA&e9Vyj>xd|}hm2nijAj!RHb$?48yU9|8fH2AOUoYb&~cJ!B_qY_MZh*bf7 zn0-|L(9k#ua(KV5s@f~4abo)^wsR!r5i9*-`~nkS>;T2)DOim%naSdEJz}XIj2+ZC zJ!ThpJq5ADFdhDsrxzC)>NKs9XCgy(?~Nddp`4Evxfq#ghnhl1jy8vn9Y1mMR7>mW zGiT4WoxdQrU%b@O8Ntjf5-lpn4`t1BkSX{WaEhD|)J8R{nvcWEg9;R|--JqAeK!D}2f}VDw40%IlGkp38~L+lXfD3)ii~)6p}9Scg%p z$6=Ga0g1c?&GII?ZbQa&{pKyo523sV&0}xhxqI*agNKhEKY99$?*2x(33JKwmx{-$ zU6@A-O4yYSk#j8L-K^*iNM3hM(5l;W*SMW@C(QO>=@fesS)!qAo;AFp2X|zuT6Sr8 zum=xX5<2=<-;2vLUcGty?mZ3q55oh!STS*t)y`JL5jM%?MX?XJnMbjKpy(88quZ}x OKFa-A-(J#>~ z>$9ek4Ank2Wld6vHg=OLHa1Y{WNND=n#M}~O*EQxl1V1hrcU}Z&NyktrQdrC%kG*o zeD8ku-tU}y?s;eLeLFug?EJ`ZqFPL?ESsNBG)hL51e{_{#pDR7M4;m8`kKY%l{ERM zUqZ>0&$U_AP$PkX7(>mKKxU`ZRBxFw9j}4m!HlS(CJWpabG|*f;)LPV#&wO8tEp|e zhXf)qYN!!`7TRj;jz)KtBv~rlHVED&9sN~^mjzmqGMC*TJ&hXTCj^>Z<#9K-JdVkw z#1Dzl?8tti8xsOdaK53>(F>#-%1im|prfBYL41z7Ni(7+C+NgBOsVOJ*I=6aExS8b z7G6U$>6S4*jDYiKLdHE*yxJ~V?G4cd!re5DW+f*W4jj$#PbN;A@=#HAgL7R>VBuXb z{3OB9Lvw4aQe0rqBDp)0;{8MBvO3~qKSqA%$L80M0`br+hjmSj-8B{NKICyfOLSLK zU*)d0sauP@+^_<7|B7{|dCRJD)i%cNApmc0C%hF8&6XM*wSi5?QXY98^Ly@}x4Bj~ zxYV+U{DprC+2RD*(7j{2)|76Y&_=X}i}b|IV2Z$Y1iuhio!`K`RQ!GJ6RFAZJ=(OL z7ZkOVmwai|)FDV4h`RNqB)HLvUcoDZ`({!Tnj%hK!N;ko%qv#T+t{u5icpn#^^%D! z57cbl*7kT;=eF&}j?OM)+t%-PZGYH^c`xCCe_C%at~Xe?fA!`qZJNg0`D90HqGs&@ zW;SRxWz^McHk>dtmnH~f_uujb1tdu%wg%u3MMKwKrPcL8_~A=@$jMZ6w6flm|1y|6)UfU<3-7D zF;XtFEaf`*hv1)L{5JT1z(qk+rUNO0PRS4om3iPLz(VxP(cb{x0<;5LfKH4*C8Wtc z0x3I$eC3CNQTdVZpzMEEAh{0+00Y3Q5F8gCkVnAZ1V07QY4B0-^FoR|27VR%2Atgj z$5}3a415aw4fqG;q>PX?bLOC0}P)C*WJPeq1nQ|%Ga$T0Z z6cgVBmH{h(Re&9k04LB0-8P*VT%5+T^kZkP)bW(y$~2Z6e6ES*8P47qJ$uQ`^Mfy? zu?1=8-nnr0+?9)Cm(E1f%A^P;QMxUH?D zWh=@F_7O*xB)@Ut!sXh)V^PnRyvee|F>h>;Y8+MdRwIsbwT+aYa-8y&6I37%5y>Zk zQ^0AI-za6uIFjY_;A1pL`HV#Q@8GvdRQ^di`40G9*!>rpdw@-3Bu_(WC9_O94Lk!p zi_K9MF;OlDe+Z?D`juCKTfuE8+wU-uF1>s0f`jYSwvmf{dxw}X&Vs%S)<49B%`C*3 zDEwqUM#C&Liy8XYGSQ!HbCt&){o&x(octa#Ii*+?g9>B2}!5qob5ibM>G>sj{XWo}9}P(SHRB~GcTvA!zuZ3EZhN!*t+P}aC6qn{_k zlv7_-ZL`-*$$pCf*CpJ(!!*CT!C`NRsz`hj-d>5_hkBV0Q%U68BPtY6LC0ftn(Q03 zF3G+ssv_|ZSoQ9GtCrZ}b>bO#`|>_-^X(4zlG^eZcW>c~KM8$EjtoqH_wG}EWN z{m%J6Ul{w##Y>m3T*c@e7TV3Sg=_C=@{nHdW7xPk9=^H6*0W@HK9S){XavY BpP>K% diff --git a/images/apple/PLASMA2.2mg b/images/apple/PLASMA2.2mg index 94450f5976ca61a6379572a46b418ac0c78a6673..795bfad44254dd505dabbadfa76039d5d74e7066 100644 GIT binary patch delta 1588 zcmZvcO-vI}5P;|Pzm@tIgn$?qfi_?PX^Al!q-(p-jl1o-yCC(%MN0JGZ=z{Da4>qb zT9ftSp?dJ9#;Q#`aUpW_V&bWZase(Jxh>AV((QJam(0t1Z|0jfGjDcRSK_NH@y|Cs zXM^B_q;FIbSVd&Vl)R#HBEVh%{BS1(#t6U$Fvg->^7Kv`3-iPU5lNUAC(awEbnNw@ z_EQI4n`Y&@1*9qjQ(}4|exX6(>>Gg)oH}ZPbWx6ZhXr8g)SNt*ZJK(%0D(!4Pzw=>3ZEDM{XlGAD8iYS?ndEpRD3(H56T{6uu$NBlhan4ixtGC+)pZM6&%|w2I^C`MTSM;zseHcu{;Pev|-8 P5G90isJ8Czc>Lr)Y|Z>n delta 1502 zcmZvcKTH#G6vyB1di^U}O$ZH$iUMsY1=B(d(I7qBgI>IA&$~mx!LUdP4hA*RG!6_J z-K^H+TpX%{n;NTW;zVK$Y`T~@b&v&Em<&vZ?@D_9?v6`d^2_h{KJU-B?{#H4wX&T0 zc#|Crfe+HYAz9>9i5pgDRgISb_5$FC+aVa+jfVrU4n5|fQf9kGZ8r==W$~(%JO{0B zuM-0Bq0Ip{D6sj2U`EO&Q)4X-d~pcDiK7eS?oTi}5K#*wj9>~a)e zb%$!_lqr?2VF`s>HHD*#-*$tMoHAKZOcD1#<1T_phvK#Ig;UGcIAG9tcm!gyXeaMO zH|&fyU(Gpc9xCMx&QX11!zDy4H>GH(zE#9`VBst4s6Mgj0;33u!lf1m#!m>s%Oei3 zwCPgN9jZ6OX;vIO7=N&adtOJVZ8vy^&(a(io6rfr&)UJ-_}1ik6k>nH@GTzJ%YDRb zh`M?K1DQfzDC|$Q8I^s7Bk|T83Cc}x96)w9m7vJi_(Sdx2bt(UAg7SmMp6{{20Py} zJEwD&khC{YulAFbwElFSB=sNj)<*)qD86iP97Iu&ck2`1Vx*%tAg4{xl)5HVE9jmODkhE`u jUUgkPS@SSx9yAusi{?Y~qXp1{Xd$#i^)*l1gNOeBp&)Xo diff --git a/src/scripts/hdinstall2.4th b/src/scripts/hdinstall2.4th index 1a5bcdd..8e6cbf8 100644 --- a/src/scripts/hdinstall2.4th +++ b/src/scripts/hdinstall2.4th @@ -1,19 +1,24 @@ SRC" plasma.4th" SRC" conio.4th" +0 VARIABLE RESUMEXT +0 VARIABLE EXECXT + : RESUME> ; ( PLACE HOLDER TO RESUME EXECUTION ) +' RESUME> RESUMEXT ! + : ?EXEC ( F -- ) NOT IF ( SKIP CODE IN BETWEEN ?EXEC AND RESUME> ) 1 >R BEGIN BL WORD FIND IF CASE - ' RESUME> OF + RESUMEXT @ OF R> 1- ?DUP 0= IF ( EXIT IF FINAL RESUME> ) DROP EXIT THEN >R ENDOF - ' ?EXEC OF ( CHECK FOR NESTED ?EXEC ) + EXECXT @ OF ( CHECK FOR NESTED ?EXEC ) R> 1+ >R ENDOF ENDCASE @@ -23,6 +28,7 @@ SRC" conio.4th" AGAIN THEN ; +' ?EXEC EXECXT ! : STRING CREATE 256 ALLOT DOES> ; ( JUST ALLOCATE THE BIGGEST STRING POSSIBLE ) @@ -102,7 +108,7 @@ CONFIRM" Copy build tools?" RESUME> -FILELIST " AUTORUN HDINSTALL.4TH" +FILELIST " AUTORUN HDINSTALL.4TH" STRCPY " DEL" SWAP LOADMOD 0 0 40 24 VIEWPORT