Dropping the async interface, and adding some real uarch.

2 files changed, 38 insertions, 14 deletions

diff --git a/fib/fib.cpp b/fib/fib.cpp
index 8ff7718..8e0cdf2 100644
--- a/fib/fib.cpp
+++ b/fib/fib.cpp
@@ -225,12 +225,39 @@ namespace fib {
         std::optional<std::pair<std::unique_ptr<const aisa::Step>, aisa::regval_t>> step(aisa::regval_t env) const override
         {
             switch (env) {
-                case 0: return {{std::make_unique<StepLoad<WORD>>(Reg::A, Reg::PC), env+1}};
-                case 1: return {{std::make_unique<StepAddImmediate>(Reg::PC, Reg::PC, 1), env+1}};
-                case 2: return {{std::make_unique<StepLoad<WORD>>(Reg::B, Reg::PC), env+1}};
-                case 3: return {{std::make_unique<StepAddImmediate>(Reg::AREG, Reg::PC, 1), env+1}};
-                case 4: return {{std::make_unique<StepAdd>(Reg::Q, Reg::A, Reg::B), env+1}};
-                case 5: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::Q), env+1}};
+                case 0: return {{std::make_unique<StepMove>(Reg::AREG, Reg::PC), env+1}};
+                case 1: return {{std::make_unique<StepLoad<WORD>>(Reg::A, Reg::AREG), env+1}};
+                case 2: return {{std::make_unique<StepAddImmediate>(Reg::AREG, Reg::AREG, 1), env+1}};
+                case 3: return {{std::make_unique<StepLoad<WORD>>(Reg::B, Reg::AREG), env+1}};
+                case 4: return {{std::make_unique<StepAddImmediate>(Reg::AREG, Reg::AREG, 1), env+1}};
+                case 5: return {{std::make_unique<StepAdd>(Reg::Q, Reg::A, Reg::B), env+1}};
+                case 6: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::Q), env+1}};
+            }
+
+            return {};
+        }
+    };
+
+    template<unsigned int WORD> struct TaskInit : public aisa::Task {
+        TaskInit()
+        {
+            environment = Reg::ENV_INIT;
+        }
+
+        std::string disasm() const override
+        {
+            return "init";
+        }
+
+        std::optional<std::pair<std::unique_ptr<const aisa::Step>, aisa::regval_t>> step(aisa::regval_t env) const override
+        {
+            switch(env) {
+                case 0: return {{std::make_unique<StepMoveImmediate>(Reg::AREG, 0), env+1}};
+                case 1: return {{std::make_unique<StepMoveImmediate>(Reg::ATMP, 0), env+1}};
+                case 2: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::ATMP), env+1}};
+                case 3: return {{std::make_unique<StepMoveImmediate>(Reg::AREG, 1), env+1}};
+                case 4: return {{std::make_unique<StepMoveImmediate>(Reg::ATMP, 1), env+1}};
+                case 5: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::ATMP), env+1}};
             }
 
             return {};
@@ -251,14 +278,10 @@ namespace fib {
         std::optional<std::pair<std::unique_ptr<const aisa::Step>, aisa::regval_t>> step(aisa::regval_t env) const override
         {
             switch (env) {
-                case 0: return {{std::make_unique<StepMoveImmediate>(Reg::PC, 0), env+1}};
-                case 1: return {{std::make_unique<StepMoveImmediate>(Reg::AREG, 0), env+1}};
-                case 2: return {{std::make_unique<StepMoveImmediate>(Reg::ATMP, 0), env+1}};
-                case 3: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::ATMP), env+1}};
-                case 4: return {{std::make_unique<StepMoveImmediate>(Reg::AREG, 1), env+1}};
-                case 5: return {{std::make_unique<StepMoveImmediate>(Reg::ATMP, 1), env+1}};
-                case 6: return {{std::make_unique<StepStore<WORD>>(Reg::AREG, Reg::ATMP), env+1}};
-                case 7: return {{std::make_unique<StepSpawn<TaskFib<WORD>>>(), env}};
+                case 0: return {{std::make_unique<StepSpawn<TaskInit<WORD>>>(), env+1}};
+                case 1: return {{std::make_unique<StepMoveImmediate>(Reg::PC, 0), env+1}};
+                case 2: return {{std::make_unique<StepSpawn<TaskFib<WORD>>>(), env+1}};
+                case 3: return {{std::make_unique<StepAddImmediate>(Reg::PC, Reg::PC, 1), env-1}};
             }
 
             return {};
diff --git a/fib/fib.h b/fib/fib.h
index 6719d06..25afdc4 100644
--- a/fib/fib.h
+++ b/fib/fib.h
@@ -11,6 +11,7 @@ namespace fib {
 
         enum {
             ENV_TOP,
+            ENV_INIT,
             ENV_FIB,
 
             AREG,