X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fforth.jl;h=e571758f6d76254f7c5f70f023cbe6afa95fc7c2;hb=7cc4407fe0b3da1af97f444bb03d874e868a7152;hp=64d2d23720f1173d0ab9a244538dacb06e38e0ea;hpb=7f2c4e5ef814e84cee84cba32667418cec15af12;p=forth.jl.git

diff --git a/src/forth.jl b/src/forth.jl
index 64d2d23..e571758 100644
--- a/src/forth.jl
+++ b/src/forth.jl
@@ -1,12 +1,12 @@
 module forth
 
 # VM mem size
-size_mem = 640*1024
+size_mem = 1000000 # 1 mega-int
 
 # Buffer sizes
-size_RS = 1024   # Return stack size
-size_PS = 1024   # Parameter stack size
-size_TIB = 1096  # Terminal input buffer size
+size_RS = 1000   # Return stack size
+size_PS = 1000   # Parameter stack size
+size_TIB = 1000  # Terminal input buffer size
 
 # The mem array constitutes the memory of the VM. It has the following geography:
 #
@@ -219,6 +219,24 @@ EXIT = defPrimWord("EXIT", () -> begin
     return NEXT
 end)
 
+# Dictionary entries for core built-in variables, constants
+
+HERE_CFA = defExistingVar("HERE", HERE)
+LATEST_CFA = defExistingVar("LATEST", LATEST)
+PSP0_CFA = defExistingVar("PSP0", PSP0)
+RSP0_CFA = defExistingVar("RSP0", RSP0)
+
+defConst("DOCOL", DOCOL)
+defConst("DOCON", DOCON)
+defConst("DOVAR", DOVAR)
+
+defConst("DICT", DICT)
+defConst("MEMSIZE", size_mem)
+
+F_IMMED = defConst("F_IMMED", 128)
+F_HIDDEN = defConst("F_HIDDEN", 256)
+F_LENMASK = defConst("F_LENMASK", 127)
+
 # Basic forth primitives
 
 DROP = defPrimWord("DROP", () -> begin
@@ -512,27 +530,6 @@ SUBSTORE = defPrimWord("-!", () -> begin
 end)
 
 
-# Built-in variables
-
-HERE_CFA = defExistingVar("HERE", HERE)
-LATEST_CFA = defExistingVar("LATEST", LATEST)
-PSP0_CFA = defExistingVar("PSP0", PSP0)
-RSP0_CFA = defExistingVar("RSP0", RSP0)
-STATE, STATE_CFA = defNewVar("STATE", 0)
-BASE, BASE_CFA = defNewVar("BASE", 10)
-
-# Constants
-
-defConst("DOCOL", DOCOL)
-defConst("DOCON", DOCON)
-defConst("DOVAR", DOVAR)
-
-defConst("DICT", DICT)
-
-F_IMMED = defConst("F_IMMED", 128)
-F_HIDDEN = defConst("F_HIDDEN", 256)
-F_LENMASK = defConst("F_LENMASK", 127)
-
 # Return Stack
 
 TOR = defPrimWord(">R", () -> begin
@@ -688,6 +685,7 @@ WORD = defPrimWord("WORD", () -> begin
     return NEXT
 end)
 
+BASE, BASE_CFA = defNewVar("BASE", 10)
 NUMBER = defPrimWord("NUMBER", () -> begin
 
     wordLen = popPS()
@@ -770,6 +768,8 @@ end)
 
 # Compilation
 
+STATE, STATE_CFA = defNewVar("STATE", 0)
+
 HEADER = defPrimWord("HEADER", () -> begin
 
     wordLen = popPS()
@@ -836,6 +836,28 @@ TICK = defWord("'",
 BTICK = defWord("[']",
     [FROMR, DUP, INCR, TOR, FETCH, EXIT])
 
+# CREATE and DOES>
+
+CREATE = defWord("CREATE",
+    [WORD,
+    HEADER,
+    LIT, DOVAR, COMMA, EXIT]);
+
+DODOES = defPrim(() -> begin
+    pushRS(reg.IP)
+    reg.IP = reg.W + 1
+    return NEXT
+end, name="DOCOL")
+
+defConst("DODOES", DODOES)
+
+FROMDOES_PAREN = defWord("(DOES>)",
+    [DODOES, LAST, FETCH, TOCFA, STORE, EXIT])
+
+FROMDOES = defWord("DOES>",
+    [BTICK, FROMDOES_PAREN, COMMA, BTICK, EXIT, COMMA,
+    BTICK, LIT, COMMA, LATEST, FETCH, TODFA, COMMA], flags=F_IMMED)
+    
 
 # Strings