aboutsummaryrefslogtreecommitdiffstats
path: root/libalee
diff options
context:
space:
mode:
Diffstat (limited to 'libalee')
-rw-r--r--libalee/alee.hpp7
-rw-r--r--libalee/config.hpp5
-rw-r--r--libalee/corewords.cpp6
-rw-r--r--libalee/corewords.hpp11
-rw-r--r--libalee/ctype.hpp12
-rw-r--r--libalee/dictionary.cpp16
-rw-r--r--libalee/dictionary.hpp12
-rw-r--r--libalee/parser.cpp16
-rw-r--r--libalee/parser.hpp2
-rw-r--r--libalee/state.cpp12
-rw-r--r--libalee/state.hpp11
-rw-r--r--libalee/types.cpp10
-rw-r--r--libalee/types.hpp1
13 files changed, 96 insertions, 25 deletions
diff --git a/libalee/alee.hpp b/libalee/alee.hpp
new file mode 100644
index 0000000..7b46845
--- /dev/null
+++ b/libalee/alee.hpp
@@ -0,0 +1,7 @@
+#include "config.hpp"
+#include "corewords.hpp"
+#include "ctype.hpp"
+#include "dictionary.hpp"
+#include "parser.hpp"
+#include "state.hpp"
+#include "types.hpp"
diff --git a/libalee/config.hpp b/libalee/config.hpp
new file mode 100644
index 0000000..20d0950
--- /dev/null
+++ b/libalee/config.hpp
@@ -0,0 +1,5 @@
+#ifndef ALEE_MSP430_HOST
+#define LIBALEE_SECTION
+#else
+#define LIBALEE_SECTION __attribute__((section(".libalee")))
+#endif
diff --git a/libalee/corewords.cpp b/libalee/corewords.cpp
index 661590f..7c79aea 100644
--- a/libalee/corewords.cpp
+++ b/libalee/corewords.cpp
@@ -16,8 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "corewords.hpp"
-#include "parser.hpp"
+#include "alee.hpp"
#include <utility>
@@ -25,6 +24,7 @@ static void find(State&, Word);
static DoubleCell popd(State&);
static void pushd(State&, DoubleCell);
+LIBALEE_SECTION
void CoreWords::run(Cell ins, State& state)
{
Cell cell;
@@ -230,11 +230,13 @@ execute:
ip += sizeof(Cell);
}
+LIBALEE_SECTION
Cell CoreWords::findi(State& state, Word word)
{
return findi(word.begin(&state.dict), word.size());
}
+LIBALEE_SECTION
void find(State& state, Word word)
{
Cell tok = 0;
diff --git a/libalee/corewords.hpp b/libalee/corewords.hpp
index 630f3cf..30d0a42 100644
--- a/libalee/corewords.hpp
+++ b/libalee/corewords.hpp
@@ -21,11 +21,13 @@
#ifndef ALEEFORTH_COREWORDS_HPP
#define ALEEFORTH_COREWORDS_HPP
+#include "config.hpp"
+#include "dictionary.hpp"
#include "types.hpp"
-#include "state.hpp"
#include <algorithm>
-#include <cstring>
+
+class State;
/**
* To be implemented by the user, this function is called when the `sys` word
@@ -57,7 +59,7 @@ public:
* @return The token/index of the word or -1 if not found.
*/
consteval static Cell token(const char *word) {
- return findi(word, std::strlen(word));
+ return findi(word, strlen(word));
}
/**
@@ -95,12 +97,13 @@ private:
* @return The token/index of the word or -1 if not found.
*/
template<typename Iter>
+ LIBALEE_SECTION
constexpr static Cell findi(Iter it, std::size_t size)
{
const char *ptr = CoreWords::wordsarr;
for (Cell wordsi = 0; wordsi < WordCount; ++wordsi) {
- std::size_t wordsize = std::strlen(ptr);
+ std::size_t wordsize = strlen(ptr);
if (wordsize == size && Dictionary::equal(ptr, ptr + wordsize, it))
return wordsi;
diff --git a/libalee/ctype.hpp b/libalee/ctype.hpp
index 5252eda..f7ce3fb 100644
--- a/libalee/ctype.hpp
+++ b/libalee/ctype.hpp
@@ -23,6 +23,13 @@
#include <cstdint>
+/** Determines the length of a null-terminated string. */
+constexpr inline unsigned strlen(const char * const s) {
+ unsigned i = 0;
+ while (s[i]) i++;
+ return i;
+}
+
/** Tests if given character represents whitespace. */
constexpr inline bool isspace(uint8_t c) {
return c == ' ' || c == '\t' || c == '\r' || c == '\n';
@@ -38,6 +45,11 @@ constexpr inline bool isupper(uint8_t c) {
return c >= 'A' && c <= 'Z';
}
+/** Tests if given character is a lowercase letter. */
+constexpr inline bool islower(uint8_t c) {
+ return c >= 'a' && c <= 'z';
+}
+
/** Tests if given character is a letter. */
constexpr inline bool isalpha(uint8_t c) {
return isupper(c) || (c >= 'a' && c <= 'z');
diff --git a/libalee/dictionary.cpp b/libalee/dictionary.cpp
index f2ad231..b1cbc5f 100644
--- a/libalee/dictionary.cpp
+++ b/libalee/dictionary.cpp
@@ -16,10 +16,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "dictionary.hpp"
-
-#include <cstring>
+#include "alee.hpp"
+LIBALEE_SECTION
void Dictionary::initialize()
{
write(Base, 10);
@@ -29,6 +28,7 @@ void Dictionary::initialize()
write(Source, Input + sizeof(Cell));
}
+LIBALEE_SECTION
Addr Dictionary::allot(Cell amount) noexcept
{
Addr old = here();
@@ -43,22 +43,26 @@ Addr Dictionary::allot(Cell amount) noexcept
return old;
}
+LIBALEE_SECTION
void Dictionary::add(Cell value) noexcept
{
write(allot(sizeof(Cell)), value);
}
+LIBALEE_SECTION
Addr Dictionary::aligned(Addr addr)
{
return (addr + (sizeof(Cell) - 1)) & ~(sizeof(Cell) - 1);
}
+LIBALEE_SECTION
Addr Dictionary::alignhere() noexcept
{
here(aligned(here()));
return here();
}
+LIBALEE_SECTION
void Dictionary::addDefinition(Word word) noexcept
{
Cell wsize = word.size();
@@ -77,6 +81,7 @@ void Dictionary::addDefinition(Word word) noexcept
alignhere();
}
+LIBALEE_SECTION
Addr Dictionary::find(Word word) noexcept
{
Addr lt = latest();
@@ -108,6 +113,7 @@ Addr Dictionary::find(Word word) noexcept
return 0;
}
+LIBALEE_SECTION
Addr Dictionary::getexec(Addr addr) noexcept
{
const Addr l = read(addr);
@@ -121,6 +127,7 @@ Addr Dictionary::getexec(Addr addr) noexcept
return aligned(addr);
}
+LIBALEE_SECTION
bool Dictionary::hasInput() const noexcept
{
const Addr src = read(Dictionary::Source);
@@ -142,6 +149,7 @@ bool Dictionary::hasInput() const noexcept
return false;
}
+LIBALEE_SECTION
Word Dictionary::input() noexcept
{
const Addr src = read(Dictionary::Source);
@@ -171,11 +179,13 @@ Word Dictionary::input() noexcept
return Word(wstart, wend);
}
+LIBALEE_SECTION
bool Dictionary::equal(Word word, const char *str, unsigned len) const noexcept
{
return word.size() == len && equal(word.begin(this), word.end(this), str);
}
+LIBALEE_SECTION
bool Dictionary::equal(Word word, Word other) const noexcept
{
return word.size() == other.size() && equal(word.begin(this), word.end(this), other.begin(this));
diff --git a/libalee/dictionary.hpp b/libalee/dictionary.hpp
index f6f6bbe..ad1ee02 100644
--- a/libalee/dictionary.hpp
+++ b/libalee/dictionary.hpp
@@ -21,8 +21,9 @@
#ifndef ALEEFORTH_DICTIONARY_HPP
#define ALEEFORTH_DICTIONARY_HPP
-#include "ctype.hpp"
+#include "config.hpp"
#include "types.hpp"
+#include "ctype.hpp"
#include <algorithm>
#include <cstddef>
@@ -99,21 +100,25 @@ public:
/**
* Gets the address stored in `here`.
*/
+ LIBALEE_SECTION
Addr here() const noexcept { return read(Here); }
/**
* Sets the address stored in `here`.
*/
+ LIBALEE_SECTION
void here(Addr l) noexcept { write(Here, l); }
/**
* Gets the value of `latest`.
*/
+ LIBALEE_SECTION
Addr latest() const noexcept { return read(Latest); }
/**
* Sets the value of `latest`.
*/
+ LIBALEE_SECTION
void latest(Addr l) noexcept { write(Latest, l); }
/**
@@ -199,17 +204,19 @@ public:
* Arguments and return value identical to std::equal.
*/
template<typename Iter1, typename Iter2>
+ LIBALEE_SECTION
constexpr static bool equal(Iter1 b1, Iter1 e1, Iter2 b2) {
return std::equal(b1, e1, b2, eqchars);
}
- virtual ~Dictionary() = default;
+ virtual ~Dictionary() {};
private:
/**
* Case-insensitive character comparison used for dictionary lookup.
* @return True if the characters are equivalent.
*/
+ LIBALEE_SECTION
constexpr static bool eqchars(char c1, char c2) {
if (isalpha(static_cast<uint8_t>(c1)))
c1 |= 32;
@@ -218,7 +225,6 @@ private:
return c1 == c2;
}
-
};
#endif // ALEEFORTH_DICTIONARY_HPP
diff --git a/libalee/parser.cpp b/libalee/parser.cpp
index 3699d5f..11aba38 100644
--- a/libalee/parser.cpp
+++ b/libalee/parser.cpp
@@ -16,21 +16,17 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "corewords.hpp"
-#include "ctype.hpp"
-#include "parser.hpp"
-
-#include <algorithm>
-#include <cstring>
+#include "alee.hpp"
Error (*Parser::customParse)(State&, Word) = nullptr;
+LIBALEE_SECTION
Error Parser::parse(State& state, const char *str)
{
auto addr = Dictionary::Input;
// Set source and input length
- const auto len = static_cast<Cell>(std::strlen(str));
+ const auto len = static_cast<Cell>(strlen(str));
state.dict.write(addr, 0);
state.dict.write(Dictionary::SourceLen, len);
@@ -46,6 +42,7 @@ Error Parser::parse(State& state, const char *str)
return parseSource(state);
}
+LIBALEE_SECTION
Error Parser::parseSource(State& state)
{
auto err = Error::none;
@@ -56,6 +53,7 @@ Error Parser::parseSource(State& state)
return err;
}
+LIBALEE_SECTION
Error Parser::parseWord(State& state, Word word)
{
bool imm;
@@ -89,6 +87,7 @@ Error Parser::parseWord(State& state, Word word)
return Error::none;
}
+LIBALEE_SECTION
Error Parser::parseNumber(State& state, Word word)
{
const auto base = state.dict.read(Dictionary::Base);
@@ -100,7 +99,7 @@ Error Parser::parseNumber(State& state, Word word)
++it;
const auto end = word.end(&state.dict);
- for (char c; it != end; ++it) {
+ for (uint8_t c; it != end; ++it) {
c = *it;
if (isdigit(c)) {
@@ -121,6 +120,7 @@ Error Parser::parseNumber(State& state, Word word)
return Error::none;
}
+LIBALEE_SECTION
void Parser::processLiteral(State& state, Cell value)
{
if (state.compiling()) {
diff --git a/libalee/parser.hpp b/libalee/parser.hpp
index 06ba8fc..7eca656 100644
--- a/libalee/parser.hpp
+++ b/libalee/parser.hpp
@@ -21,7 +21,9 @@
#ifndef ALEEFORTH_PARSER_HPP
#define ALEEFORTH_PARSER_HPP
+#include "config.hpp"
#include "types.hpp"
+#include "state.hpp"
#include <string_view>
diff --git a/libalee/state.cpp b/libalee/state.cpp
index 6e12999..ed1562f 100644
--- a/libalee/state.cpp
+++ b/libalee/state.cpp
@@ -16,32 +16,35 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "corewords.hpp"
-#include "state.hpp"
+#include "alee.hpp"
-#include <cstring>
#include <iterator>
+LIBALEE_SECTION
bool State::compiling() const
{
return dict.read(Dictionary::Compiling);
}
+LIBALEE_SECTION
void State::compiling(bool yes)
{
dict.write(Dictionary::Compiling, yes);
}
+LIBALEE_SECTION
State::Context State::save()
{
return context;
}
+LIBALEE_SECTION
void State::load(const State::Context& ctx)
{
context = ctx;
}
+LIBALEE_SECTION
Error State::execute(Addr addr)
{
auto stat = static_cast<Error>(setjmp(context.jmpbuf));
@@ -64,6 +67,7 @@ Error State::execute(Addr addr)
return stat;
}
+LIBALEE_SECTION
void State::reset()
{
while (size())
@@ -75,11 +79,13 @@ void State::reset()
context.ip = 0;
}
+LIBALEE_SECTION
std::size_t State::size() const noexcept
{
return dsp - dstack;
}
+LIBALEE_SECTION
std::size_t State::rsize() const noexcept
{
return rsp - rstack;
diff --git a/libalee/state.hpp b/libalee/state.hpp
index 60ff95f..a5e49b5 100644
--- a/libalee/state.hpp
+++ b/libalee/state.hpp
@@ -21,6 +21,7 @@
#ifndef ALEEFORTH_STATE_HPP
#define ALEEFORTH_STATE_HPP
+#include "config.hpp"
#include "dictionary.hpp"
#include "types.hpp"
@@ -82,11 +83,13 @@ public:
void reset();
/** Returns a reference to the instruction pointer. */
+ LIBALEE_SECTION
Addr& ip() noexcept {
return context.ip;
}
/** Calls the user input function with this state as the argument. */
+ LIBALEE_SECTION
void input() noexcept {
inputfunc(*this);
}
@@ -114,6 +117,7 @@ public:
/**
* Pushes the given value to the data stack.
*/
+ LIBALEE_SECTION
inline void push(Cell value) {
verify(dsp < dstack + DataStackSize, Error::push);
*dsp++ = value;
@@ -122,6 +126,7 @@ public:
/**
* Pops a value from the data stack and returns that value.
*/
+ LIBALEE_SECTION
inline Cell pop() {
verify(dsp > dstack, Error::pop);
return *--dsp;
@@ -130,6 +135,7 @@ public:
/**
* Pushes the given value to the return stack.
*/
+ LIBALEE_SECTION
inline void pushr(Cell value) {
verify(rsp < rstack + ReturnStackSize, Error::pushr);
*rsp++ = value;
@@ -138,6 +144,7 @@ public:
/**
* Pops a value from the return stack and returns that value.
*/
+ LIBALEE_SECTION
inline Cell popr() {
verify(rsp > rstack, Error::popr);
return *--rsp;
@@ -146,6 +153,7 @@ public:
/**
* Returns the value stored at the current data stack position.
*/
+ LIBALEE_SECTION
inline Cell& top() {
verify(dsp > dstack, Error::top);
return *(dsp - 1);
@@ -156,6 +164,7 @@ public:
* @param i Index from current position to fetch from
* @return The value stored at the given index
*/
+ LIBALEE_SECTION
inline Cell& pick(std::size_t i) {
verify(dsp - i > dstack, Error::pick);
return *(dsp - i - 1);
@@ -164,6 +173,7 @@ public:
/**
* Advances the instruction pointer and returns that cell's contents.
*/
+ LIBALEE_SECTION
inline Cell beyondip() {
context.ip += sizeof(Cell);
return dict.read(context.ip);
@@ -175,6 +185,7 @@ public:
* @param condition Condition to be tested
* @param error Error code to report via longjmp() on false condition
*/
+ LIBALEE_SECTION
inline void verify(bool condition, Error error) {
if (!condition)
std::longjmp(context.jmpbuf, static_cast<int>(error));
diff --git a/libalee/types.cpp b/libalee/types.cpp
index bfff2ae..7ac67c7 100644
--- a/libalee/types.cpp
+++ b/libalee/types.cpp
@@ -16,30 +16,34 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "dictionary.hpp"
-#include "types.hpp"
+#include "alee.hpp"
+LIBALEE_SECTION
Addr Word::size() const noexcept
{
return wend - start;
}
+LIBALEE_SECTION
Word::iterator Word::begin(const Dictionary *dict)
{
return iterator(start, dict);
}
+LIBALEE_SECTION
Word::iterator Word::end(const Dictionary *dict)
{
return iterator(wend, dict);
}
+LIBALEE_SECTION
Word::iterator& Word::iterator::operator++()
{
addr++;
return *this;
}
+LIBALEE_SECTION
Word::iterator Word::iterator::operator++(int)
{
const auto copy = *this;
@@ -47,11 +51,13 @@ Word::iterator Word::iterator::operator++(int)
return copy;
}
+LIBALEE_SECTION
Word::iterator::value_type Word::iterator::operator*()
{
return dict->readbyte(addr);
}
+LIBALEE_SECTION
bool Word::iterator::operator!=(const iterator& other)
{
return dict != other.dict || addr != other.addr;
diff --git a/libalee/types.hpp b/libalee/types.hpp
index a122c84..7b5bb62 100644
--- a/libalee/types.hpp
+++ b/libalee/types.hpp
@@ -79,6 +79,7 @@ public:
* @param l Count of bytes until end of word
* @return Resulting Word object
*/
+ LIBALEE_SECTION
static constexpr Word fromLength(Addr s, Addr l) {
return Word(s, s + l);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 19:16:29 +0000