mem[LATEST] = mem[HERE]
mem[HERE] += 1
- mem[mem[HERE]] = length(name) + flags; mem[HERE] += 1
+ mem[mem[HERE]] = length(name) | flags; mem[HERE] += 1
mem[mem[HERE]:(mem[HERE]+length(name)-1)] = [Int(c) for c in name]; mem[HERE] += length(name)
end
function defPrim(name::AbstractString, f::Function; flags::Int64=0)
createHeader(name, flags)
+ codeWordAddr = mem[HERE]
push!(primitives, f)
- mem[mem[HERE]] = -length(primitives)
+ mem[codeWordAddr] = -length(primitives)
mem[HERE] += 1
- return -length(primitives)
+ return codeWordAddr
end
callPrim(addr::Int64) = primitives[-addr]()
function defExistingVar(name::AbstractString, varAddr::Int64; flags::Int64=0)
defPrim(name, eval(:(() -> begin
pushPS($(varAddr))
- return NEXT
+ return mem[NEXT]
end)))
end
varAddr = mem[HERE] + 1
push!(primitives, eval(:(() -> begin
pushPS($(varAddr))
- return NEXT
+ return mem[NEXT]
end)))
mem[mem[HERE]] = -length(primitives); mem[HERE] += 1
function defConst(name::AbstractString, val::Int64; flags::Int64=0)
defPrim(name, eval(:(() -> begin
pushPS($(val))
- return NEXT
+ return mem[NEXT]
end)))
return val
end
-# Threading Primitives
+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)
NEXT = defPrim("NEXT", () -> begin
reg.W = mem[reg.IP]
reg.IP += 1
- X = mem[reg.W]
- return X
+ return mem[reg.W]
end)
DOCOL = defPrim("DOCOL", () -> begin
pushRS(reg.IP)
reg.IP = reg.W + 1
- return NEXT
+ return mem[NEXT]
end)
EXIT = defPrim("EXIT", () -> begin
reg.IP = popRS()
- return NEXT
+ return mem[NEXT]
end)
-
# Basic forth primitives
DROP = defPrim("DROP", () -> begin
popPS()
- return NEXT
+ return mem[NEXT]
end)
SWAP = defPrim("SWAP", () -> begin
b = popPS()
pushPS(a)
pushPS(b)
- return NEXT
+ return mem[NEXT]
end)
DUP = defPrim("DUP", () -> begin
pushPS(mem[reg.PSP])
- return NEXT
+ return mem[NEXT]
end)
OVER = defPrim("OVER", () -> begin
ensurePSDepth(2)
pushPS(mem[reg.PSP-1])
- return NEXT
+ return mem[NEXT]
end)
ROT = defPrim("ROT", () -> begin
pushPS(a)
pushPS(c)
pushPS(b)
- return NEXT
+ return mem[NEXT]
end)
NROT = defPrim("-ROT", () -> begin
pushPS(b)
pushPS(a)
pushPS(c)
- return NEXT
+ return mem[NEXT]
end)
TWODROP = defPrim("2DROP", () -> begin
popPS()
popPS()
- return NEXT
+ return mem[NEXT]
end)
TWODUP = defPrim("2DUP", () -> begin
b = mem[reg.PSP]
pushPS(a)
pushPS(b)
- return NEXT
+ return mem[NEXT]
end)
TWOSWAP = defPrim("2SWAP", () -> begin
pushPS(a)
pushPS(c)
pushPS(d)
- return NEXT
+ return mem[NEXT]
end)
QDUP = defPrim("?DUP", () -> begin
if val != 0
pushPS(val)
end
- return NEXT
+ return mem[NEXT]
+end)
+
+INCR = defPrim("1+", () -> begin
+ ensurePSDepth(1)
+ mem[reg.PSP] += 1
+ return mem[NEXT]
+end)
+
+DECR = defPrim("1-", () -> begin
+ ensurePSDepth(1)
+ mem[reg.PSP] -= 1
+ return mem[NEXT]
+end)
+
+INCR2 = defPrim("2+", () -> begin
+ ensurePSDepth(1)
+ mem[reg.PSP] += 2
+ return mem[NEXT]
+end)
+
+DECR2 = defPrim("2-", () -> begin
+ ensurePSDepth(1)
+ mem[reg.PSP] -= 2
+ return mem[NEXT]
+end)
+
+ADD = defPrim("+", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a+b)
+ return mem[NEXT]
+end)
+
+SUB = defPrim("-", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a-b)
+ return mem[NEXT]
+end)
+
+MUL = defPrim("*", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a*b)
+ return mem[NEXT]
+end)
+
+DIVMOD = defPrim("/MOD", () -> begin
+ b = popPS()
+ a = popPS()
+ q,r = divrem(a,b)
+ pushPS(r)
+ pushPS(q)
+ return mem[NEXT]
+end)
+
+EQU = defPrim("=", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a==b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+NEQU = defPrim("<>", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a!=b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+LT = defPrim("<", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a<b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+GT = defPrim(">", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a>b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+LE = defPrim("<=", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a<=b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+GE = defPrim(">=", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a>=b ? -1 : 0)
+ return mem[NEXT]
+end)
+
+ZEQU = defPrim("0=", () -> begin
+ pushPS(popPS() == 0 ? -1 : 0)
+ return mem[NEXT]
end)
+ZNEQU = defPrim("0<>", () -> begin
+ pushPS(popPS() != 0 ? -1 : 0)
+ return mem[NEXT]
+end)
+
+ZLT = defPrim("0<", () -> begin
+ pushPS(popPS() < 0 ? -1 : 0)
+ return mem[NEXT]
+end)
+
+ZGT = defPrim("0>", () -> begin
+ pushPS(popPS() > 0 ? -1 : 0)
+ return mem[NEXT]
+end)
+
+ZLE = defPrim("0<=", () -> begin
+ pushPS(popPS() <= 0 ? -1 : 0)
+ return mem[NEXT]
+end)
+
+ZGE = defPrim("0>=", () -> begin
+ pushPS(popPS() >= 0 ? -1 : 0)
+ return mem[NEXT]
+end)
+
+AND = defPrim("AND", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a & b)
+ return mem[NEXT]
+end)
+
+OR = defPrim("OR", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a | b)
+ return mem[NEXT]
+end)
+
+XOR = defPrim("XOR", () -> begin
+ b = popPS()
+ a = popPS()
+ pushPS(a $ b)
+ return mem[NEXT]
+end)
+
+INVERT = defPrim("INVERT", () -> begin
+ pushPS(~popPS())
+ return mem[NEXT]
+end)
+
+# Literals
+
LIT = defPrim("LIT", () -> begin
pushPS(mem[reg.IP])
reg.IP += 1
- return NEXT
+ return mem[NEXT]
end)
# Memory primitives
addr = popPS()
dat = popPS()
mem[addr] = dat
- return NEXT
+ return mem[NEXT]
end)
FETCH = defPrim("@", () -> begin
addr = popPS()
pushPS(mem[addr])
- return NEXT
+ return mem[NEXT]
end)
ADDSTORE = defPrim("+!", () -> begin
addr = popPS()
toAdd = popPS()
mem[addr] += toAdd
- return NEXT
+ return mem[NEXT]
end)
SUBSTORE = defPrim("-!", () -> begin
addr = popPS()
toSub = popPS()
mem[addr] -= toSub
- return NEXT
+ return mem[NEXT]
end)
defConst("VERSION", 1)
defConst("DOCOL", DOCOL)
defConst("DICT", DICT)
-F_IMMED = defConst("F_IMMED", 100)
-F_HIDEN = defConst("F_HIDDEN", 1000)
+F_IMMED = defConst("F_IMMED", 128)
+F_HIDDEN = defConst("F_HIDDEN", 256)
+F_LENMASK = defConst("F_LENMASK", 127)
# Return Stack
TOR = defPrim(">R", () -> begin
pushRS(popPS())
- return NEXT
+ return mem[NEXT]
end)
FROMR = defPrim("R>", () -> begin
pushPS(popRS())
- return NEXT
+ return mem[NEXT]
end)
RSPFETCH = defPrim("RSP@", () -> begin
pushPS(reg.RSP)
- return NEXT
+ return mem[NEXT]
end)
RSPSTORE = defPrim("RSP!", () -> begin
RSP = popPS()
- return NEXT
+ return mem[NEXT]
end)
RDROP = defPrim("RDROP", () -> begin
popRS()
- return NEXT
+ return mem[NEXT]
end)
# Parameter Stack
PSPFETCH = defPrim("PSP@", () -> begin
pushPS(reg.PSP)
- return NEXT
+ return mem[NEXT]
end)
PSPSTORE = defPrim("PSP!", () -> begin
PSP = popPS()
- return NEXT
+ return mem[NEXT]
end)
# I/O
pushPS(mem[TIB + mem[TOIN]])
mem[TOIN] += 1
- return NEXT
+ return mem[NEXT]
end)
EMIT = defPrim("EMIT", () -> begin
print(Char(popPS()))
- return NEXT
+ return mem[NEXT]
end)
WORD = defPrim("WORD", () -> begin
skip_to_end = false
while true
- callPrim(KEY)
+ callPrim(mem[KEY])
c = Char(popPS())
if c == '\\'
mem[wordAddr + offset] = Int64(c)
offset += 1
- callPrim(KEY)
+ callPrim(mem[KEY])
c = Char(popPS())
if c == ' ' || c == '\t' || c == '\n'
pushPS(wordAddr)
pushPS(wordLen)
- return NEXT
+ return mem[NEXT]
end)
NUMBER = defPrim("NUMBER", () -> begin
pushPS(1) # Error indication
end
- return NEXT
+ return mem[NEXT]
+end)
+
+# Dictionary searches
+
+FIND = defPrim("FIND", () -> begin
+
+ wordLen = popPS()
+ wordAddr = popPS()
+ word = ASCIIString([Char(c) for c in mem[wordAddr:(wordAddr+wordLen-1)]])
+
+ latest = mem[LATEST]
+
+ while latest>0
+ lenAndFlags = mem[latest+1]
+ len = lenAndFlags & F_LENMASK
+ hidden = (lenAndFlags & F_HIDDEN) == F_HIDDEN
+
+ if hidden || len != wordLen
+ latest = mem[latest]
+ continue
+ end
+
+ thisAddr = latest+2
+ thisWord = ASCIIString([Char(c) for c in mem[thisAddr:(thisAddr+len-1)]])
+
+ if thisWord == word
+ break
+ end
+ end
+
+ pushPS(latest)
+
+ return mem[NEXT]
end)
+TOCFA = defPrim(">CFA", () -> begin
+
+ addr = popPS()
+ lenAndFlags = mem[addr+1]
+ len = lenAndFlags & F_LENMASK
+
+ pushPS(addr + 2 + len)
+
+ return mem[NEXT]
+end)
+
+TODFA = defWord(">DFA", [TOCFA, INCR, EXIT])
+
+# Compilation
+
+CREATE = defPrim("CREATE", () -> begin
+
+ wordLen = popPS()
+ wordAddr = popPS()
+ word = ASCIIString([Char(c) for c in mem[wordAddr:(wordAddr+wordLen-1)]])
+
+ mem[mem[HERE]] = mem[LATEST]; mem[HERE] += 1
+ mem[LATEST] = mem[HERE]
+ mem[mem[HERE]] = wordLen; mem[HERE] += 1
+
+ mem[mem[HERE]:(mem[HERE]+wordLen-1)] = collect(Int64, word)
+ mem[HERE] += wordLen
+
+ return mem[NEXT]
+end)
+
+COMMA = defPrim(",", () -> begin
+ mem[mem[HERE]] = popPS()
+ mem[HERE] += 1
+
+ return mem[NEXT]
+end)
+
+LBRAC = defPrim("[", () -> begin
+ mem[STATE] = 0
+ return mem[NEXT]
+end, flags=F_IMMEDIATE)
+
+RBRAC = defPrim("]", () -> begin
+ mem[STATE] = 1
+ return mem[NEXT]
+end, flags=F_IMMEDIATE)
+
+HIDDEN = defPrim("HIDDEN", () -> begin
+ addr = popPS() + 1
+ mem[addr] = mem[addr] $ F_HIDDEN
+ reurn mem[NEXT]
+end)
+
+COLON = defWord(":",
+ [WORD,
+ CREATE,
+ LIT, DOCOL, COMMA,
+ LATEST, FETCH, HIDDEN,
+ RBRAC,
+ EXIT])
+
+SEMICOLON = defWord(";",
+ [LIT, EXIT, COMMA,
+ LATEST, FETCH, HIDDEN,
+ LBRAC,
+ EXIT], flags=F_IMMEDIATE)
+
#### VM loop ####
-#function runVM(reg::Reg)
-# jmp = NEXT
-# while (jmp = callPrim(reg, jmp)) != 0 end
-#end
+function runVM()
+ jmp = NEXT
+ while (jmp = callPrim(jmp)) != 0 end
+end
# Debugging tools
-function coredump(startAddr::Int64; count::Int64 = 16, cellsPerLine::Int64 = 8)
+function dump(startAddr::Int64; count::Int64 = 100, cellsPerLine::Int64 = 10)
chars = Array{Char,1}(cellsPerLine)
for i in 0:(count-1)
end
end
+function printRS()
+ count = reg.RSP - mem[RSP0]
+
+ if count > 0
+ print("<$count>")
+ for i in (mem[RSP0]+1):reg.RSP
+ print(" $(mem[i])")
+ end
+ println()
+ else
+ println("Return stack empty")
+ end
+end
+
end
The Lambda Lab / projects / forth.jl.git / blobdiff