The Lambda Lab
/
projects
/
forth.jl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
03de266
)
It's alive!
author
Tim Vaughan
<tgvaughan@gmail.com>
Sun, 24 Apr 2016 00:33:10 +0000
(12:33 +1200)
committer
Tim Vaughan
<tgvaughan@gmail.com>
Sun, 24 Apr 2016 00:33:10 +0000
(12:33 +1200)
src/forth.jl
patch
|
blob
|
history
diff --git
a/src/forth.jl
b/src/forth.jl
index
4b625bc
..
5ced825
100644
(file)
--- a/
src/forth.jl
+++ b/
src/forth.jl
@@
-55,9
+55,8
@@
type Reg
PSP::Int64 # Parameter/data stack pointer
IP::Int64 # Instruction pointer
W::Int64 # Working register
PSP::Int64 # Parameter/data stack pointer
IP::Int64 # Instruction pointer
W::Int64 # Working register
- X::Int64 # Extra register
end
end
-reg = Reg(mem[RSP0], mem[PSP0], 0, 0
, 0
)
+reg = Reg(mem[RSP0], mem[PSP0], 0, 0)
# Stack manipulation
# Stack manipulation
@@
-111,6
+110,17
@@
end
# Primitive creation and calling functions
# Primitive creation and calling functions
+function defPrim(f::Function; name="nameless")
+ push!(primitives, f)
+ push!(primNames, name)
+
+ return -length(primitives)
+end
+
+callPrim(addr::Int64) = primitives[-addr]()
+
+# Word creation
+
function createHeader(name::AbstractString, flags::Int64)
mem[mem[HERE]] = mem[LATEST]
mem[LATEST] = mem[HERE]
function createHeader(name::AbstractString, flags::Int64)
mem[mem[HERE]] = mem[LATEST]
mem[LATEST] = mem[HERE]
@@
-120,25
+130,38
@@
function createHeader(name::AbstractString, flags::Int64)
putString(name, mem[HERE]); mem[HERE] += length(name)
end
putString(name, mem[HERE]); mem[HERE] += length(name)
end
-function defPrim(name::AbstractString, f::Function; flags::Int64=0)
+function defPrim
Word
(name::AbstractString, f::Function; flags::Int64=0)
createHeader(name, flags)
codeWordAddr = mem[HERE]
createHeader(name, flags)
codeWordAddr = mem[HERE]
- push!(primitives, f)
- mem[codeWordAddr] = -length(primitives)
+ mem[codeWordAddr] = defPrim(f, name=name)
mem[HERE] += 1
mem[HERE] += 1
- push!(primNames, name)
-
return codeWordAddr
end
return codeWordAddr
end
-callPrim(addr::Int64) = primitives[-addr]()
+function defWord(name::AbstractString, wordAddrs::Array{Int64,1}; flags::Int64=0)
+ createHeader(name, flags)
+
+ addr = mem[HERE]
+ mem[mem[HERE]] = DOCOL
+ mem[HERE] += 1
+
+ for wordAddr in wordAddrs
+ mem[mem[HERE]] = wordAddr
+ mem[HERE] += 1
+ end
+
+ return addr
+end
+
+# Variable creation
function defExistingVar(name::AbstractString, varAddr::Int64; flags::Int64=0)
function defExistingVar(name::AbstractString, varAddr::Int64; flags::Int64=0)
- defPrim(name, eval(:(() -> begin
+
+ defPrimWord(name, eval(:(() -> begin
pushPS($(varAddr))
pushPS($(varAddr))
- return
mem[NEXT]
+ return
NEXT
end)))
end
end)))
end
@@
-147,122
+170,108
@@
function defNewVar(name::AbstractString, initial::Int64; flags::Int64=0)
codeWordAddr = mem[HERE]
varAddr = mem[HERE] + 1
codeWordAddr = mem[HERE]
varAddr = mem[HERE] + 1
- push!(primitives, eval(:(() -> begin
+
+ f = eval(:(() -> begin
pushPS($(varAddr))
pushPS($(varAddr))
- return mem[NEXT]
- end)))
- mem[mem[HERE]] = -length(primitives); mem[HERE] += 1
+ return NEXT
+ end))
+ mem[mem[HERE]] = defPrim(f, name=name); mem[HERE] += 1
mem[mem[HERE]] = initial; mem[HERE] += 1
return varAddr, codeWordAddr
end
function defConst(name::AbstractString, val::Int64; flags::Int64=0)
mem[mem[HERE]] = initial; mem[HERE] += 1
return varAddr, codeWordAddr
end
function defConst(name::AbstractString, val::Int64; flags::Int64=0)
- defPrim(name, eval(:(() -> begin
+ defPrim
Word
(name, eval(:(() -> begin
pushPS($(val))
pushPS($(val))
- return
mem[NEXT]
+ return
NEXT
end)))
return val
end
end)))
return val
end
-function defWord(name::AbstractString, wordAddrs::Array{Int64,1}; flags::Int64=0)
- createHeader(name, flags)
-
- addr = mem[HERE]
- mem[mem[HERE]] = mem[DOCOL]
- mem[HERE] += 1
-
- for wordAddr in wordAddrs
- mem[mem[HERE]] = wordAddr
- mem[HERE] += 1
- end
-
- return addr
-end
-
# Threading Primitives (inner interpreter)
# Threading Primitives (inner interpreter)
-NEXT = defPrim(
"NEXT",
() -> begin
+NEXT = defPrim(() -> begin
reg.W = mem[reg.IP]
reg.IP += 1
return mem[reg.W]
reg.W = mem[reg.IP]
reg.IP += 1
return mem[reg.W]
-end)
+end
, name="NEXT"
)
-DOCOL = defPrim(
"DOCOL",
() -> begin
+DOCOL = defPrim(() -> begin
pushRS(reg.IP)
reg.IP = reg.W + 1
pushRS(reg.IP)
reg.IP = reg.W + 1
- return
mem[NEXT]
-end)
+ return
NEXT
+end
, name="DOCOL"
)
-EXIT = defPrim("EXIT", () -> begin
+EXIT = defPrim
Word
("EXIT", () -> begin
reg.IP = popRS()
reg.IP = popRS()
- return
mem[NEXT]
+ return
NEXT
end)
# Basic forth primitives
end)
# Basic forth primitives
-DROP = defPrim("DROP", () -> begin
+DROP = defPrim
Word
("DROP", () -> begin
popPS()
popPS()
- return
mem[NEXT]
+ return
NEXT
end)
end)
-SWAP = defPrim("SWAP", () -> begin
+SWAP = defPrim
Word
("SWAP", () -> begin
a = popPS()
b = popPS()
pushPS(a)
pushPS(b)
a = popPS()
b = popPS()
pushPS(a)
pushPS(b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-DUP = defPrim("DUP", () -> begin
+DUP = defPrim
Word
("DUP", () -> begin
pushPS(mem[reg.PSP])
pushPS(mem[reg.PSP])
- return
mem[NEXT]
+ return
NEXT
end)
end)
-OVER = defPrim("OVER", () -> begin
+OVER = defPrim
Word
("OVER", () -> begin
ensurePSDepth(2)
pushPS(mem[reg.PSP-1])
ensurePSDepth(2)
pushPS(mem[reg.PSP-1])
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ROT = defPrim("ROT", () -> begin
+ROT = defPrim
Word
("ROT", () -> begin
a = popPS()
b = popPS()
c = popPS()
pushPS(a)
pushPS(c)
pushPS(b)
a = popPS()
b = popPS()
c = popPS()
pushPS(a)
pushPS(c)
pushPS(b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-NROT = defPrim("-ROT", () -> begin
+NROT = defPrim
Word
("-ROT", () -> begin
a = popPS()
b = popPS()
c = popPS()
pushPS(b)
pushPS(a)
pushPS(c)
a = popPS()
b = popPS()
c = popPS()
pushPS(b)
pushPS(a)
pushPS(c)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-TWODROP = defPrim("2DROP", () -> begin
+TWODROP = defPrim
Word
("2DROP", () -> begin
popPS()
popPS()
popPS()
popPS()
- return
mem[NEXT]
+ return
NEXT
end)
end)
-TWODUP = defPrim("2DUP", () -> begin
+TWODUP = defPrim
Word
("2DUP", () -> begin
ensurePSDepth(2)
a = mem[reg.PSP-1]
b = mem[reg.PSP]
pushPS(a)
pushPS(b)
ensurePSDepth(2)
a = mem[reg.PSP-1]
b = mem[reg.PSP]
pushPS(a)
pushPS(b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-TWOSWAP = defPrim("2SWAP", () -> begin
+TWOSWAP = defPrim
Word
("2SWAP", () -> begin
a = popPS()
b = popPS()
c = popPS()
a = popPS()
b = popPS()
c = popPS()
@@
-271,205
+280,205
@@
TWOSWAP = defPrim("2SWAP", () -> begin
pushPS(a)
pushPS(c)
pushPS(d)
pushPS(a)
pushPS(c)
pushPS(d)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-QDUP = defPrim("?DUP", () -> begin
+QDUP = defPrim
Word
("?DUP", () -> begin
ensurePSDepth(1)
val = mem[reg.PSP]
if val != 0
pushPS(val)
end
ensurePSDepth(1)
val = mem[reg.PSP]
if val != 0
pushPS(val)
end
- return
mem[NEXT]
+ return
NEXT
end)
end)
-INCR = defPrim("1+", () -> begin
+INCR = defPrim
Word
("1+", () -> begin
ensurePSDepth(1)
mem[reg.PSP] += 1
ensurePSDepth(1)
mem[reg.PSP] += 1
- return
mem[NEXT]
+ return
NEXT
end)
end)
-DECR = defPrim("1-", () -> begin
+DECR = defPrim
Word
("1-", () -> begin
ensurePSDepth(1)
mem[reg.PSP] -= 1
ensurePSDepth(1)
mem[reg.PSP] -= 1
- return
mem[NEXT]
+ return
NEXT
end)
end)
-INCR2 = defPrim("2+", () -> begin
+INCR2 = defPrim
Word
("2+", () -> begin
ensurePSDepth(1)
mem[reg.PSP] += 2
ensurePSDepth(1)
mem[reg.PSP] += 2
- return
mem[NEXT]
+ return
NEXT
end)
end)
-DECR2 = defPrim("2-", () -> begin
+DECR2 = defPrim
Word
("2-", () -> begin
ensurePSDepth(1)
mem[reg.PSP] -= 2
ensurePSDepth(1)
mem[reg.PSP] -= 2
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ADD = defPrim("+", () -> begin
+ADD = defPrim
Word
("+", () -> begin
b = popPS()
a = popPS()
pushPS(a+b)
b = popPS()
a = popPS()
pushPS(a+b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-SUB = defPrim("-", () -> begin
+SUB = defPrim
Word
("-", () -> begin
b = popPS()
a = popPS()
pushPS(a-b)
b = popPS()
a = popPS()
pushPS(a-b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-MUL = defPrim("*", () -> begin
+MUL = defPrim
Word
("*", () -> begin
b = popPS()
a = popPS()
pushPS(a*b)
b = popPS()
a = popPS()
pushPS(a*b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-DIVMOD = defPrim("/MOD", () -> begin
+DIVMOD = defPrim
Word
("/MOD", () -> begin
b = popPS()
a = popPS()
q,r = divrem(a,b)
pushPS(r)
pushPS(q)
b = popPS()
a = popPS()
q,r = divrem(a,b)
pushPS(r)
pushPS(q)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-EQU = defPrim("=", () -> begin
+EQU = defPrim
Word
("=", () -> begin
b = popPS()
a = popPS()
pushPS(a==b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a==b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-NEQU = defPrim("<>", () -> begin
+NEQU = defPrim
Word
("<>", () -> begin
b = popPS()
a = popPS()
pushPS(a!=b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a!=b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-LT = defPrim("<", () -> begin
+LT = defPrim
Word
("<", () -> begin
b = popPS()
a = popPS()
pushPS(a<b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a<b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-GT = defPrim(">", () -> begin
+GT = defPrim
Word
(">", () -> begin
b = popPS()
a = popPS()
pushPS(a>b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a>b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-LE = defPrim("<=", () -> begin
+LE = defPrim
Word
("<=", () -> begin
b = popPS()
a = popPS()
pushPS(a<=b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a<=b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-GE = defPrim(">=", () -> begin
+GE = defPrim
Word
(">=", () -> begin
b = popPS()
a = popPS()
pushPS(a>=b ? -1 : 0)
b = popPS()
a = popPS()
pushPS(a>=b ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZEQU = defPrim("0=", () -> begin
+ZEQU = defPrim
Word
("0=", () -> begin
pushPS(popPS() == 0 ? -1 : 0)
pushPS(popPS() == 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZNEQU = defPrim("0<>", () -> begin
+ZNEQU = defPrim
Word
("0<>", () -> begin
pushPS(popPS() != 0 ? -1 : 0)
pushPS(popPS() != 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZLT = defPrim("0<", () -> begin
+ZLT = defPrim
Word
("0<", () -> begin
pushPS(popPS() < 0 ? -1 : 0)
pushPS(popPS() < 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZGT = defPrim("0>", () -> begin
+ZGT = defPrim
Word
("0>", () -> begin
pushPS(popPS() > 0 ? -1 : 0)
pushPS(popPS() > 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZLE = defPrim("0<=", () -> begin
+ZLE = defPrim
Word
("0<=", () -> begin
pushPS(popPS() <= 0 ? -1 : 0)
pushPS(popPS() <= 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZGE = defPrim("0>=", () -> begin
+ZGE = defPrim
Word
("0>=", () -> begin
pushPS(popPS() >= 0 ? -1 : 0)
pushPS(popPS() >= 0 ? -1 : 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-AND = defPrim("AND", () -> begin
+AND = defPrim
Word
("AND", () -> begin
b = popPS()
a = popPS()
pushPS(a & b)
b = popPS()
a = popPS()
pushPS(a & b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-OR = defPrim("OR", () -> begin
+OR = defPrim
Word
("OR", () -> begin
b = popPS()
a = popPS()
pushPS(a | b)
b = popPS()
a = popPS()
pushPS(a | b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-XOR = defPrim("XOR", () -> begin
+XOR = defPrim
Word
("XOR", () -> begin
b = popPS()
a = popPS()
pushPS(a $ b)
b = popPS()
a = popPS()
pushPS(a $ b)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-INVERT = defPrim("INVERT", () -> begin
+INVERT = defPrim
Word
("INVERT", () -> begin
pushPS(~popPS())
pushPS(~popPS())
- return
mem[NEXT]
+ return
NEXT
end)
# Literals
end)
# Literals
-LIT = defPrim("LIT", () -> begin
+LIT = defPrim
Word
("LIT", () -> begin
pushPS(mem[reg.IP])
reg.IP += 1
pushPS(mem[reg.IP])
reg.IP += 1
- return
mem[NEXT]
+ return
NEXT
end)
# Memory primitives
end)
# Memory primitives
-STORE = defPrim("!", () -> begin
+STORE = defPrim
Word
("!", () -> begin
addr = popPS()
dat = popPS()
mem[addr] = dat
addr = popPS()
dat = popPS()
mem[addr] = dat
- return
mem[NEXT]
+ return
NEXT
end)
end)
-FETCH = defPrim("@", () -> begin
+FETCH = defPrim
Word
("@", () -> begin
addr = popPS()
pushPS(mem[addr])
addr = popPS()
pushPS(mem[addr])
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ADDSTORE = defPrim("+!", () -> begin
+ADDSTORE = defPrim
Word
("+!", () -> begin
addr = popPS()
toAdd = popPS()
mem[addr] += toAdd
addr = popPS()
toAdd = popPS()
mem[addr] += toAdd
- return
mem[NEXT]
+ return
NEXT
end)
end)
-SUBSTORE = defPrim("-!", () -> begin
+SUBSTORE = defPrim
Word
("-!", () -> begin
addr = popPS()
toSub = popPS()
mem[addr] -= toSub
addr = popPS()
toSub = popPS()
mem[addr] -= toSub
- return
mem[NEXT]
+ return
NEXT
end)
end)
@@
-493,41
+502,53
@@
F_LENMASK = defConst("F_LENMASK", 127)
# Return Stack
# Return Stack
-TOR = defPrim(">R", () -> begin
+TOR = defPrim
Word
(">R", () -> begin
pushRS(popPS())
pushRS(popPS())
- return
mem[NEXT]
+ return
NEXT
end)
end)
-FROMR = defPrim("R>", () -> begin
+FROMR = defPrim
Word
("R>", () -> begin
pushPS(popRS())
pushPS(popRS())
- return
mem[NEXT]
+ return
NEXT
end)
end)
-RSPFETCH = defPrim("RSP@", () -> begin
+RSPFETCH = defPrim
Word
("RSP@", () -> begin
pushPS(reg.RSP)
pushPS(reg.RSP)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-RSPSTORE = defPrim("RSP!", () -> begin
+RSPSTORE = defPrim
Word
("RSP!", () -> begin
RSP = popPS()
RSP = popPS()
- return
mem[NEXT]
+ return
NEXT
end)
end)
-RDROP = defPrim("RDROP", () -> begin
+RDROP = defPrim
Word
("RDROP", () -> begin
popRS()
popRS()
- return
mem[NEXT]
+ return
NEXT
end)
# Parameter Stack
end)
# Parameter Stack
-PSPFETCH = defPrim("PSP@", () -> begin
+PSPFETCH = defPrim
Word
("PSP@", () -> begin
pushPS(reg.PSP)
pushPS(reg.PSP)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-PSPSTORE = defPrim("PSP!", () -> begin
+PSPSTORE = defPrim
Word
("PSP!", () -> begin
PSP = popPS()
PSP = popPS()
- return mem[NEXT]
+ return NEXT
+end)
+
+# Working Register
+
+WFETCH = defPrimWord("W@", () -> begin
+ pushPS(reg.W)
+ return NEXT
+end)
+
+WSTORE = defPrimWord("W!", () -> begin
+ reg.W = popPS()
+ return NEXT
end)
# I/O
end)
# I/O
@@
-536,7
+557,7
@@
defConst("TIB", TIB)
NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
TOIN, TOIN_CFA = defNewVar(">IN", 0)
NUMTIB, NUMTIB_CFA = defNewVar("#TIB", 0)
TOIN, TOIN_CFA = defNewVar(">IN", 0)
-KEY = defPrim("KEY", () -> begin
+KEY = defPrim
Word
("KEY", () -> begin
if mem[TOIN] >= mem[NUMTIB]
mem[TOIN] = 0
line = readline()
if mem[TOIN] >= mem[NUMTIB]
mem[TOIN] = 0
line = readline()
@@
-547,15
+568,15
@@
KEY = defPrim("KEY", () -> begin
pushPS(mem[TIB + mem[TOIN]])
mem[TOIN] += 1
pushPS(mem[TIB + mem[TOIN]])
mem[TOIN] += 1
- return
mem[NEXT]
+ return
NEXT
end)
end)
-EMIT = defPrim("EMIT", () -> begin
+EMIT = defPrim
Word
("EMIT", () -> begin
print(Char(popPS()))
print(Char(popPS()))
- return
mem[NEXT]
+ return
NEXT
end)
end)
-WORD = defPrim("WORD", () -> begin
+WORD = defPrim
Word
("WORD", () -> begin
c = -1
c = -1
@@
-593,7
+614,7
@@
WORD = defPrim("WORD", () -> begin
mem[wordAddr + offset] = Int64(c)
pushPS(wordAddr)
pushPS(1)
mem[wordAddr + offset] = Int64(c)
pushPS(wordAddr)
pushPS(1)
- return
mem[NEXT]
+ return
NEXT
end
while true
end
while true
@@
-615,10
+636,10
@@
WORD = defPrim("WORD", () -> begin
pushPS(wordAddr)
pushPS(wordLen)
pushPS(wordAddr)
pushPS(wordLen)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-NUMBER = defPrim("NUMBER", () -> begin
+NUMBER = defPrim
Word
("NUMBER", () -> begin
wordLen = popPS()
wordAddr = popPS()
wordLen = popPS()
wordAddr = popPS()
@@
-632,12
+653,12
@@
NUMBER = defPrim("NUMBER", () -> begin
pushPS(1) # Error indication
end
pushPS(1) # Error indication
end
- return
mem[NEXT]
+ return
NEXT
end)
# Dictionary searches
end)
# Dictionary searches
-FIND = defPrim("FIND", () -> begin
+FIND = defPrim
Word
("FIND", () -> begin
wordLen = popPS()
wordAddr = popPS()
wordLen = popPS()
wordAddr = popPS()
@@
-665,10
+686,10
@@
FIND = defPrim("FIND", () -> begin
pushPS(latest)
pushPS(latest)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-TOCFA = defPrim(">CFA", () -> begin
+TOCFA = defPrim
Word
(">CFA", () -> begin
addr = popPS()
lenAndFlags = mem[addr+1]
addr = popPS()
lenAndFlags = mem[addr+1]
@@
-676,14
+697,14
@@
TOCFA = defPrim(">CFA", () -> begin
pushPS(addr + 2 + len)
pushPS(addr + 2 + len)
- return
mem[NEXT]
+ return
NEXT
end)
TODFA = defWord(">DFA", [TOCFA, INCR, EXIT])
# Compilation
end)
TODFA = defWord(">DFA", [TOCFA, INCR, EXIT])
# Compilation
-CREATE = defPrim("CREATE", () -> begin
+CREATE = defPrim
Word
("CREATE", () -> begin
wordLen = popPS()
wordAddr = popPS()
wordLen = popPS()
wordAddr = popPS()
@@
-691,30
+712,30
@@
CREATE = defPrim("CREATE", () -> begin
createHeader(word, 0)
createHeader(word, 0)
- return
mem[NEXT]
+ return
NEXT
end)
end)
-COMMA = defPrim(",", () -> begin
+COMMA = defPrim
Word
(",", () -> begin
mem[mem[HERE]] = popPS()
mem[HERE] += 1
mem[mem[HERE]] = popPS()
mem[HERE] += 1
- return
mem[NEXT]
+ return
NEXT
end)
end)
-LBRAC = defPrim("[", () -> begin
+LBRAC = defPrim
Word
("[", () -> begin
mem[STATE] = 0
mem[STATE] = 0
- return
mem[NEXT]
+ return
NEXT
end, flags=F_IMMED)
end, flags=F_IMMED)
-RBRAC = defPrim("]", () -> begin
+RBRAC = defPrim
Word
("]", () -> begin
mem[STATE] = 1
mem[STATE] = 1
- return
mem[NEXT]
+ return
NEXT
end, flags=F_IMMED)
end, flags=F_IMMED)
-HIDDEN = defPrim("HIDDEN", () -> begin
+HIDDEN = defPrim
Word
("HIDDEN", () -> begin
addr = popPS() + 1
mem[addr] = mem[addr] $ F_HIDDEN
addr = popPS() + 1
mem[addr] = mem[addr] $ F_HIDDEN
- return
mem[NEXT]
+ return
NEXT
end)
HIDE = defWord("HIDE",
end)
HIDE = defWord("HIDE",
@@
-727,76
+748,80
@@
COLON = defWord(":",
[WORD,
CREATE,
LIT, DOCOL, COMMA,
[WORD,
CREATE,
LIT, DOCOL, COMMA,
- LATEST, FETCH, HIDDEN,
+ LATEST
_CFA
, FETCH, HIDDEN,
RBRAC,
EXIT])
SEMICOLON = defWord(";",
[LIT, EXIT, COMMA,
RBRAC,
EXIT])
SEMICOLON = defWord(";",
[LIT, EXIT, COMMA,
- LATEST, FETCH, HIDDEN,
+ LATEST
_CFA
, FETCH, HIDDEN,
LBRAC,
EXIT], flags=F_IMMED)
LBRAC,
EXIT], flags=F_IMMED)
-IMMEDIATE = defPrim("IMMEDIATE", () -> begin
+IMMEDIATE = defPrim
Word
("IMMEDIATE", () -> begin
lenAndFlagsAddr = mem[LATEST] + 1
mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
lenAndFlagsAddr = mem[LATEST] + 1
mem[lenAndFlagsAddr] = mem[lenAndFlagsAddr] $ F_IMMED
- return
mem[NEXT]
+ return
NEXT
end, flags=F_IMMED)
TICK = defWord("'", [WORD, FIND, TOCFA, EXIT])
# Branching
end, flags=F_IMMED)
TICK = defWord("'", [WORD, FIND, TOCFA, EXIT])
# Branching
-BRANCH = defPrim("BRANCH", () -> begin
+BRANCH = defPrim
Word
("BRANCH", () -> begin
reg.IP += mem[reg.IP]
reg.IP += mem[reg.IP]
- return
mem[NEXT]
+ return
NEXT
end)
end)
-ZBRANCH = defPrim("0BRANCH", () -> begin
+ZBRANCH = defPrim
Word
("0BRANCH", () -> begin
if (popPS() == 0)
reg.IP += mem[reg.IP]
else
reg.IP += 1
end
if (popPS() == 0)
reg.IP += mem[reg.IP]
else
reg.IP += 1
end
- return
mem[NEXT]
+ return
NEXT
end)
# Strings
end)
# Strings
-LITSTRING = defPrim("LITSTRING", () -> begin
+LITSTRING = defPrim
Word
("LITSTRING", () -> begin
len = mem[reg.IP]
reg.IP += 1
pushPS(reg.IP)
pushPS(len)
reg.IP += len
len = mem[reg.IP]
reg.IP += 1
pushPS(reg.IP)
pushPS(len)
reg.IP += len
- return
mem[NEXT]
+ return
NEXT
end)
end)
-TELL = defPrim("TELL", () -> begin
+TELL = defPrim
Word
("TELL", () -> begin
len = popPS()
addr = popPS()
str = getString(addr, len)
print(str)
len = popPS()
addr = popPS()
str = getString(addr, len)
print(str)
- return
mem[NEXT]
+ return
NEXT
end)
# Outer interpreter
end)
# Outer interpreter
-INTERPRET = defPrim("INTERPRET", () -> begin
+EXECUTE = defPrimWord("EXECUTE", () -> begin
+ reg.W = popPS()
+ return mem[reg.W]
+end)
+
+INTERPRET = defPrimWord("INTERPRET", () -> begin
callPrim(mem[WORD])
wordName = getString(mem[reg.PSP-1], mem[reg.PSP])
callPrim(mem[WORD])
wordName = getString(mem[reg.PSP-1], mem[reg.PSP])
- println("... ", replace(wordName, "\n", "\\n"), " ...")
+
#
println("... ", replace(wordName, "\n", "\\n"), " ...")
callPrim(mem[TWODUP])
callPrim(mem[FIND])
wordAddr = mem[reg.PSP]
callPrim(mem[TWODUP])
callPrim(mem[FIND])
wordAddr = mem[reg.PSP]
-
if wordAddr>0
# Word in dictionary
if wordAddr>0
# Word in dictionary
@@
-809,7
+834,8
@@
INTERPRET = defPrim("INTERPRET", () -> begin
if mem[STATE] == 0 || isImmediate
# Execute!
if mem[STATE] == 0 || isImmediate
# Execute!
- return mem[popPS()]
+ #println("Executing CFA at $(mem[reg.PSP])")
+ return callPrim(mem[EXECUTE])
else
# Append CFA to dictionary
callPrim(mem[COMMA])
else
# Append CFA to dictionary
callPrim(mem[COMMA])
@@
-823,8
+849,7
@@
INTERPRET = defPrim("INTERPRET", () -> begin
if popPS() != 0
println("Parse error at word: '$wordName'")
if popPS() != 0
println("Parse error at word: '$wordName'")
- return mem[NEXT]
- else
+ return NEXT
end
if mem[STATE] == 0
end
if mem[STATE] == 0
@@
-837,7
+862,7
@@
INTERPRET = defPrim("INTERPRET", () -> begin
end
end
end
end
- return
mem[NEXT]
+ return
NEXT
end)
QUIT = defWord("QUIT",
end)
QUIT = defWord("QUIT",
@@
-845,30
+870,26
@@
QUIT = defWord("QUIT",
INTERPRET,
BRANCH,-2])
INTERPRET,
BRANCH,-2])
-NL = defPrim("\n", () -> begin
+NL = defPrim
Word
("\n", () -> begin
if mem[STATE] == 0
println(" ok")
end
if mem[STATE] == 0
println(" ok")
end
- return
mem[NEXT]
-end)
+ return
NEXT
+end
, flags=F_IMMED
)
# Odds and Ends
# Odds and Ends
-CHAR = defPrim("CHAR", () -> begin
+CHAR = defPrim
Word
("CHAR", () -> begin
callPrim(mem[WORD])
wordLen = popPS()
wordAddr = popPS()
word = getString(wordAddr, wordLen)
pushPS(Int64(word[1]))
callPrim(mem[WORD])
wordLen = popPS()
wordAddr = popPS()
word = getString(wordAddr, wordLen)
pushPS(Int64(word[1]))
- return mem[NEXT]
-end)
-
-EXECUTE = defPrim("EXECUTE", () -> begin
- return mem[popPS()]
+ return NEXT
end)
end)
-BYE = defPrim("BYE", () -> begin
+BYE = defPrim
Word
("BYE", () -> begin
return 0
end)
return 0
end)
@@
-879,9
+900,9
@@
function runVM()
# Primitive processing loop.
# Everyting else is simply a consequence of this loop!
# Primitive processing loop.
# Everyting else is simply a consequence of this loop!
- jmp =
mem[NEXT]
+ jmp =
NEXT
while (jmp = callPrim(jmp)) != 0
while (jmp = callPrim(jmp)) != 0
- println("Evaluating prim $jmp [$(primNames[-jmp])]")
+
#
println("Evaluating prim $jmp [$(primNames[-jmp])]")
end
end
end
end