u< um/mod

3 files changed, 19 insertions, 2 deletions

diff --git a/libalee/corewords.cpp b/libalee/corewords.cpp
index 136619c..b12f53b 100644
--- a/libalee/corewords.cpp
+++ b/libalee/corewords.cpp
@@ -230,6 +230,22 @@ execute:
         state.push(dcell);
         state.push(dcell >> (sizeof(Cell) * 8));
         break;
+    case 35: // u<
+        cell = state.pop();
+        state.top() = static_cast<Addr>(state.top()) <
+                      static_cast<Addr>(cell) ? -1 : 0;
+        break;
+    case 36: // um/mod
+        cell = state.pop();
+        dcell = state.pop();
+        dcell <<= sizeof(Cell) * 8;
+        dcell |= static_cast<Addr>(state.pop());
+
+        state.push(static_cast<DoubleAddr>(dcell) %
+                   static_cast<Addr>(cell));
+        state.push(static_cast<DoubleAddr>(dcell) /
+                   static_cast<Addr>(cell));
+        break;
     default:
         state.push(index - WordCount);
         break;
diff --git a/libalee/corewords.hpp b/libalee/corewords.hpp
index c08c4cd..f6465c4 100644
--- a/libalee/corewords.hpp
+++ b/libalee/corewords.hpp
@@ -31,7 +31,7 @@ void user_sys(State&);
 class CoreWords
 {
 public:
-    constexpr static std::size_t WordCount = 35;
+    constexpr static std::size_t WordCount = 37;
     constexpr static int Semicolon = 26;
 
     /**
@@ -54,7 +54,7 @@ public:
         "<<\0>>\0:\0_'\0execute\0"
         "exit\0;\0_jmp0\0_jmp\0"
         "depth\0_rdepth\0_in\0_ev\0find\0"
-        "um*\0";
+        "um*\0u<\0um/mod\0";
 };
 
 #endif // ALEEFORTH_COREWORDS_HPP
diff --git a/libalee/types.hpp b/libalee/types.hpp
index 29c93e8..f23f92e 100644
--- a/libalee/types.hpp
+++ b/libalee/types.hpp
@@ -28,6 +28,7 @@
 using Addr = uint16_t;
 using Cell = int16_t;
 using DoubleCell = int32_t;
+using DoubleAddr = uint32_t; // Only used for um/mod.
 
 struct Dictionary;
 struct State;