# Handy functions for adding/retrieving strings to/from memory.
getString(addr::Int64, len::Int64) = ASCIIString([Char(c) for c in mem[addr:(addr+len-1)]])
+
function putString(str::ASCIIString, addr::Int64)
mem[addr:(addr+length(str)-1)] = [Int64(c) for c in str]
end
function defPrim(f::Function; name="nameless")
push!(primitives, f)
- push!(primNames, replace(replace(name, "\004", "EOF"), "\n", "\\n"))
+ push!(primNames, replace(name, "\004", "EOF"))
return -length(primitives)
end
-callPrim(addr::Int64) = primitives[-addr]()
+function callPrim(addr::Int64)
+ if addr >=0 || -addr>length(primitives)
+ error("Attempted to execute non-existent primitive at address $addr.")
+ else
+ primitives[-addr]()
+ end
+end
getPrimName(addr::Int64) = primNames[-addr]
# Word creation functions
end)
RSPSTORE = defPrimWord("RSP!", () -> begin
- RSP = popPS()
+ reg.RSP = popPS()
return NEXT
end)
end)
PSPSTORE = defPrimWord("PSP!", () -> begin
- PSP = popPS()
+ reg.PSP = popPS()
return NEXT
end)
sources = Array{Any,1}()
currentSource() = sources[length(sources)]
-EOF_CFA = defConst("EOF", 4)
+EOF = defPrimWord("\x04", () -> begin
+ close(pop!(sources))
+ if !isempty(sources)
+ return NEXT
+ else
+ return 0
+ end
+end)
EMIT = defPrimWord("EMIT", () -> begin
print(Char(popPS()))
putString(line[1:mem[SPAN]], addr)
else
mem[SPAN] = 1
- mem[addr] = EOF
+ mem[addr] = 4 # eof
end
return NEXT
# Outer interpreter
TRACE = defPrimWord("TRACE", () -> begin
- print("RS: "); printRS()
+ println("reg.W: $(reg.W) reg.IP: $(reg.IP)")
print("PS: "); printPS()
+ print("RS: "); printRS()
print("[paused]")
readline()
TOIN, TOIN_CFA = defNewVar(">IN", 0)
QUERY = defWord("QUERY",
- [TIB_CFA, LIT, 80, EXPECT,
+ [TIB_CFA, LIT, 160, EXPECT,
SPAN_CFA, FETCH, NUMTIB_CFA, STORE,
LIT, 0, TOIN_CFA, STORE,
EXIT])
return NEXT
end)
+BYE = defPrimWord("BYE", () -> begin
+ println("Bye!")
+ return 0
+end)
+
STATE, STATE_CFA = defNewVar("STATE", 0)
INTERPRET = defWord("INTERPRET",
DUP, FETCH, ZE, ZBRANCH, 3,
DROP, EXIT, # Exit if TIB is exhausted
- STATE_CFA, FETCH, ZBRANCH, 28,
+ STATE_CFA, FETCH, ZBRANCH, 31,
# Compiling
- DUP, FIND, ZBRANCH, 17,
+ DUP, FIND, QDUP, ZBRANCH, 19,
# Found word.
+ SWAP, DROP,
DUP, TOCFA, SWAP, INCR, FETCH, LIT, F_IMMED, AND, ZBRANCH, 4,
# Immediate: Execute!
- EXECUTE, BRANCH, -30,
+ EXECUTE, BRANCH, -33,
# Not immediate: Compile!
- COMMA, BRANCH, -33,
+ COMMA, BRANCH, -36,
# No word found, parse number
- BTICK, LIT, COMMA, NUMBER, COMMA, BRANCH, -40,
+ NUMBER, BTICK, LIT, COMMA, COMMA, BRANCH, -43,
# Interpreting
DUP, FIND, QDUP, ZBRANCH, 7,
# Found word. Execute!
- SWAP, DROP, TOCFA, EXECUTE, BRANCH, -51,
+ SWAP, DROP, TOCFA, EXECUTE, BRANCH, -54,
# No word found, parse number and leave on stack
- NUMBER, BRANCH, -54,
+ NUMBER, BRANCH, -57,
EXIT]
)
end)
QUIT = defWord("QUIT",
- [RSP0_CFA, RSPSTORE,
+ [LIT, 0, STATE_CFA, STORE,
+ LIT, 0, NUMTIB_CFA, STORE,
+ RSP0_CFA, FETCH, RSPSTORE,
QUERY,
INTERPRET, PROMPT,
BRANCH,-4])
-BYE = defPrimWord("BYE", () -> begin
- println("Bye!")
- return 0
-end)
+ABORT = defWord("ABORT",
+ [PSP0_CFA, FETCH, PSPSTORE, QUIT])
INCLUDE = defPrimWord("INCLUDE", () -> begin
pushPS(32)
return NEXT
end, flags=F_IMMED)
-TICK = defWord("'",
- [LIT, 32, WORD, FIND, TOCFA, EXIT])
-
#### VM loop ####
initFileName = Pkg.dir("forth/src/lib.4th")
end
-function run(;initialize=false)
+function run(;initialize=true)
# Begin with STDIN as source
push!(sources, STDIN)
close(pop!(sources))
end
- mem[STATE] = 0
- mem[NUMTIB] = 0
- reg.PSP = mem[PSP0]
- reg.RSP = mem[RSP0]
- reg.IP = QUIT + 1
+ # QUIT
+ reg.IP = ABORT + 1
jmp = NEXT
end
end