Move a bunch of code from headers to separate compilation units.

3 files changed, 53 insertions, 23 deletions

diff --git a/isa/fib/fib.h b/fib/fib.cpp
index 13801c8..8ff7718 100644
--- a/isa/fib/fib.h
+++ b/fib/fib.cpp
@@ -1,30 +1,17 @@
-#pragma once
-
 #include <fmt/core.h>
 #include <memory>
 #include <optional>
 #include <string>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
 #include "aisa/aisa.h"
+#include "fib/fib.h"
 
-namespace isa::fib {
+namespace fib {
 
     namespace Reg {
-        enum {
-            ENV_TOP,
-            ENV_FIB,
-
-            AREG,
-            ATMP,
-
-            PC,
-
-            A,
-            B,
-            Q,
-        };
 
         const char *disasm(aisa::regnum_t x)
         {
@@ -40,6 +27,7 @@ namespace isa::fib {
                 default: return "???";
             }
         }
+
     }
 
     struct StepAdd : public aisa::Step {
@@ -277,12 +265,19 @@ namespace isa::fib {
         }
     };
 
-    template<unsigned int WORD=1> struct Fib : public aisa::ISA {
-        std::pair<std::unique_ptr<const aisa::Task>, aisa::regval_t> initial_task() const override
-        {
-            auto t = std::make_unique<TaskTop<WORD>>();
-            return {std::move(t), 0};
-        }
-    };
+    template<unsigned int WORD> std::pair<std::unique_ptr<const aisa::Task>, aisa::regval_t> Fib<WORD>::initial_task() const
+    {
+        auto t = std::make_unique<TaskTop<WORD>>();
+        return {std::move(t), 0};
+    }
+
+    template struct Fib<1>;
+    template struct Fib<2>;
+    template struct Fib<3>;
+    template struct Fib<4>;
+    template struct Fib<5>;
+    template struct Fib<6>;
+    template struct Fib<7>;
+    template struct Fib<8>;
 
 }
diff --git a/fib/fib.d b/fib/fib.d
new file mode 100644
index 0000000..a6d18cc
--- /dev/null
+++ b/fib/fib.d
@@ -0,0 +1 @@
+fib_SODEPS += build/libaisa.so
diff --git a/fib/fib.h b/fib/fib.h
new file mode 100644
index 0000000..6719d06
--- /dev/null
+++ b/fib/fib.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include "aisa/aisa.h"
+
+namespace fib {
+
+    namespace Reg {
+
+        enum {
+            ENV_TOP,
+            ENV_FIB,
+
+            AREG,
+            ATMP,
+
+            PC,
+
+            A,
+            B,
+            Q,
+        };
+
+        const char *disasm(aisa::regnum_t x);
+
+    }
+
+    template<unsigned int WORD=1> struct Fib : public aisa::ISA {
+        std::pair<std::unique_ptr<const aisa::Task>, aisa::regval_t> initial_task() const override;
+    };
+
+}