From adb7310d570457782d642dcd236e4aeb37579b22 Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Tue, 2 Nov 2021 12:14:10 -0700
Subject: [PATCH] shave some bytes

---
 bin/sectorlisp.bin | Bin 512 -> 9536 bytes
 sectorlisp.S       |  68 ++++++++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/bin/sectorlisp.bin b/bin/sectorlisp.bin
index cf9e79aa0e38f0cc821866f7668b6b922014dbab..94947da5a25679ae7ba8322004715d9aeffaec91 100755
GIT binary patch
literal 9536
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
MBQaqTsh9!&2lPP`bN~PV

delta 428
zcmWlU!Al!K6o=oey97g%MudRiAy5jHR+>mX7}k=D2&IQ0t=R@@{)HZ9wih*_>%lN8
zXlVB4sT7GKt5m2hn8l^EhZ<V2Jr-|1I)$JC-Ad^=Ildq7ec$i-k1G0_KJsuM?CRHl
z8Gq#@BRh>|C3m3N`?sO<W;crcfNA(Z03Q>423`znAg~F!#cyWH)*7o=uD#Hc<=F$s
zRXgf5?eECKTNcSqNEV93O!e3KcGh6O3tNo^pIuo-rP=2P8^ooF@9pKiN^Wbxr)|6k
z;=;Qlna0O436>KQdP6OFDJs0bsDn2oq8I^Je9HJo$&V3u7e7jvF}CML#Th=&NOOqJ
zqb>7zF6$+cbR?mJU7Rt6ub^1U;~$l~OQ(g+`sT{171Yv3s=Ps1+~spxL0OOGT1nVW
zIQjBEH_c(z!;QckWjdeG0`nG&UVbLP`rZ==IMw(AbDY-4{<F5%8%$5Bg2frJqi|W5
z8%`Lb2}O0n0UFPvCF_=Wt!4#OqHd!fvRG0t-erc0g;4erDGr@0QvFHS`5?bJ_C<*&
OwSYg-1h!hOr;TgXam;1_

diff --git a/sectorlisp.S b/sectorlisp.S
index 40e9072..2b7eeb8 100644
--- a/sectorlisp.S
+++ b/sectorlisp.S
@@ -52,7 +52,8 @@ _begin:	push	%cs				# memory model cs=ds=es = 0x600
 	pop	%ds
 	pop	%es
 	pop	%ss
-	mov	$0x7c00-0x600,%cx
+	mov	$kSymbols,%si
+	mov	%si,%cx
 	mov	%cx,%sp
 	cld
 	xor	%ax,%ax
@@ -60,8 +61,7 @@ _begin:	push	%cs				# memory model cs=ds=es = 0x600
 	xor	%di,%di
 	rep stosb				# clears our bss memory
 main:	mov	$g_str,%di
-	mov	$kSymbols,%si
-	mov	$37,%cx
+	mov	$37,%cl
 	rep movsb
 0:	mov	$'\n',%dl
 	call	GetToken
@@ -75,6 +75,7 @@ main:	mov	$g_str,%di
 
 GetToken:					# GetToken():al, dl is g_look
 	mov	$g_token,%di
+	mov	%di,%si
 1:	mov	%dl,%al
 	cmp	$' ',%al
 	jbe	2f
@@ -95,7 +96,6 @@ GetToken:					# GetToken():al, dl is g_look
 GetObject:					# called just after GetToken
 	cmpb	$'(',%al
 	je	GetList
-	mov	$g_token,%si
 .Intern:
 	mov	$g_str,%di
 	xor	%al,%al
@@ -200,14 +200,13 @@ xCons:	xchg	%ax,%si
 #	jmp	Cons
 Cons:	xchg	%di,%ax
 	mov	%fs,%di
-	push	%di
 	stosw
 	xchg	%si,%ax
 	stosw
-	mov	%di,%fs
-	pop	%ax
-	ret
-1:	xchg	%di,%ax
+	xchg	%di,%ax
+	mov	%fs,%di
+	mov	%ax,%fs
+	xchg	%di,%ax
 	ret
 
 Pairlis:cmp	$NIL,%di			# Pairlis(x:di,y:si,a:dx):ax
@@ -235,10 +234,9 @@ Evcon:	push	%di				# save c
 	pop	%dx				# restore a
 	pop	%di				# restore c
 	cmp	$NIL,%ax
-	jne	2f
-	mov	2(%di),%di			# di = Cdr(c)
-	jmp	Evcon
-2:	mov	(%di),%di			# di = Car(c)
+	cmove	2(%di),%di			# di = Cdr(c)
+	jz	Evcon
+	mov	(%di),%di			# di = Car(c)
 .EvCadr:call	Cadr				# ax = Cadar(c)
 #	jmp	Eval
 
@@ -247,8 +245,8 @@ Eval:	test	$1,%al				# Eval(e:ax,a:dx):ax
 	xchg	%ax,%di				# di = e
 	mov	(%di),%ax			# ax = Car(e)
 	cmp	$ATOM_QUOTE,%ax			# maybe CONS
-	je	Cadr
 	mov	2(%di),%di			# di = Cdr(e)
+	je	.retA
 	cmp	$ATOM_COND,%ax
 	je	Evcon
 .Ldflt2:push	%ax				# save 2
@@ -267,23 +265,6 @@ Apply:	test	$1,%al				# Apply(fn:ax,x:si:a:dx):ax
 	xchg	%ax,%dx
 	pop	%di				# restore 1
 	jmp	.EvCadr
-.switch:cmp	$ATOM_EQ,%ax
-	ja	.dflt1
-	mov	(%si),%di			# di = Car(x)
-.ifCar:	cmp	$ATOM_CAR,%al
-	jne	.ifCdr
-	mov	(%di),%ax
-	ret
-.ifCdr:	cmp	$ATOM_CDR,%al
-	jne	.ifAtom
-	mov	2(%di),%ax
-	ret
-.ifAtom:cmp	$ATOM_ATOM,%al
-	jne	.ifCons
-	test	$1,%di
-	jnz	.retT
-.retF:	mov	$NIL,%ax			# ax = NIL
-	ret
 .ifCons:mov	2(%si),%si			# si = Cdr(x)
 	mov	(%si),%si			# si = Cadr(x)
 	cmp	$ATOM_CONS,%al
@@ -292,6 +273,20 @@ Apply:	test	$1,%al				# Apply(fn:ax,x:si:a:dx):ax
 	jne	.retF
 .retT:	mov	$ATOM_T,%al			# ax = ATOM_T
 	ret
+.switch:cmp	$ATOM_EQ,%ax
+	ja	.dflt1
+	mov	(%si),%di			# di = Car(x)
+.ifCar:	cmp	$ATOM_CAR,%al
+	je	.retA
+.ifCdr:	cmp	$ATOM_CDR,%al
+	cmove	2(%di),%ax
+	je	.retD
+.ifAtom:cmp	$ATOM_ATOM,%al
+	jne	.ifCons
+	test	$1,%di
+	jnz	.retT
+.retF:	mov	$NIL,%ax			# ax = NIL
+.retD:	ret
 .dflt1:	push	%si				# save x
 	push	%dx				# save a
 	call	Eval
@@ -300,19 +295,16 @@ Apply:	test	$1,%al				# Apply(fn:ax,x:si:a:dx):ax
 	jmp	Apply
 
 Cadr:	mov	2(%di),%di			# contents of decrement register
-	mov	(%di),%ax			# contents of address register
+.retA:	mov	(%di),%ax			# contents of address register
 	ret
 
-assoc1:	mov	2(%si),%dx			# dx = Cdr(y)
-#	jmp	Assoc
-
 Assoc:	cmp	$NIL,%dx			# Assoc(x:ax,y:dx):ax
 	mov	%dx,%si
 	je	.retF
 	mov	(%si),%bx			# bx = Car(y)
-	mov	(%bx),%cx			# cx = Caar(y)
-	cmp	%cx,%ax
-	jne	assoc1
+	cmp	%ax,(%bx)			# (%bx) = Caar(y)
+	cmovne	2(%si),%dx			# dx = Cdr(y)
+	jne	Assoc
 	mov	2(%bx),%ax			# ax = Cdar(y)
 	ret