From d1cf88229d7a30561e6f75d3543a719f8c798b91 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Sun, 19 Feb 2023 18:44:10 -0500 Subject: do loops, executor fixes --- dictionary.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'dictionary.cpp') diff --git a/dictionary.cpp b/dictionary.cpp index c240cca..dd14656 100644 --- a/dictionary.cpp +++ b/dictionary.cpp @@ -32,11 +32,17 @@ void Dictionary::add(Cell value) write(allot(sizeof(Cell)), value); } -Addr Dictionary::alignhere() +Addr Dictionary::aligned(Addr addr) const noexcept { - if (here & (sizeof(Cell) - sizeof(uint8_t))) - here = (here + sizeof(Cell)) & ~(sizeof(Cell) - sizeof(uint8_t)); + if (addr & (sizeof(Cell) - sizeof(uint8_t))) + addr = (addr + sizeof(Cell)) & ~(sizeof(Cell) - sizeof(uint8_t)); + + return addr; +} +Addr Dictionary::alignhere() +{ + here = aligned(here); return here; } @@ -45,13 +51,12 @@ void Dictionary::addDefinition(Word word) add(word.size()); for (unsigned i = 0; i < word.size(); ++i) writebyte(allot(1), readbyte(word.start + i)); + + alignhere(); } Addr Dictionary::find(Word word) { - if (latest == 0) - return 0; - Addr lt = latest, oldlt; do { oldlt = lt; @@ -74,7 +79,7 @@ Addr Dictionary::find(Word word) Addr Dictionary::getexec(Addr addr) { const auto len = read(addr) & 0x1F; - return addr + sizeof(Cell) + len; + return aligned(addr + sizeof(Cell) + len); } Word Dictionary::input() -- cgit v1.2.3