From 74753670d582e4ceeaba383e4ce360eb13004a35 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Tue, 14 Mar 2023 09:44:08 -0400
Subject: >number

---
 libalee/corewords.cpp | 13 +++++++++----
 libalee/corewords.hpp |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'libalee')

diff --git a/libalee/corewords.cpp b/libalee/corewords.cpp
index b12f53b..9fef7b1 100644
--- a/libalee/corewords.cpp
+++ b/libalee/corewords.cpp
@@ -222,13 +222,18 @@ execute:
         find(state, word);
         }
         break;
-    case 34: // um*
+    case 34: // _uma
+        {
+        const auto plus = state.pop();
         cell = state.pop();
-        dcell = static_cast<DoubleCell>(
-            static_cast<Addr>(state.pop()) *
-            static_cast<Addr>(cell));
+        dcell = state.pop();
+        dcell <<= sizeof(Cell) * 8;
+        dcell |= static_cast<Addr>(state.pop());
+        dcell *= static_cast<Addr>(cell);
+        dcell += static_cast<Addr>(plus);
         state.push(dcell);
         state.push(dcell >> (sizeof(Cell) * 8));
+        }
         break;
     case 35: // u<
         cell = state.pop();
diff --git a/libalee/corewords.hpp b/libalee/corewords.hpp
index f6465c4..993a420 100644
--- a/libalee/corewords.hpp
+++ b/libalee/corewords.hpp
@@ -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*\0u<\0um/mod\0";
+        "_uma\0u<\0um/mod\0";
 };
 
 #endif // ALEEFORTH_COREWORDS_HPP
-- 
cgit v1.2.3