From ec2c93295fe4734160848ed82204540602224839 Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Fri, 5 Nov 2021 13:28:00 -0700
Subject: [PATCH] shave two more bytes

---
 bin/sectorlisp.bin | Bin 512 -> 512 bytes
 sectorlisp.S       | 108 ++++++++++++++++++++++-----------------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/bin/sectorlisp.bin b/bin/sectorlisp.bin
index 0042cc3a59d3bf1ec53045ff467ad9843e50fcc6..533f0fed9f8fd2da5417d74e8bd993d588479c60 100755
GIT binary patch
delta 199
zcmV;&0671E1b_sPPYP=Qx&Z*_3IXUXky$Dh=w$$xr~#LB5Yg|AwSYjZgurx9=uwfx
zA_XrzD0F#|hbLk&z|9sh+q4eN5IhZa@vsW(@`L{YbQb@00<Hfvi#?X;A^=`rQ0VFZ
zmS5`_lEZ`l0dySybpne8Qs_MZT3=A;?EjWumyGADmaCVH=Z@f)!{{adJSlW~=z0H8
z=<@&T;gd@NE+3u$mRP6(bsm?CeF9gDJ?L=%l3(l5i*y2uG(0_YmXnwPW(3a8RjPeo
BU;Y39

delta 199
zcmV;&0671E1b_sPPYN;sx&Z*_3<2m^ky$DPJScQ>k-#Sw=sEzGr~#LB5Yg|AwSYjZ
zgury`=q8bwB4q?Iz|9sh+q4eN5IhZaxUdTA^5|v%JSh)^x&Y{Y|4``g|LYWk{{eIy
z|8)Y31yblr09s#A=<NTNUzd#MtCp*mjOUKvm&1eq0dyAsbpoybG>bi!=;HrgUr^}j
z|CV3t*pkDONdYb&kpGrgr~!2zmy3M@SBpL9qyLg$>(PsJ0*f>}J#>kamH}o0RjT{v
BV6^}M

diff --git a/sectorlisp.S b/sectorlisp.S
index 6172800..d74ee14 100644
--- a/sectorlisp.S
+++ b/sectorlisp.S
@@ -93,35 +93,6 @@ GetToken:					# GetToken():al, dl is g_look
 	xchg	%cx,%ax
 	ret
 
-GetObject:					# called just after GetToken
-	cmpb	$'(',%al
-	je	GetList
-.Intern:
-	mov	$g_str,%di
-	xor	%al,%al
-0:	push	%di				# save 1
-1:	cmpsb
-	jne	2f
-	dec	%di
-	scasb
-	jne	1b
-	jmp	5f
-2:	pop	%si				# drop 1
-	mov	$g_token,%si
-3:	scasb
-	jne	3b
-	cmp	(%di),%al
-	jne	0b
-	push	%di				# StpCpy
-4:	movsb
-	dec	%di
-	scasb
-	jnz	4b
-5:	pop	%ax				# restore 1
-	add	$-g_str,%ax			# stc
-	adc	%ax,%ax				# ax = 2 * ax + carry
-.ret:	ret
-
 .PutObject:					# .PutObject(c:al,x:di)
 	call	PutChar				# preserves di
 	xchg	%di,%ax
@@ -157,6 +128,35 @@ PrintObject:					# PrintObject(x:ax)
 4:	mov	$')',%al
 	jmp	PutChar
 
+GetObject:					# called just after GetToken
+	cmpb	$'(',%al
+	je	GetList
+.Intern:
+	mov	$g_str,%di
+	xor	%al,%al
+0:	push	%di				# save 1
+1:	cmpsb
+	jne	2f
+	dec	%di
+	scasb
+	jne	1b
+	jmp	5f
+2:	pop	%si				# drop 1
+	mov	$g_token,%si
+3:	scasb
+	jne	3b
+	cmp	(%di),%al
+	jne	0b
+	push	%di				# StpCpy
+4:	movsb
+	dec	%di
+	scasb
+	jnz	4b
+5:	pop	%ax				# restore 1
+	add	$-g_str,%ax			# stc
+	adc	%ax,%ax				# ax = 2 * ax + carry
+.ret:	ret
+
 GetChar:
 	xor	%ax,%ax				# get keystroke
 	int	$0x16				# keyboard service
@@ -175,16 +175,26 @@ PutChar:
 	mov	$'\n',%al
 	jmp	PutChar				# bx volatile, bp never used
 
-GetList:call	GetToken
-	cmpb	$')',%al
-	je	.retF
-	call	GetObject
-	push	%ax				# save 1
-	call	GetList
-	jmp	xCons
-
 ////////////////////////////////////////////////////////////////////////////////
 
+Pairlis:cmp	$NIL,%di			# Pairlis(x:di,y:si,a:dx):ax
+	je	1f
+	push	2(%di)				# save 1 Cdr(x)
+	lodsw
+	push	(%si)				# save 2 Cdr(y)
+	mov	(%di),%di
+	xchg	%ax,%si
+	call	Cons				# preserves dx
+	pop	%si				# restore 2
+	pop	%di				# restore 1
+	push	%ax				# save 3
+	call	Pairlis
+	xchg	%ax,%si
+	pop	%di				# restore 3
+	jmp	Cons				# can be inlined here
+1:	xchg	%dx,%ax
+	ret
+
 Evlis:	cmp	$NIL,%di			# Evlis(m:di,a:dx):ax
 	je	1f
 	push	2(%di)				# save 1 Cdr(m)
@@ -210,23 +220,13 @@ Cons:	xchg	%di,%ax
 1:	xchg	%di,%ax
 	ret
 
-Pairlis:cmp	$NIL,%di			# Pairlis(x:di,y:si,a:dx):ax
-	je	1f
-	push	2(%di)				# save 1 Cdr(x)
-	lodsw
-	push	(%si)				# save 2 Cdr(y)
-	mov	(%di),%di
-	xchg	%ax,%si
-	call	Cons				# preserves dx
-	pop	%si				# restore 2
-	pop	%di				# restore 1
-	push	%ax				# save 3
-	call	Pairlis
-	xchg	%ax,%si
-	pop	%di				# restore 3
-	jmp	Cons				# can be inlined here
-1:	xchg	%dx,%ax
-	ret
+GetList:call	GetToken
+	cmpb	$')',%al
+	je	.retF
+	call	GetObject
+	push	%ax				# save 1
+	call	GetList
+	jmp	xCons
 
 1:	mov	2(%di),%di			# di = Cdr(c)
 Evcon:	push	%di				# save c