1 files changed, 16 insertions, 4 deletions

diff --git a/forth.hpp b/forth.hpp
index 4aad263..cc6c679 100644
--- a/forth.hpp
+++ b/forth.hpp
@@ -147,7 +147,7 @@ struct forth
     }
 
     forth& add(std::string_view name, func entry = nullptr) {
-        const auto namesz = (name.size() + 1 + sizeof(cell)) & ~(sizeof(cell) - 1);
+        const auto namesz = (name.size() + 1 + sizeof(cell) - 1) & ~(sizeof(cell) - 1);
         const auto size = (sizeof(word_base) + namesz) / sizeof(cell);
 
         assert<error::parse_error>(!name.empty());
@@ -242,9 +242,12 @@ struct forth
         auto f_minus  = [](auto) { fth.top() -= fth.pop(); };
         auto f_times  = [](auto) { fth.top() *= fth.pop(); };
         auto f_divide = [](auto) { fth.top() /= fth.pop(); };
+        auto f_mod    = [](auto) { fth.top() %= fth.pop(); };
         auto f_bitand = [](auto) { fth.top() &= fth.pop(); };
         auto f_bitor  = [](auto) { fth.top() |= fth.pop(); };
         auto f_bitxor = [](auto) { fth.top() ^= fth.pop(); };
+        auto f_lshift = [](auto) { fth.top() <<= fth.pop(); };
+        auto f_rshift = [](auto) { fth.top() >>= fth.pop(); };
         auto f_lbrac  = [](auto) { fth.compiling = false; };
         auto f_rbrac  = [](auto) { fth.compiling = true; };
         auto f_imm    = [](auto) {
@@ -262,6 +265,10 @@ struct forth
         auto f_poke = [](auto) {
             auto [p, v] = fth.pop<2>();
             *reinterpret_cast<cell *>(p) = v; };
+        auto f_cpeek = [](auto) { fth.push(*reinterpret_cast<char *>(fth.pop())); };
+        auto f_cpoke = [](auto) {
+            auto [p, v] = fth.pop<2>();
+            *reinterpret_cast<char *>(p) = v; };
         auto f_swap = [](auto) { auto [a, b] = fth.pop<2>(); fth.push(a, b); };
         auto f_drop = [](auto) { fth.pop(); };
         auto f_dup  = [](auto) { fth.push(fth.top()); };
@@ -299,16 +306,21 @@ struct forth
         constexpr static word w_minus {"-", f_minus, &w_add};
         constexpr static word w_times {"*", f_times, &w_minus};
         constexpr static word w_divide {"/", f_divide, &w_times};
-        constexpr static word w_bitand {"and", f_bitand, &w_divide};
+        constexpr static word w_mod {"mod", f_mod, &w_divide};
+        constexpr static word w_bitand {"and", f_bitand, &w_mod};
         constexpr static word w_bitor {"or", f_bitor, &w_bitand};
         constexpr static word w_bitxor {"xor", f_bitxor, &w_bitor};
-        constexpr static word w_lbrac {"[", f_lbrac, &w_bitxor, word_base::immediate};
+        constexpr static word w_lshift {"lshift", f_lshift, &w_bitxor};
+        constexpr static word w_rshift {"rshift", f_rshift, &w_lshift};
+        constexpr static word w_lbrac {"[", f_lbrac, &w_rshift, word_base::immediate};
         constexpr static word w_rbrac {"]", f_rbrac, &w_lbrac};
         constexpr static word w_imm {"immediate", f_imm, &w_rbrac};
         constexpr static word w_lit {"literal", f_lit, &w_imm, word_base::immediate};
         constexpr static word w_peek {"@", f_peek, &w_lit};
         constexpr static word w_poke {"!", f_poke, &w_peek};
-        constexpr static word w_swap {"swap", f_swap, &w_poke};
+        constexpr static word w_cpeek {"c@", f_cpeek, &w_poke};
+        constexpr static word w_cpoke {"c!", f_cpoke, &w_cpeek};
+        constexpr static word w_swap {"swap", f_swap, &w_cpoke};
         constexpr static word w_drop {"drop", f_drop, &w_swap};
         constexpr static word w_dup {"dup", f_dup, &w_drop};
         constexpr static word w_rot {"rot", f_rot, &w_dup};