From a4a274445e7ddaa07b595814dfeb9f6ddb0ce95a Mon Sep 17 00:00:00 2001 From: Tim Vaughan Date: Sun, 17 Apr 2016 23:16:59 +1200 Subject: [PATCH] Added KEY, EMIT, WORD --- src/forth.jl | 215 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 180 insertions(+), 35 deletions(-) diff --git a/src/forth.jl b/src/forth.jl index 7cf0ca7..a115e48 100644 --- a/src/forth.jl +++ b/src/forth.jl @@ -4,10 +4,9 @@ module forth size_mem = 640*1024 # Buffer sizes -size_BIVar = 16 # size_RS = 1024 # Return stack size size_PS = 1024 # Parameter stack size -size_TIB = 4096 # Terminal input buffer size +size_TIB = 1096 # Terminal input buffer size # The mem array constitutes the memory of the VM. It has the following geography: # @@ -41,12 +40,14 @@ PSP0 = nextVarAddr; nextVarAddr += 1 HERE = nextVarAddr; nextVarAddr += 1 LATEST = nextVarAddr; nextVarAddr += 1 -mem[RSP0] = size_BIVar # bottom of RS +mem[RSP0] = nextVarAddr # bottom of RS mem[PSP0] = mem[RSP0] + size_RS # bottom of PS TIB = mem[PSP0] + size_PS # address of terminal input buffer mem[HERE] = TIB + size_TIB # location of bottom of dictionary mem[LATEST] = 0 # no previous definition +DICT = mem[HERE] # Save bottom of dictionary as constant + # VM registers type Reg RSP::Int64 # Return stack pointer @@ -57,13 +58,32 @@ type Reg end reg = Reg(mem[RSP0], mem[PSP0], 0, 0, 0) -# Stack manipulation functions +# Stack manipulation + +type StackUnderflow <: Exception end + +getRSDepth() = reg.RSP - mem[RSP0] +getPSDepth() = reg.PSP - mem[PSP0] + +function ensurePSDepth(depth::Int64) + if getPSDepth() begin - pushPS($(val)) - return NEXT - end))) -end - function defNewVar(name::AbstractString, initial::Int64; flags::Int64=0) createHeader(name, flags) @@ -131,6 +146,15 @@ function defNewVar(name::AbstractString, initial::Int64; flags::Int64=0) return varAddr end +function defConst(name::AbstractString, val::Int64; flags::Int64=0) + defPrim(name, eval(:(() -> begin + pushPS($(val)) + return NEXT + end))) + + return val +end + # Threading Primitives NEXT = defPrim("NEXT", () -> begin @@ -160,7 +184,10 @@ DROP = defPrim("DROP", () -> begin end) SWAP = defPrim("SWAP", () -> begin - mem[reg.PSP], mem[reg.PSP-1] = mem[reg.PSP-1], mem[reg.PSP] + a = popPS() + b = popPS() + pushPS(a) + pushPS(b) return NEXT end) @@ -169,6 +196,68 @@ DUP = defPrim("DUP", () -> begin return NEXT end) +OVER = defPrim("OVER", () -> begin + ensurePSDepth(2) + pushPS(mem[reg.PSP-1]) + return NEXT +end) + +ROT = defPrim("ROT", () -> begin + a = popPS() + b = popPS() + c = popPS() + pushPS(a) + pushPS(c) + pushPS(b) + return NEXT +end) + +NROT = defPrim("-ROT", () -> begin + a = popPS() + b = popPS() + c = popPS() + pushPS(b) + pushPS(a) + pushPS(c) + return NEXT +end) + +TWODROP = defPrim("2DROP", () -> begin + popPS() + popPS() + return NEXT +end) + +TWODUP = defPrim("2DUP", () -> begin + ensurePSDepth(2) + a = mem[reg.PSP-1] + b = mem[reg.PSP] + pushPS(a) + pushPS(b) + return NEXT +end) + +TWOSWAP = defPrim("2SWAP", () -> begin + a = popPS() + b = popPS() + c = popPS() + d = popPS() + pushPS(b) + pushPS(a) + pushPS(c) + pushPS(d) + return NEXT +end) + +QDUP = defPrim("?DUP", () -> begin + ensurePSDepth(1) + val = mem[reg.PSP] + if val != 0 + pushPS(val) + end + return NEXT +end) + LIT = defPrim("LIT", () -> begin pushPS(mem[reg.IP]) reg.IP += 1 @@ -211,13 +300,16 @@ defExistingVar("HERE", HERE) defExistingVar("LATEST", LATEST) defExistingVar("PSP0", PSP0) defExistingVar("RSP0", RSP0) -defNewVar("STATE", 0) -defNewVar("BASE", 10) +STATE = defNewVar("STATE", 0) +BASE = defNewVar("BASE", 10) # Constants defConst("VERSION", 1) defConst("DOCOL", DOCOL) +defConst("DICT", DICT) +F_IMMED = defConst("F_IMMED", 100) +F_HIDEN = defConst("F_HIDDEN", 1000) # Return Stack @@ -232,7 +324,7 @@ FROMR = defPrim("R>", () -> begin end) RSPFETCH = defPrim("RSP@", () -> begin - pushPS(RSP) + pushPS(reg.RSP) return NEXT end) @@ -249,7 +341,7 @@ end) # Parameter Stack PSPFETCH = defPrim("PSP@", () -> begin - pushPS(PSP) + pushPS(reg.PSP) return NEXT end) @@ -262,25 +354,78 @@ end) defConst("TIB", TIB) NUMTIB = defNewVar("#TIB", 0) -TOIN = defNewVar(">IN", TIB) +TOIN = defNewVar(">IN", 0) + +KEY = defPrim("KEY", () -> begin + if mem[TOIN] >= mem[NUMTIB] + mem[TOIN] = 0 + line = readline() + mem[NUMTIB] = length(line) + mem[TIB:(TIB+mem[NUMTIB]-1)] = [Int64(c) for c in collect(line)] + end -#KEY = defPrim("KEY", (reg) -> begin -# if toin >= numtib -# -# end -# -# return NEXT -#end) -# -#EMIT = defPrim("EMIT", (reg) -> begin -# -# return NEXT -#end) -# -#WORD = defPrim("WORD", (reg) -> begin -# -# return NEXT -#end) + pushPS(mem[TIB + mem[TOIN]]) + mem[TOIN] += 1 + + return NEXT +end) + +EMIT = defPrim("EMIT", () -> begin + print(Char(popPS())) + return NEXT +end) + +WORD = defPrim("WORD", () -> begin + + c = -1 + + skip_to_end = false + while true + + callPrim(KEY) + c = Char(popPS()) + + if c == '\\' + skip_to_end = true + continue + end + + if skip_to_end + if c == '\n' + skip_to_end = false + end + continue + end + + if c == ' ' || c == '\t' + continue + end + + break + end + + wordAddr = mem[HERE] + offset = 0 + + while true + mem[wordAddr + offset] = Int64(c) + offset += 1 + + callPrim(KEY) + c = Char(popPS()) + + if c == ' ' || c == '\t' + break + end + end + + wordLen = offset + + pushPS(wordAddr) + pushPS(wordLen) + + return NEXT +end) # #NUMBER = defPrim("NUMBER", (reg) -> begin # @@ -318,7 +463,7 @@ function coredump(startAddr::Int64; count::Int64 = 16, cellsPerLine::Int64 = 8) end end -function dumpPS() +function printPS() count = reg.PSP - mem[PSP0] if count > 0 -- 2.20.1