X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=main.asm;h=c6ada7329cbd4b320947c8b925203ad448ac162d;hb=c142f4b8739ed42a9afde1c3cd69c30a1aa9c606;hp=e95d9fd5635aafc9d60d82957eef492193d6b7fe;hpb=32d0ec28e8ffda578fe8de8eef75426d8ef98f9c;p=rrq%2Fjonasforth.git

diff --git a/main.asm b/main.asm
index e95d9fd..c6ada73 100644
--- a/main.asm
+++ b/main.asm
@@ -16,7 +16,7 @@ macro next {
 ;; register RBP.
 macro pushr x {
     sub rbp, 8
-    mov [rbp], x
+    mov qword [rbp], x
 }
 macro popr x {
     mov x, [rbp]
@@ -25,13 +25,81 @@ macro popr x {
 
 segment readable executable
 
-start:
-    ;; Initialize return stack
-    mov rbp, return_stack_top
+main:
+    cld                        ; Clear direction flag so LODSQ does the right thing.
+    mov rbp, return_stack_top  ; Initialize return stack
 
-    jmp $
+    mov rsi, program
+    next
 
-segment readable
+program: dq MAIN
+
+;; The codeword is the code that will be executed at the beginning of a forth
+;; word. It needs to save the old RSI and update it to point to the next word to
+;; execute.
+docol:
+    pushr rsi            ; Save old value of RSI on return stack; we will continue execution there after we are done executing this word
+    lea rsi, [rax + 8]   ; RAX currently points to the address of the codeword, so we want to continue at RAX+8
+    next                 ; Execute word pointed to by RSI
+
+;; This word is called at the end of a Forth definition. It just needs to
+;; restore the old value of RSI (saved by 'docol') and resume execution.
+EXIT:
+    dq .start
+.start:
+    popr rsi
+    next
+
+EMIT:
+    dq .start
+.start:
+    pushr rsi
+    pushr rax
+    mov rax, 1
+    mov rdi, 1
+    lea rsi, [rsp]
+    mov rdx, 1
+    syscall
+    add rsp, 8
+    popr rax
+    popr rsi
+    next
+
+PUSH_HELLO_CHARS:
+    dq .start
+.start:
+    push $A
+    push 'o'
+    push 'l'
+    push 'l'
+    push 'e'
+    push 'H'
+    next
+
+HELLO:
+    dq docol
+    dq PUSH_HELLO_CHARS
+    dq EMIT
+    dq EMIT
+    dq EMIT
+    dq EMIT
+    dq EMIT
+    dq EMIT
+    dq EXIT
+
+TERMINATE:
+    dq .start
+.start:
+    mov rax, $3C
+    mov rdi, 0
+    syscall
+
+MAIN:
+    dq docol
+    dq HELLO
+    dq HELLO
+    dq HELLO
+    dq TERMINATE
 
 segment readable writable