# Built-in variables
nextVarAddr = 1
-H = nextVarAddr; nextVarAddr += 1 # Next free memory address
-FORTH = nextVarAddr; nextVarAddr += 1 # LFA of latest word in system dict
-CURRENT = nextVarAddr; nextVarAddr += 1 # Current compilation dict
+H = nextVarAddr; nextVarAddr += 1 # Next free memory address
+FORTH_LATEST = nextVarAddr; nextVarAddr += 1 # FORTH dict latest
+CURRENT = nextVarAddr; nextVarAddr += 1 # Current compilation dict
RSP0 = nextVarAddr # bottom of RS
PSP0 = RSP0 + size_RS # bottom of PS
TIB = PSP0 + size_PS # address of terminal input buffer
mem[H] = TIB + size_TIB # location of bottom of dictionary
-mem[FORTH] = 0 # no previous definition
-mem[CURRENT] = FORTH # Compile words to system dict initially
+mem[FORTH_LATEST] = 0 # zero FORTH dict latest (no previous def)
+mem[CURRENT] = FORTH_LATEST-1 # Compile words to system dict initially
DICT = mem[H] # Save bottom of dictionary as constant
dictWriteString(string::ASCIIString) = dictWrite([Int64(c) for c in string])
function createHeader(name::AbstractString, flags::Int64)
- mem[mem[H]] = mem[mem[CURRENT]]
- mem[mem[CURRENT]] = mem[H]
+ mem[mem[H]] = mem[mem[CURRENT]+1]
+ mem[mem[CURRENT]+1] = mem[H]
mem[H] += 1
dictWrite(length(name) | flags | NFA_MARK)
# Dictionary entries for core built-in variables, constants
H_CFA = defExistingVar("H", H)
-FORTH_CFA = defExistingVar("FORTH", FORTH)
-CURRENT_CFA = defExistingVar("CURRENT", CURRENT)
PSP0_CFA = defConst("PSP0", PSP0)
RSP0_CFA = defConst("RSP0", RSP0)
# Dictionary searches
-LFATOCFA_CFA = defPrimWord("LFA>CFA", () -> begin
+FROMLINK_CFA = defPrimWord("LINK>", () -> begin
addr = popPS()
lenAndFlags = mem[addr+1]
return NEXT
end)
-TOBODY_CFA = defWord(">BODY", [INCR_CFA, EXIT_CFA])
+createHeader("FORTH", 0)
+FORTH_CFA = mem[H]
+dictWrite(defPrim(() -> begin
+ mem[CONTEXT] = reg.W
+ return NEXT
+end, name="FORTH"))
+dictWrite(0) # cell for latest
+
+CURRENT_CFA = defExistingVar("CURRENT", CURRENT)
+
+# Switch to new FORTH vocabulary cfa
+mem[FORTH_CFA+1] = mem[mem[CURRENT]+1]
+mem[CURRENT] = FORTH_CFA
-CONTEXT, CONTEXT_CFA = defNewVar("CONTEXT", zeros(Int64, 100))
+CONTEXT, CONTEXT_CFA = defNewVar("CONTEXT", zeros(Int64, 10))
mem[CONTEXT] = FORTH_CFA
NUMCONTEXT, NUMCONTEXT_CFA = defNewVar("#CONTEXT", 1)
lfa = 0
for vocabCFA in reverse(context)
- callPrim(mem[vocabCFA])
- lfa = popPS()
+ lfa = vocabCFA+1
while (lfa = mem[lfa]) > 0
if lfa > 0
pushPS(lfa)
- callPrim(mem[LFATOCFA_CFA])
+ callPrim(mem[FROMLINK_CFA])
if (lenAndFlags & F_IMMED) == F_IMMED
pushPS(1)
else
DOES_HELPER_CFA = defPrimWord("(DOES>)", () -> begin
- pushPS(mem[mem[CURRENT]])
- callPrim(mem[LFATOCFA_CFA])
+ pushPS(mem[mem[CURRENT]+1])
+ callPrim(mem[FROMLINK_CFA])
cfa = popPS()
runtimeAddr = popPS()
end)), name="doesPrim")
return NEXT
-end, flags=F_IMMED)
+end, flags=F_IMMED | F_HIDDEN)
DOES_CFA = defWord("DOES>",
[LIT_CFA, LIT_CFA, COMMA_CFA, HERE_CFA, LIT_CFA, 3, ADD_CFA, COMMA_CFA,
end, flags=F_IMMED)
HIDDEN_CFA = defPrimWord("HIDDEN", () -> begin
- lenAndFlagsAddr = mem[mem[CURRENT]] + 1
+ lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1
mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_HIDDEN
return NEXT
end)
EXIT_CFA], flags=F_IMMED)
IMMEDIATE_CFA = defPrimWord("IMMEDIATE", () -> begin
- lenAndFlagsAddr = mem[mem[CURRENT]] + 1
+ lenAndFlagsAddr = mem[mem[CURRENT]+1] + 1
mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
return NEXT
end, flags=F_IMMED)