From: Jonas Hvid <mail@johv.dk>
Date: Sun, 8 Dec 2019 18:28:29 +0000 (+0100)
Subject: Support compilation mode in INTERPRET
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=423e2197f05d6af11aa75a7a15aa3f8e3be78cbf;p=rrq%2Fjonasforth.git

Support compilation mode in INTERPRET

Now we can do

  S" BOOP" CREATE ] DOCOL HELLO 3 2 + .U NEWLINE EXIT [ BOOP
---

diff --git a/impl.asm b/impl.asm
index 5736469..923406f 100644
--- a/impl.asm
+++ b/impl.asm
@@ -15,12 +15,12 @@ segment readable executable
 find:
   ;; RSI contains the entry we are currently looking at
 .loop:
-  movzx rcx, byte [rsi + 16]    ; Length of word being looked at
+  movzx rcx, byte [rsi + 8 + 1]    ; Length of word being looked at
   cmp rcx, [.search_length]
   jne .next    ; If the words don't have the same length, we have the wrong word
 
   ;; Otherwise, we need to compare strings
-  lea rdx, [rsi + 16 + 1]       ; Location of character being compared in entry
+  lea rdx, [rsi + 8 + 1 + 1]    ; Location of character being compared in entry
   mov rdi, [.search_buffer]     ; Location of character being compared in search buffer
 .compare_char:
   mov al, [rdx]
diff --git a/main.asm b/main.asm
index 8133cdc..2e880d9 100644
--- a/main.asm
+++ b/main.asm
@@ -37,7 +37,11 @@ macro header label, name, immediate {
 
 label#_entry:
   dq initial_latest_entry
-  dq 0
+  if immediate eq
+    db 0
+  else
+    db 1
+  end if
   db .string_end - ($ + 1)
   db name
   .string_end:
@@ -118,7 +122,7 @@ forth_asm FIND, 'FIND'
 ;; entry.
 forth_asm TCFA, '>CFA'
   pop rax
-  add rax, 16                   ; [rax] = length of name
+  add rax, 8 + 1                ; [rax] = length of name
   movzx rbx, byte [rax]
   inc rax
   add rax, rbx                  ; [rax] = codeword
@@ -264,8 +268,19 @@ forth_asm DROP, 'DROP'
   add rsp, 8
   next
 
+forth_asm NOT_, 'NOT'
+  pop rax
+  cmp rax, 0
+  jz .false
+.true:
+  push 0
+  next
+.false:
+  push 1
+  next
+
 ;; The INTERPRET word reads and interprets user input. It's behavior depends on
-;; the current STATE. It provides special handling for integers. (TODO)
+;; the current STATE. It provides special handling for integers.
 forth INTERPRET, 'INTERPRET'
   ;; Read word
   dq READ_WORD
@@ -273,9 +288,22 @@ forth INTERPRET, 'INTERPRET'
   ;; Stack is (word length word length).
   dq FIND                       ; Try to find word
   dq DUP_
-  dq ZBRANCH, 8 * 8             ; Check if word is found
+  dq ZBRANCH, 8 * 20            ; Check if word is found
+
+  ;; - Word is found -
+
+  dq STATE, GET, ZBRANCH, 8 * 9 ; Check whether we are in compilation or immediate mode
+
+  ;; (Word found, compilation mode)
+  dq DUP_, IS_IMMEDIATE, NOT_, ZBRANCH, 8 * 4 ; If the word is immediate, continue as we would in immediate mode
 
-  ;; Word is found, execute it
+  ;; Otherwise, we want to compile this word
+  dq TCFA
+  dq COMMA
+  dq EXIT
+
+  ;; (Word found, immediate mode)
+  ;; Execute word
   dq TCFA
   ;; Stack is (word length addr)
   dq SWAP, DROP
@@ -284,10 +312,19 @@ forth INTERPRET, 'INTERPRET'
   dq EXEC
   dq EXIT
 
-  ;; No word is found, assume it is an integer literal
+  ;; - No word is found, assume it is an integer literal -
   ;; Stack is (word length addr)
   dq DROP
   dq PARSE_NUMBER
+
+  dq STATE, GET, ZBRANCH, 8 * 5 ; Check whether we are in compilation or immediate mode
+
+  ;; (Number, compilation mode)
+  dq LIT, LIT, COMMA
+  dq COMMA
+  dq EXIT
+
+  ;; (Number, immediate mode)
   dq EXIT
 
 ;; .U prints the value on the stack as an unsigned integer in hexadecimal.
@@ -365,6 +402,18 @@ forth_asm GET, '@'
   push rax
   next
 
+forth_asm PUT_BYTE, 'C!'
+  pop rbx
+  pop rax                       ; Value
+  mov [rbx], al
+  next
+
+forth_asm GET_BYTE, 'C@'
+  pop rax
+  movzx rax, byte [rax]
+  push rax
+  next
+
 ;; Add two integers on the stack.
 forth_asm PLUS, '+'
   pop rax
@@ -455,11 +504,10 @@ forth_asm CREATE, 'CREATE'
   mov [latest_entry], rdi       ; Update LATEST to point to this word
 
   add rdi, 8
-  mov rax, 0
-  mov [rdi], rax                ; Set immediate flag
+  mov [rdi], byte 0             ; Insert immediate flag
 
-  add rdi, 8
-  mov [rdi], rcx                ; Insert length
+  add rdi, 1
+  mov [rdi], byte cl            ; Insert length
 
   ;; Insert word string
   add rdi, 1
@@ -482,11 +530,20 @@ forth IMMEDIATE, 'IMMEDIATE', 1
   dq PUT
   dq EXIT
 
-;; Return 0 if the given word is not immediate.
+;; Given the address of a word, return 0 if the given word is not immediate.
 forth IS_IMMEDIATE, 'IMMEDIATE?'
-  dq FIND
   dq LIT, 8, PLUS
-  dq GET
+  dq GET_BYTE
+  dq EXIT
+
+;; Enter immediate mode, immediately
+forth INTO_IMMEDIATE, '[', 1
+  dq LIT, 0, STATE, PUT_BYTE
+  dq EXIT
+
+;; Enter compilation mode
+forth OUTOF_IMMEDIATE, ']'
+  dq LIT, 1, STATE, PUT_BYTE
   dq EXIT
 
 forth MAIN, 'MAIN'