bitgloo
/
alee-forth
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coreword opcodes via token(); calculated WordCount

Browse Source
master
Clyne 11 months ago
parent 2b64fbdfb8
commit 513136558e
Signed by: clyne
GPG Key ID: 1B74EE6C49C96795
3 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File

84
libalee/corewords.cpp
Unescape Escape View File

@ -40,95 +40,95 @@ execute:
ip = index; ip = index;
return; return;
} else switch (index) { } else switch (index) {
case 0: // _lit: Execution semantics of `literal`. case token("_lit"): // Execution semantics of `literal`.
state.push(state.beyondip()); state.push(state.beyondip());
break; break;
case 1: // drop case token("drop"):
state.pop(); state.pop();
break; break;
case 2: // dup case token("dup"):
state.push(state.top()); state.push(state.top());
break; break;
case 3: // swap case token("swap"):
std::swap(state.top(), state.pick(1)); std::swap(state.top(), state.pick(1));
break; break;
case 4: // pick case token("pick"):
state.push(state.pick(state.pop())); state.push(state.pick(state.pop()));
break; break;
case 5: // sys: Calls user-defined "system" handler. case token("sys"): // Calls user-defined "system" handler.
user_sys(state); user_sys(state);
break; break;
case 6: // add case token("+"):
cell = state.pop(); cell = state.pop();
state.top() += cell; state.top() += cell;
break; break;
case 7: // sub case token("-"):
cell = state.pop(); cell = state.pop();
state.top() -= cell; state.top() -= cell;
break; break;
case 8: // mul ( n n -- d ) case token("m*"): // ( n n -- d )
cell = state.pop(); cell = state.pop();
dcell = state.pop() * cell; dcell = state.pop() * cell;
pushd(state, dcell); pushd(state, dcell);
break; break;
case 9: // div ( d n -- n ) case token("_/"): // ( d n -- n )
cell = state.pop(); cell = state.pop();
dcell = popd(state); dcell = popd(state);
state.push(static_cast<Cell>(dcell / cell)); state.push(static_cast<Cell>(dcell / cell));
break; break;
case 10: // mod ( d n -- n ) case token("_%"): // ( d n -- n )
cell = state.pop(); cell = state.pop();
dcell = popd(state); dcell = popd(state);
state.push(static_cast<Cell>(dcell % cell)); state.push(static_cast<Cell>(dcell % cell));
break; break;
case 11: // peek ( addr cell? -- n ) case token("_@"): // ( addr cell? -- n )
if (state.pop()) if (state.pop())
state.push(state.dict.read(state.pop())); state.push(state.dict.read(state.pop()));
else else
state.push(state.dict.readbyte(state.pop())); state.push(state.dict.readbyte(state.pop()));
break; break;
case 12: // poke ( n addr cell? -- ) case token("_!"): // ( n addr cell? -- )
cell = state.pop(); cell = state.pop();
if (auto addr = state.pop(); cell) if (auto addr = state.pop(); cell)
state.dict.write(addr, state.pop()); state.dict.write(addr, state.pop());
else else
state.dict.writebyte(addr, state.pop() & 0xFFu); state.dict.writebyte(addr, state.pop() & 0xFFu);
break; break;
case 13: // pushr case token(">r"):
state.pushr(state.pop()); state.pushr(state.pop());
break; break;
case 14: // popr case token("r>"):
state.push(state.popr()); state.push(state.popr());
break; break;
case 15: // equal case token("="):
cell = state.pop(); cell = state.pop();
state.top() = state.top() == cell ? -1 : 0; state.top() = state.top() == cell ? -1 : 0;
break; break;
case 16: // lt case token("<"):
cell = state.pop(); cell = state.pop();
state.top() = state.top() < cell ? -1 : 0; state.top() = state.top() < cell ? -1 : 0;
break; break;
case 17: // and case token("&"):
cell = state.pop(); cell = state.pop();
state.top() &= cell; state.top() &= cell;
break; break;
case 18: // or case token("|"):
cell = state.pop(); cell = state.pop();
state.top() |= cell; state.top() |= cell;
break; break;
case 19: // xor case token("^"):
cell = state.pop(); cell = state.pop();
state.top() ^= cell; state.top() ^= cell;
break; break;
case 20: // shl case token("<<"):
cell = state.pop(); cell = state.pop();
reinterpret_cast<Addr&>(state.top()) <<= static_cast<Addr>(cell); reinterpret_cast<Addr&>(state.top()) <<= static_cast<Addr>(cell);
break; break;
case 21: // shr case token(">>"):
cell = state.pop(); cell = state.pop();
reinterpret_cast<Addr&>(state.top()) >>= static_cast<Addr>(cell); reinterpret_cast<Addr&>(state.top()) >>= static_cast<Addr>(cell);
break; break;
case 22: // colon: Begins definition/compilation of new word. case token(":"): // Begins definition/compilation of new word.
state.push(state.dict.alignhere()); state.push(state.dict.alignhere());
state.dict.write(Dictionary::CompToken, state.top()); state.dict.write(Dictionary::CompToken, state.top());
while (!state.dict.hasInput()) while (!state.dict.hasInput())
@ -136,51 +136,53 @@ execute:
state.dict.addDefinition(state.dict.input()); state.dict.addDefinition(state.dict.input());
state.compiling(true); state.compiling(true);
break; break;
case 23: // tick: Collects word from input and finds execution token. case token("_'"): // Collects input word and finds execution token.
while (!state.dict.hasInput()) while (!state.dict.hasInput())
state.input(); state.input();
find(state, state.dict.input()); find(state, state.dict.input());
break; break;
case 24: // execute case token("execute"):
index = state.pop(); index = state.pop();
goto execute; goto execute;
case 25: // exit case token("exit"):
ip = state.popr(); ip = state.popr();
state.verify(ip != 0, Error::exit); state.verify(ip != 0, Error::exit);
break; break;
case 26: // semic: Concludes word definition. case token(";"): // Concludes word definition.
state.dict.add(findi("exit")); state.dict.add(token("exit"));
state.compiling(false); state.compiling(false);
cell = state.pop(); cell = state.pop();
dcell = cell - state.dict.latest(); dcell = cell - state.dict.latest();
if (dcell > (1 << (sizeof(Cell) * 8 - 6)) - 1) { if (dcell > (1 << (sizeof(Cell) * 8 - 6)) - 1) {
// Large distance to previous entry: store in dedicated cell. // Large distance to previous entry: store in dedicated cell.
state.dict.write(static_cast<Addr>(cell) + sizeof(Cell), static_cast<Cell>(dcell)); state.dict.write(static_cast<Addr>(cell) + sizeof(Cell),
static_cast<Cell>(dcell));
dcell = ((1 << (sizeof(Cell) * 8 - 6)) - 1); dcell = ((1 << (sizeof(Cell) * 8 - 6)) - 1);
} }
state.dict.write(cell, (state.dict.read(cell) & 0x1F) | static_cast<Cell>(dcell << 6)); state.dict.write(cell,
(state.dict.read(cell) & 0x1F) | static_cast<Cell>(dcell << 6));
state.dict.latest(cell); state.dict.latest(cell);
break; break;
case 27: // _jmp0: Jump if popped value equals zero. case token("_jmp0"): // Jump if popped value equals zero.
if (state.pop()) { if (state.pop()) {
state.beyondip(); state.beyondip();
break; break;
} }
[[fallthrough]]; [[fallthrough]];
case 28: // _jmp: Unconditional jump. case token("_jmp"): // Unconditional jump.
ip = state.beyondip(); ip = state.beyondip();
return; return;
case 29: // depth case token("depth"):
state.push(static_cast<Cell>(state.size())); state.push(static_cast<Cell>(state.size()));
break; break;
case 30: // _rdepth case token("_rdepth"):
state.push(static_cast<Cell>(state.rsize())); state.push(static_cast<Cell>(state.rsize()));
break; break;
case 31: // _in: Fetches more input from the user input source. case token("_in"): // Fetches more input from the user input source.
state.input(); state.input();
break; break;
case 32: // _ev: Evaluates words from current input source. case token("_ev"): // Evaluates words from current input source.
{ {
const auto st = state.save(); const auto st = state.save();
ip = 0; ip = 0;
@ -188,13 +190,13 @@ execute:
state.load(st); state.load(st);
} }
break; break;
case 33: // find case token("find"):
cell = state.pop(); cell = state.pop();
find(state, find(state,
Word::fromLength(static_cast<Addr>(cell + 1), Word::fromLength(static_cast<Addr>(cell + 1),
state.dict.readbyte(cell))); state.dict.readbyte(cell)));
break; break;
case 34: // _uma ( d u u -- d ): Unsigned multiply-add. case token("_uma"): // ( d u u -- d ): Unsigned multiply-add.
{ {
const auto plus = state.pop(); const auto plus = state.pop();
cell = state.pop(); cell = state.pop();
@ -204,12 +206,12 @@ execute:
pushd(state, dcell); pushd(state, dcell);
} }
break; break;
case 35: // u< case token("u<"):
cell = state.pop(); cell = state.pop();
state.top() = static_cast<Addr>(state.top()) < state.top() = static_cast<Addr>(state.top()) <
static_cast<Addr>(cell) ? -1 : 0; static_cast<Addr>(cell) ? -1 : 0;
break; break;
case 36: // um/mod case token("um/mod"):
cell = state.pop(); cell = state.pop();
dcell = popd(state); dcell = popd(state);
@ -242,7 +244,7 @@ void find(State& state, Word word)
tok = state.dict.getexec(j); tok = state.dict.getexec(j);
imm = (state.dict.read(j) & Dictionary::Immediate) ? 1 : -1; imm = (state.dict.read(j) & Dictionary::Immediate) ? 1 : -1;
} else if (tok = CoreWords::findi(state, word); tok >= 0) { } else if (tok = CoreWords::findi(state, word); tok >= 0) {
imm = (tok == CoreWords::Semicolon) ? 1 : -1; imm = (tok == CoreWords::token(";")) ? 1 : -1;
} }
state.push(tok); state.push(tok);

