From 784ca43f3905e90d511680352baf6d0f61559be6 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 12 Aug 2023 23:10:48 -0700
Subject: [PATCH] optimize math, length

---
 stage1/words.s               |  12 +++
 stage2/16-optimize-prims.lsp | 137 ++++++++++++++++++++++++++++++++++-
 2 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/stage1/words.s b/stage1/words.s
index 40cd6df..17cecc9 100644
--- a/stage1/words.s
+++ b/stage1/words.s
@@ -266,6 +266,18 @@ INITIAL_WORDS:
         .ascii "print-obj$"
         .balign 8
 
+        .quad box_integer
+        .byte 12
+        .byte LISP_OBJECT_TYPE_INTEGER
+        .ascii "box-integer$"
+        .balign 8
+
+        .quad unbox_integer
+        .byte 14
+        .byte LISP_OBJECT_TYPE_INTEGER
+        .ascii "unbox-integer$"
+        .balign 8
+
         # end
         .quad 0
         .quad 0
diff --git a/stage2/16-optimize-prims.lsp b/stage2/16-optimize-prims.lsp
index 89831b9..029fb55 100644
--- a/stage2/16-optimize-prims.lsp
+++ b/stage2/16-optimize-prims.lsp
@@ -1,4 +1,33 @@
 ; create some more optimized primitives with the linker
+; length could be a lot faster and is pretty simple
+(define length$ (car (link
+  (start
+    ; set up counter
+    (\addi  $sp $sp -0x10)
+    (\sd    $ra $sp 0x00)
+    (\sd    $s1 $sp 0x08)
+    (\li    $s1 0)
+  )
+  (loop
+    ; do cdr in a loop
+    (\beqz  $a0 (rel  end))
+    (\auipc $ra (rel  cdr$))
+    (\callr $ra (rel+ cdr$))
+    (\addi  $s1 $s1 1)
+    (\j     (rel loop))
+  )
+  (end
+    (\mv    $a0 $s1)
+    (\ld    $ra $sp 0x00)
+    (\ld    $s1 $sp 0x08)
+    (\addi  $sp $sp 0x10)
+    (\ret)
+  )
+)))
+(define length (fn (list)
+  (car (call-native length$ 1 (ref list)))))
+
+; this is very commonly used and this version is a lot faster
 (define eval-list (box-procedure (car (link
   (start
     ; stash locals, set up variables
@@ -114,9 +143,115 @@
     (\ret)
   )
   (nomem
-    (\li    $a0 -4) ; EVAL_EXCEPTION_NO_FREE_MEM
+    (\li    $a0 -4) ; EVAL_ERROR_NO_FREE_MEM
     (\li    $a1 0)
     (\j     (rel ret))
   )
 ))))
 
+; replace math
+(define binary-op$ (car (link
+  ; unbox first arg into s1
+  ; args list on stack for eval-head
+  (start
+    (\addi  $sp $sp -0x48)
+    (\sd    $ra $sp 0x00)
+    (\sd    $s1 $sp 0x08)
+    (\sd    $a1 $sp 0x10) ; locals
+    (\sd    $a0 $sp 0x20) ; args
+    (\sd    $zero $sp 0x28)
+    (\sd    $zero $sp 0x30) ; first flag
+    ; load address from data
+    (\mv    $a0 $a2)
+    (\auipc $ra (rel  unbox-integer$))
+    (\callr $ra (rel+ unbox-integer$))
+    (\beqz  $a0 (rel  exc))
+    (\beqz  $a1 (rel  exc))
+    (\sd    $a1 $sp 0x18) ; routine
+  )
+  (loop
+    ; eval arg
+    (\ld    $a0 $sp 0x10)
+    (\auipc $ra (rel  acquire-object$))
+    (\callr $ra (rel+ acquire-object$))
+    (\mv    $a1 $a0)
+    (\addi  $a0 $sp 0x20)
+    (\auipc $ra (rel  eval-head$))
+    (\callr $ra (rel+ eval-head$))
+    (\bnez  $a0 (rel  ret)) ; err
+    ; shuffle and unbox
+    (\ld    $a0 $sp 0x20)
+    (\ld    $t0 $sp 0x28)
+    (\sd    $t0 $sp 0x20)
+    (\sd    $zero $sp 0x28)
+    (\auipc $ra (rel  unbox-integer$))
+    (\callr $ra (rel+ unbox-integer$))
+    ; check if first
+    (\ld    $t0 $sp 0x30)
+    (\beqz  $t0 (rel first))
+    ; call routine with a0, a1
+    (\ld    $ra $sp 0x18)
+    (\mv    $a0 $s1)
+    (\callr $ra 0)
+    (\mv    $s1 $a0)
+    ; check if end
+    (\ld    $t0 $sp 0x20)
+    (\beqz  $t0 (rel end))
+    (\j     (rel loop))
+  )
+  (first
+    ; move arg in
+    (\mv    $s1 $a1)
+    (\li    $t0 1)
+    (\sd    $t0 $sp 0x30) ; set first flag
+    (\j     (rel loop))
+  )
+  (end
+    ; box the result
+    (\mv    $a0 $s1)
+    (\auipc $ra (rel  box-integer$))
+    (\callr $ra (rel+ box-integer$))
+    (\beqz  $a0 (rel  nomem))
+    (\mv    $a1 $a0)
+    (\li    $a0 0)
+  )
+  (ret
+    ; stash result
+    (\sd    $a0 $sp 0x38)
+    (\sd    $a1 $sp 0x40)
+    ; release locals
+    (\ld    $a0 $sp 0x10)
+    (\auipc $ra (rel  release-object$))
+    (\callr $ra (rel+ release-object$))
+    ; release head
+    (\ld    $a0 $sp 0x20)
+    (\auipc $ra (rel  release-object$))
+    (\callr $ra (rel+ release-object$))
+    ; restore saved
+    (\ld    $ra $sp 0x00)
+    (\ld    $s1 $sp 0x08)
+    (\ld    $a0 $sp 0x38)
+    (\ld    $a1 $sp 0x40)
+    (\addi  $sp $sp 0x48)
+    (\ret)
+  )
+  (nomem
+    (\li    $a0 -4) ; EVAL_ERROR_NO_FREE_MEM
+    (\li    $a1 0)
+    (\j     (rel ret))
+  )
+  (exc
+    (\li    $a0 -1) ; EVAL_ERROR_EXCEPTION
+    (\li    $a1 0)
+    (\j     (rel ret))
+  )
+)))
+
+(define +  (box-procedure binary-op$ +$))
+(define -  (box-procedure binary-op$ -$))
+(define << (box-procedure binary-op$ <<$))
+(define >> (box-procedure binary-op$ >>$))
+(define &  (box-procedure binary-op$ &$))
+(define |  (box-procedure binary-op$ |$))
+(define ^  (box-procedure binary-op$ ^$))
+