From 410e7fb089f9d90f985ec5ed9ec1d40492fbe79f Mon Sep 17 00:00:00 2001
From: Richard Russell <richard@rtrussell.co.uk>
Date: Sun, 16 Mar 2025 18:13:23 +0000
Subject: [PATCH] Moved shifts to avoid Z88 functions

---
 bin/acorn/BBCBASIC.COM | Bin 19200 -> 19200 bytes
 bin/cpm/BBCBASIC.COM   | Bin 18944 -> 18944 bytes
 src/EVAL.Z80           |   3 ++-
 src/MATH.Z80           |  26 +++++++++++++++-----------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bin/acorn/BBCBASIC.COM b/bin/acorn/BBCBASIC.COM
index 45a2f797926c508aafc8e539d60c86a175d8ef28..ef1bb40028792c35abda0fb4f8ec7f7fe0e112ef 100644
GIT binary patch
delta 507
zcmYk2Ur1A77{>Rdn=V7npo=ydJ6aP1i8I>w=WOoVO;HgM7(|#TbP?1|H(rF2SrHvD
zD)>MUg6J}Wv<?Yf1ceD3<0XhP&)8YP@IukzfQyre^d7tE=H+>Q@VxKCJ2_1zr^(!K
zH__~o?l&=M7@Iqq(bj(B)yD_2eWmLdUA%uT5{gb7x^n$PqdZSrSc$IFDkY**{N~?z
zTmb7~Yg}We_&qg{P3M#1u6QTP`FdeS*5xnRK|5%#=oMLULfACK7U?SeMz?uXc)ZH@
z3!fQmg(uh?x75q*09jXro*_f(EFB{mRibGmKj~8E3l0ks9_C=G=z*_3v-9Q!QF4wr
z8`rcyWk6l&t0bMuK^)rVKhXa__*xjVo!8?|M1QX?^Gwudvt@WHz*0|moFvsee?}~I
zQ5+_^x+yZmSF_?1l3V5=>Z+NdKJ$$5R!hFJjU~Vc@>99krC}%beA$Ui!0yHw33rMx
zT0{qHCg|#DZd}78G|g1AW-zZcRnyhmTp@rby~hWBEa^}yHo>wZ`O_p3EZM1wy&K1o
zf`zUrdv>LLwLeXWp&k`HEOc8Y@pC~DJcpmbTZzCfSj_F(6LL+r0rfPth=oIL9HrZ6
O4R2w>u)oN@eSZNkhUX#x

delta 507
zcmZpe#@H~8aYLLEqtNDfrLBT?dIn$q2^g?*RBSxbW5@AS(b)88yFVKPXPt6d{=vs5
zH<|u7J!1O8^qT2kb1sWd=C{p7El!##nLRV-F>^6*oE&7LYA$KfY_Zqkr1d@9nRfT=
z-rK2Is8|?UI9seY{bPF2^r`7((;w!n7H`e3nG0BaG1D=7Xf9^9#=K?nCX*n>7n4~{
zy%{4W2bxwf>P|jmstOeOWO|Knx%t_{c4zyn&UV{>Jo{zxHM3ybPzw$Ao0>P@W(oW}
zc^1g|bz0}N?9J0MKtkXPSmecN8)T8IwpE*NZmPb?rl7zyImz6R^NZQ~lV|5!oNbvr
z$6S(8a`HCwg^VqeBP>)HWhU2J7&3mDyx!tGP^8{63dp`?DR274?4tqeFJ|l0e}E1-
zs{_*CZ6z2TcT;fXjhk$BXTc`Uv^(2mf40OP$UFPW@~q5cJ*#Q~pw6>jE#<%7(J}kT
zB7a9_@=hyTkf8g=2@(&kDV)7y|MhIkW;Sb2Mk$aX|87}uy>$VKo^1j0zS^mQnVU0h
zR2dodCimNZ1UjhEP8Jw?Acp|01BMRJE-?`IaEsYpMJ9&3mUkbYy{8Ivg&-@#T}dGG
S?qe3#UqBr?o3GgE@BjdE$mj$B

diff --git a/bin/cpm/BBCBASIC.COM b/bin/cpm/BBCBASIC.COM
index 87c6efde2ce4da953e2810ddec23b9f79f4a47e5..e541f3fe890c68ca5016f9ed981f43de2bfa935e 100644
GIT binary patch
delta 507
zcmYk2L1+^}6oxaliA@V-10GB;WJ^q_P-KE;W?nYk%|THS5h{qNRPZ3^#ft}Nu~tP~
zsHiZ#6a?`og|@m_@E|C)kPse%Xmvw26+#b|R#|9dEu}cA7cY<h|KNY`=Z#O2@kuf_
zoF<xcDg8QTQo6CN(cN7)Uw(LKb*=OrVv7$>M?%rD^p)%Ho0WOi!OLuo)fj<Z_$`)2
z9FS-Es?hjxabFJQGe#2b!CR;l8|IYNuzp!RtcUeOKOBam;II&1WIxzfwk4wAi<;O2
z0jGRLB>0@L<xGBvtVzO7l8f>b8zDJaW*J3(vZdZ>feRKsGH{~gV<12AGjJBl?g4lG
zn)auHN>>M}Nw>OB4Q=BeDE<$=m?Mt+YSfMB@8o5Xiw1nQg3kbL`BcP7QqGI##Fpn^
zKhfna$dN$K!be4J7tSkPE2Q!P_i1>uqgdTiC6KoB6GrU9up4{v&5exV&c-PV@0RdJ
zNjY3Cpe_#@qnb)$tB`8dDfc^5bzQzO2HWtM|77p?B^~Rf7TQjvc!DI_OSWsGd;N%_
zXe-w;vpdqcI+!7Z%EzX!3f-}ijPiC7bxwUo-Ac6Wg3Z0YT_F#=CN{FFMJych;!1kW
O&hVy6Q0KEX(ES&q7w3!s

delta 507
zcmYk2O=uHQ6ovC@CvAhsM6ei1Nota!Fop!l`^nEtz=DViu_6?O3N8fQxN#vZ)>a2x
zR8)A~6a;Z4f)LH1;KD^|T@2&Jg*rGj6O>R1LXasF&`_&yvT}1d=Yw<a;Vvwrg=O@7
zCWZDI7g8^yYBuNZ$ho26>o3;tYQvl3NAcS`r^2C;`P8MWt1YvR|KfGr#y0*#BW#O)
zq5GIg4wCP5H<_f1e5#NkF?O51VP?6hu4ql|r<P`EmS@LU4R7OByoo>HUsPfpYEzl{
zL?PekD0xP8UN20cHka^8G|f-rS#*TI!x=%gu)XIAg*6TCm0+prfzNGnrgD}Y8gdRh
zoh$Nh6NKqmiZ$j~aWQ1SPuf=bfAUG4HJtjK6HX=v_(hr@@kz~uM+|iSkj7AqzoL(k
z&Zk)##rX}EM?SBy_k!Fko)dbbm?-$f%SpXmWoug$0VT*Um7?cooaocfPIw;r8&@>A
zRfTI+;owIR;yhcLlSLA`#YDHE5N|Nii1XK_N&t_05B7hxlhCMkK{vwX6X-y&WM_j$
zI+KEeE?ifg=u6{rC4*3w-&Z|RXi*!(3JHpcbK*PV)@WeYbmEQ=gk0vfpgAF0M5T}$
R6Vh!BN<EQKjE|ZU`3K^y=xhK0

diff --git a/src/EVAL.Z80 b/src/EVAL.Z80
index 75ff590..173beb3 100644
--- a/src/EVAL.Z80
+++ b/src/EVAL.Z80
@@ -13,6 +13,7 @@
 ;VERSION 5.0, 31-05-2024
 ;VERSION 5.1, 28-12-2024
 ;VERSION 5.2, 11-01-2025
+;VERSION 5.3, 16-03-2025 (Shifts moved to new codes)
 ;
 ;BINARY FLOATING POINT REPRESENTATION:
 ; 32 BIT SIGN-MAGNITUDE NORMALIZED MANTISSA
@@ -275,7 +276,7 @@ SHIFT:	CP	'='
 	INC	IY
 	INC	B
 SHIFT1:	LD	A,B
-	SUB	18
+	SUB	16
 	JR	EXPR2D
 ;
 EXPR2S:	EX	AF,AF'
diff --git a/src/MATH.Z80 b/src/MATH.Z80
index bf886d9..338e9c9 100644
--- a/src/MATH.Z80
+++ b/src/MATH.Z80
@@ -1,10 +1,11 @@
-	TITLE	'(C) COPYRIGHT R.T.RUSSELL 1986-2024'
+	TITLE	'(C) COPYRIGHT R.T.RUSSELL 1986-2025'
 ;
 ;Z80 FLOATING POINT PACKAGE
 ;(C) COPYRIGHT  R.T.RUSSELL  1986-2024
 ;VERSION 0.0, 26-10-1986
 ;VERSION 0.1, 14-12-1988 (BUG FIX)
 ;VERSION 5.0, 16-06-2024 (SHIFTS ADDED)
+;VERSION 5.1, 16-03-2025 (Shifts moved to new codes)
 ;
 ;BINARY FLOATING POINT REPRESENTATION:
 ;   32 BIT SIGN-MAGNITUDE NORMALIZED MANTISSA
@@ -129,10 +130,13 @@ FTABLE:	DEFW	ABS		;16 ABS
 	DEFW	FTEST		;40 TEST
 	DEFW	FCOMP		;41 COMPARE
 ;
-	DEFW	ISHL		;42 <<
-	DEFW	ISHX		;43 <<<
-	DEFW	ISAR		;44 >>
-	DEFW	ISHR		;45 >>>
+	DEFW	BAD		;42 Reserved for Z88
+	DEFW	BAD		;43 Reserved for Z88
+;
+	DEFW	ISHL		;44 <<
+	DEFW	ISHX		;45 <<<
+	DEFW	ISAR		;46 >>
+	DEFW	ISHR		;47 >>>
 ;
 RTABLE:	DEFW	FAND		;AND (FLOATING-POINT)
 	DEFW	FBDIV		;DIV
@@ -591,16 +595,16 @@ TRUE:	LD	HL,-1
 ;
 ISHX:
 ISHL:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISHL1:	EXX
 	ADD	HL,HL
 	EXX
 	ADC	HL,HL
 	DJNZ	ISHL1
-SHRET:	RET
+	RET
 ;
 ISAR:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISAR1:	SRA	H
 	RR	L
 	EXX
@@ -611,7 +615,7 @@ ISAR1:	SRA	H
 	RET
 ;
 ISHR:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISHR1:	SRL	H
 	RR	L
 	EXX
@@ -629,10 +633,10 @@ SHIFTS:	CALL	FIX2
 	LD	A,E
 	EXX
 	LD	B,32
-	JR	NZ,SHMAX
+	RET	NZ
 	LD	B,A
 	OR	A
-SHMAX:	RET
+	RET
 ;
 ;FUNCTIONS:
 ;