The Lambda Lab
/
projects
/
forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed residual INTERPRET bugs. Closes #3.
[forth.jl.git]
/
src
/
forth.jl
diff --git
a/src/forth.jl
b/src/forth.jl
index
90cf1cf
..
cdb56d5
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-108,6
+108,7
@@
end
# 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)]])
# 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 putString(str::ASCIIString, addr::Int64)
mem[addr:(addr+length(str)-1)] = [Int64(c) for c in str]
end
@@
-116,12
+117,18
@@
end
function defPrim(f::Function; name="nameless")
push!(primitives, f)
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
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
getPrimName(addr::Int64) = primNames[-addr]
# Word creation functions
@@
-560,7
+567,7
@@
RSPFETCH = defPrimWord("RSP@", () -> begin
end)
RSPSTORE = defPrimWord("RSP!", () -> begin
end)
RSPSTORE = defPrimWord("RSP!", () -> begin
- RSP = popPS()
+
reg.
RSP = popPS()
return NEXT
end)
return NEXT
end)
@@
-577,7
+584,7
@@
PSPFETCH = defPrimWord("PSP@", () -> begin
end)
PSPSTORE = defPrimWord("PSP!", () -> begin
end)
PSPSTORE = defPrimWord("PSP!", () -> begin
- PSP = popPS()
+
reg.
PSP = popPS()
return NEXT
end)
return NEXT
end)
@@
-598,7
+605,14
@@
end)
sources = Array{Any,1}()
currentSource() = sources[length(sources)]
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()))
EMIT = defPrimWord("EMIT", () -> begin
print(Char(popPS()))
@@
-616,7
+630,7
@@
EXPECT = defPrimWord("EXPECT", () -> begin
putString(line[1:mem[SPAN]], addr)
else
mem[SPAN] = 1
putString(line[1:mem[SPAN]], addr)
else
mem[SPAN] = 1
- mem[addr] =
EOF
+ mem[addr] =
4 # eof
end
return NEXT
end
return NEXT
@@
-721,8
+735,9
@@
end)
# Outer interpreter
TRACE = defPrimWord("TRACE", () -> begin
# Outer interpreter
TRACE = defPrimWord("TRACE", () -> begin
- print
("RS: "); printRS(
)
+ print
ln("reg.W: $(reg.W) reg.IP: $(reg.IP)"
)
print("PS: "); printPS()
print("PS: "); printPS()
+ print("RS: "); printRS()
print("[paused]")
readline()
print("[paused]")
readline()
@@
-749,7
+764,7
@@
NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
TOIN, TOIN_CFA = defNewVar(">IN", 0)
QUERY = defWord("QUERY",
TOIN, TOIN_CFA = defNewVar(">IN", 0)
QUERY = defWord("QUERY",
- [TIB_CFA, LIT,
8
0, EXPECT,
+ [TIB_CFA, LIT,
16
0, EXPECT,
SPAN_CFA, FETCH, NUMTIB_CFA, STORE,
LIT, 0, TOIN_CFA, STORE,
EXIT])
SPAN_CFA, FETCH, NUMTIB_CFA, STORE,
LIT, 0, TOIN_CFA, STORE,
EXIT])
@@
-812,6
+827,11
@@
PARSE = defPrimWord("PARSE", () -> begin
return NEXT
end)
return NEXT
end)
+BYE = defPrimWord("BYE", () -> begin
+ println("Bye!")
+ return 0
+end)
+
STATE, STATE_CFA = defNewVar("STATE", 0)
INTERPRET = defWord("INTERPRET",
STATE, STATE_CFA = defNewVar("STATE", 0)
INTERPRET = defWord("INTERPRET",
@@
-820,29
+840,30
@@
INTERPRET = defWord("INTERPRET",
DUP, FETCH, ZE, ZBRANCH, 3,
DROP, EXIT, # Exit if TIB is exhausted
DUP, FETCH, ZE, ZBRANCH, 3,
DROP, EXIT, # Exit if TIB is exhausted
- STATE_CFA, FETCH, ZBRANCH,
28
,
+ STATE_CFA, FETCH, ZBRANCH,
31
,
# Compiling
# Compiling
- DUP, FIND,
ZBRANCH, 17
,
+ DUP, FIND,
QDUP, ZBRANCH, 19
,
# Found word.
# Found word.
+ SWAP, DROP,
DUP, TOCFA, SWAP, INCR, FETCH, LIT, F_IMMED, AND, ZBRANCH, 4,
# Immediate: Execute!
DUP, TOCFA, SWAP, INCR, FETCH, LIT, F_IMMED, AND, ZBRANCH, 4,
# Immediate: Execute!
- EXECUTE, BRANCH, -3
0
,
+ EXECUTE, BRANCH, -3
3
,
# Not immediate: Compile!
# Not immediate: Compile!
- COMMA, BRANCH, -3
3
,
+ COMMA, BRANCH, -3
6
,
# No word found, parse number
# 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!
# Interpreting
DUP, FIND, QDUP, ZBRANCH, 7,
# Found word. Execute!
- SWAP, DROP, TOCFA, EXECUTE, BRANCH, -5
1
,
+ SWAP, DROP, TOCFA, EXECUTE, BRANCH, -5
4
,
# No word found, parse number and leave on stack
# No word found, parse number and leave on stack
- NUMBER, BRANCH, -5
4
,
+ NUMBER, BRANCH, -5
7
,
EXIT]
)
EXIT]
)
@@
-855,15
+876,15
@@
PROMPT = defPrimWord("PROMPT", () -> begin
end)
QUIT = defWord("QUIT",
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])
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)
INCLUDE = defPrimWord("INCLUDE", () -> begin
pushPS(32)
@@
-934,9
+955,6
@@
IMMEDIATE = defPrimWord("IMMEDIATE", () -> begin
return NEXT
end, flags=F_IMMED)
return NEXT
end, flags=F_IMMED)
-TICK = defWord("'",
- [LIT, 32, WORD, FIND, TOCFA, EXIT])
-
#### VM loop ####
#### VM loop ####
@@
-948,7
+966,7
@@
elseif isfile(Pkg.dir("forth/src/lib.4th"))
initFileName = Pkg.dir("forth/src/lib.4th")
end
initFileName = Pkg.dir("forth/src/lib.4th")
end
-function run(;initialize=
fals
e)
+function run(;initialize=
tru
e)
# Begin with STDIN as source
push!(sources, STDIN)
# Begin with STDIN as source
push!(sources, STDIN)
@@
-982,11
+1000,8
@@
function run(;initialize=false)
close(pop!(sources))
end
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
jmp = NEXT
end
end