diff --git a/bin/sectorlisp.bin b/bin/sectorlisp.bin index cd66425..dd58293 100755 Binary files a/bin/sectorlisp.bin and b/bin/sectorlisp.bin differ diff --git a/sectorlisp.S b/sectorlisp.S index af5be88..e8ab8b5 100644 --- a/sectorlisp.S +++ b/sectorlisp.S @@ -3,6 +3,7 @@ ╞══════════════════════════════════════════════════════════════════════════════╡ │ Copyright 2020 Justine Alexandra Roberts Tunney │ │ Copyright 2021 Alain Greppin │ +│ Some size optimisations by Peter Ferrie │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -21,19 +22,19 @@ // LISP meta-circular evaluator in a MBR .set ONE, %bp -.set NIL, 1 -.set ATOM_T, 9 -.set ATOM_QUOTE, 13 -.set ATOM_COND, 25 -.set ATOM_ATOM, 35 -.set ATOM_CAR, 45 -.set ATOM_CDR, 53 -.set ATOM_CONS, 61 -.set ATOM_EQ, 71 +.set NIL, 7 +.set ATOM_T, 15 +.set ATOM_QUOTE, 19 +.set ATOM_COND, 31 +.set ATOM_ATOM, 41 +.set ATOM_CAR, 51 +.set ATOM_CDR, 59 +.set ATOM_CONS, 67 +.set ATOM_EQ, 77 .set g_token, 0x7800 .set g_str, 0x0 -.set g_mem, 0x3600 +.set g_mem, 0x8000 .set boot, 0x7c00 //////////////////////////////////////////////////////////////////////////////// @@ -48,27 +49,23 @@ _start: jmp .init # some bios scan for short jump .type kSymbols,@object; kSymbols: - .ascii "NIL\0T\0QUOTE\0COND\0ATOM\0CAR\0CDR\0CONS\0EQ" + .ascii "\0NIL\0T\0QUOTE\0COND\0ATOM\0CAR\0CDR\0CONS\0EQ\0" .type .init,@function -.init: ljmp $0x600>>4,$_begin # end of bios data roundup page -_begin: push %cs # memory model cs=ds=es = 0x600 +.init: ljmp $0x7c00>>4,$_begin # end of bios data roundup page +_begin: mov $g_mem,%cx + mov %cx,%fs # fs = &g_mem + xor %ax,%ax + mov %cx,%di + cld + rep stosb # clears our bss memory + push %cs # memory model cs=ds=es = 0x7c0 push %cs push %cs pop %ds pop %es - mov $kSymbols,%si - push %si - xor %di,%di # mov g_str, %di - mov $37,%cx - cld - rep movsb - pop %cx pop %ss mov %cx,%sp - mov $g_mem,%ax - mov %ax,%fs # fs = &g_mem - rep stosb # clears our bss memory mov $NIL,ONE main: mov $'\n',%dl call GetToken