kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-09-21 02:27:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #343 from bendudson/nasm-catchless-try

Browse Source 
NASM: Add catchless try to step 9 and step A
This commit is contained in:
Joel Martin 2019-03-03 17:56:34 -06:00 committed by GitHub
commit 23342cb610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nasm/step9_try.asm
View File

@ -1524,6 +1524,10 @@ eval:
; Check second arg B
mov al, BYTE [rsi + Cons.typecdr]
; If nil (catchless try)
cmp al, content_nil
je .catchless_try
cmp al, content_pointer
jne .try_missing_catch
@ -1575,7 +1579,7 @@ eval:
; Now have extracted from (try* A (catch* B C))
; A in R8
; B in R10
; C in T9
; C in R9
push R9
push R10
@ -1611,6 +1615,23 @@ eval:
mov rax, r8
jmp .return
.catchless_try:
;; Evaluate the form in R8
push r15 ; Environment
mov rsi, r15
call incref_object ; Env released by eval
mov rdi, r15 ; Env in RDI
mov rsi, r8 ; The form to evaluate (A)
call incref_object ; AST released by eval
call eval ; Result in RAX
pop r15 ; Environment
jmp .return
.catch:
; Jumps here on error
; Value thrown in RSI

23
nasm/stepA_mal.asm
View File

@ -1539,6 +1539,10 @@ eval:
; Check second arg B
mov al, BYTE [rsi + Cons.typecdr]
; If nil (catchless try)
cmp al, content_nil
je .catchless_try
cmp al, content_pointer
jne .try_missing_catch
@ -1590,7 +1594,7 @@ eval:
; Now have extracted from (try* A (catch* B C))
; A in R8
; B in R10
; C in T9
; C in R9
push R9
push R10
@ -1626,6 +1630,23 @@ eval:
mov rax, r8
jmp .return
.catchless_try:
;; Evaluate the form in R8
push r15 ; Environment
mov rsi, r15
call incref_object ; Env released by eval
mov rdi, r15 ; Env in RDI
mov rsi, r8 ; The form to evaluate (A)
call incref_object ; AST released by eval
call eval ; Result in RAX
pop r15 ; Environment
jmp .return
.catch:
; Jumps here on error
; Value thrown in RSI