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
Pinning down insidious bug in interpreter.
[forth.jl.git]
/
src
/
forth.jl
diff --git
a/src/forth.jl
b/src/forth.jl
index
0803b72
..
766bd4e
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-121,7
+121,13
@@
function defPrim(f::Function; name="nameless")
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
@@
-721,9
+727,9
@@
end)
# Outer interpreter
TRACE = defPrimWord("TRACE", () -> begin
# Outer interpreter
TRACE = defPrimWord("TRACE", () -> begin
- println("Val: $(popPS())")
- print("RS: "); printRS()
+ println("reg.W: $(reg.W) reg.IP: $(reg.IP)")
print("PS: "); printPS()
print("PS: "); printPS()
+ print("RS: "); printRS()
print("[paused]")
readline()
print("[paused]")
readline()
@@
-936,9
+942,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 ####
@@
-950,7
+953,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)
@@
-984,6
+987,11
@@
function run(;initialize=false)
close(pop!(sources))
end
close(pop!(sources))
end
+ # Want backtrace in here eventually
+ println("reg.W: $(reg.W) reg.IP: $(reg.IP)")
+ print("PS: "); printPS()
+ print("RS: "); printRS()
+
mem[STATE] = 0
mem[NUMTIB] = 0
reg.PSP = mem[PSP0]
mem[STATE] = 0
mem[NUMTIB] = 0
reg.PSP = mem[PSP0]