22
libalee/corewords.hpp
Unescape Escape View File

@ -24,6 +24,7 @@
#include "types.hpp" #include "types.hpp"
#include "state.hpp" #include "state.hpp"
#include <algorithm>
#include <cstring> #include <cstring>
/** /**
@ -40,16 +41,6 @@ void user_sys(State& state);
class CoreWords class CoreWords
{ {
public: public:
/**
* Count of total fundamental words.
*/
constexpr static Cell WordCount = 37;
/**
* Token/index of the semicolon word (";").
*/
constexpr static Cell Semicolon = 26;
/** /**
* Searches for the token/index of the given word if it is part of the * Searches for the token/index of the given word if it is part of the
* fundamental word-set. * fundamental word-set.
@ -61,11 +52,11 @@ public:
/** /**
* Looks up the token/index of the given fundamental word. * Looks up the token/index of the given fundamental word.
* Can evaluate at compile-time. * Primarily used for compile-time lookup.
* @param word The word to look up. * @param word The word to look up.
* @return The token/index of the word or -1 if not found. * @return The token/index of the word or -1 if not found.
*/ */
consteval static Cell findi(const char *word) { consteval static Cell token(const char *word) {
return findi(word, std::strlen(word)); return findi(word, std::strlen(word));
} }
@ -78,6 +69,7 @@ public:
/** /**
* String lookup table for the fundamental word-set. * String lookup table for the fundamental word-set.
* This also determines the opcode (index) of these words.
*/ */
constexpr static char wordsarr[] = constexpr static char wordsarr[] =
"_lit\0drop\0dup\0swap\0pick\0sys\0" "_lit\0drop\0dup\0swap\0pick\0sys\0"
@ -89,6 +81,12 @@ public:
"depth\0_rdepth\0_in\0_ev\0find\0" "depth\0_rdepth\0_in\0_ev\0find\0"
"_uma\0u<\0um/mod\0"; "_uma\0u<\0um/mod\0";
/**
* Count of total fundamental words.
*/
constexpr static Cell WordCount = [] {
return std::count(wordsarr, wordsarr + sizeof(wordsarr), '\0'); }();
private: private:
/** /**
* Generic implementation of findi(). Private; use public implementations. * Generic implementation of findi(). Private; use public implementations.

4
libalee/parser.cpp
Unescape Escape View File

@ -69,7 +69,7 @@ Error Parser::parseWord(State& state, Word word)
return r; return r;
} else { } else {
ins = cw; ins = cw;
imm = ins == CoreWords::Semicolon; imm = ins == CoreWords::token(";");
} }
} else { } else {
imm = state.dict.read(ins) & Dictionary::Immediate; imm = state.dict.read(ins) & Dictionary::Immediate;
@ -119,7 +119,7 @@ Error Parser::parseNumber(State& state, Word word)
void Parser::processLiteral(State& state, Cell value) void Parser::processLiteral(State& state, Cell value)
{ {
if (state.compiling()) { if (state.compiling()) {
constexpr auto ins = CoreWords::findi("_lit"); constexpr auto ins = CoreWords::token("_lit");
const Cell maxlit = Dictionary::Begin - CoreWords::WordCount; const Cell maxlit = Dictionary::Begin - CoreWords::WordCount;
if (value >= 0 && value < maxlit) if (value >= 0 && value < maxlit)

Write Preview
Loading…
Cancel
Save