andrius
/
stage0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing assoc in mixed lexical scope

This commit is contained in:
Jeremiah Orians 2017-05-21 21:13:04 -04:00
parent c49fffdd94
commit 9bf8255849
No known key found for this signature in database
GPG Key ID: 7457821534D2ACCD
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.org
View File

@ -20,6 +20,8 @@
** Changed
** Fixed
Fixed failure to lookup symbols that are identical but are in different lexical scopes
Updated Bootstrapping instructions to reflect new checksum and recommendation for most minimal requirements
** Removed

10
bootstrapping Steps.org
View File

@ -18,6 +18,14 @@
First to get a vm that can run our code:
make development
For those of you who don't want to depend upon make, simply run:
gcc -ggdb -Dtty_lib=true vm.h vm.c vm_instructions.c vm_decode.c tty.c -o bin/vm
However if you are trying to hand convert the source code to your TTL Logic
or relay based computer to ensure complete immunity from the trusting trust attack,
please instead implement the equivelent of:
gcc vm.h vm_minimal.c vm_instructions.c vm_decode.c -o bin/vm
And we probably want a safe place to put the programs we make:
mkdir roms
@ -144,7 +152,7 @@ Then we use our M0 Line macro assembler to convert our assembly into hex2 format
Then we need to assemble that hex into our desired program:
./bin/vm --rom roms/stage1_assembler-2 --tape_01 temp2 --tape_02 roms/lisp --memory 48K
roms/lisp should have the sha256sum of a99a43cb11fd2889a94d9e2bc65e5487406eb62ae4d0d877d573437cb9d1c107
roms/lisp should have the sha256sum of d9bb13beced1c98daa4a62512ba35faa137f3ed6f23cdc1cdf724e25e8c6d80a
Our lisp will first attempt to evaluate any code in tape_01 and then evaluate any code that the user types in.
It is recommended to run with no less than 4MB of Memory

2
stage2/High_level_prototypes/lisp_eval.c
View File

@ -69,7 +69,7 @@ struct cell* assoc(struct cell* key, struct cell* alist)
if(nil == alist) return nil;
for(; nil != alist; alist = alist->cdr)
{
if(alist->car->car == key) return alist->car;
if(alist->car->car->string == key->string) return alist->car;
}
return nil;
}

4
stage2/lisp.s
View File

@ -907,13 +907,15 @@
PUSHR R3 R15 ; Protect R3
PUSHR R4 R15 ; Protect R4
LOADUI R4 $NIL ; Using NIL
LOAD32 R0 R0 4 ; Using KEY->CAR
:assoc_0
CMPJUMPI.E R1 R4 @assoc_done
LOAD32 R2 R1 4 ; ALIST->CAR
LOAD32 R3 R2 4 ; ALIST->CAR->CAR
LOAD32 R3 R3 4 ; ALIST->CAR->CAR->CAR
LOAD32 R1 R1 8 ; ALIST = ALIST->CDR
CMPSKIP.E R0 R3 ; If ALIST->CAR->CAR != KEY
CMPSKIP.E R0 R3 ; If ALIST->CAR->CAR->CAR != KEY->CAR
JUMP @assoc_0 ; Iterate using ALIST->CDR
;; Found KEY