From: Jonas Hvid <mail@johv.dk>
Date: Mon, 18 Nov 2019 17:23:37 +0000 (+0100)
Subject: Terminate program correctly
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=0f1b460bd08ae1d2d9bc3dafa3c30cd08d95338e;p=rrq%2Fjonasforth.git

Terminate program correctly
---

diff --git a/main.asm b/main.asm
index 626de16..c6ada73 100644
--- a/main.asm
+++ b/main.asm
@@ -32,8 +32,7 @@ main:
     mov rsi, program
     next
 
-program:
-    dq HELLO
+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
@@ -43,9 +42,11 @@ docol:
     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 codeword is called at the end of a Forth definition. It just needs to
+;; 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:
+EXIT:
+    dq .start
+.start:
     popr rsi
     next
 
@@ -84,7 +85,21 @@ HELLO:
     dq EMIT
     dq EMIT
     dq EMIT
-    dq exit
+    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