7 files changed, 88 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index ed96817..be9dc32 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CHRONIC ?= chronic
 
 PKGS := fmt
 PKG_FLAGS := $(shell pkg-config --cflags ${PKGS})
-PKG_LIBS := -Wl,--push-state,--as-needed $(shell pkg-config --libs ${PKGS}) -Wl,--pop-state
+PKG_LIBS := -Wl,--push-state,--as-needed,--start-group $(shell pkg-config --libs ${PKGS}) -Wl,--end-group,--pop-state
 
 CXXFLAGS := -Wall -Werror -std=c++20 -fPIC -iquote . ${PKG_FLAGS} ${OPTIMIZE} ${DEBUG}
 
@@ -28,7 +28,7 @@ endef
 export GITTAGCPP
 
 ifneq ($(shell which ${IWYU}),)
-iwyu = ${CHRONIC} ${IWYU} -Xiwyu --error -Xiwyu --mapping_file=tools/iwyu.imp ${CXXFLAGS} $(1)
+iwyu = ${CHRONIC} ${IWYU} -Xiwyu --error -Xiwyu --mapping_file=tools/iwyu.imp -Xiwyu --no_fwd_decls ${CXXFLAGS} $(1)
 else
 $(warning Not using IWYU)
 iwyu =
@@ -36,6 +36,10 @@ endif
 
 libname = $(shell realpath --canonicalize-missing --relative-to . build/$(dir $(1))/lib$(notdir $(1)))
 
+define mksodeps =
+$(1)_SODEPS :=
+endef
+
 define mklib =
 
 ifneq ($(wildcard $(1)/*.cpp),)
@@ -44,9 +48,9 @@ $(call libname,$(1).a): $(patsubst %.cpp,build/%.o,$(wildcard $(1)/*.cpp))
         @mkdir -p $$(dir $$@)
         $${AR} cr $$@ $$+
 
-$(call libname,$(1).so): $(patsubst %.cpp,build/%.o,$(wildcard $(1)/*.cpp))
+$(call libname,$(1).so): $(patsubst %.cpp,build/%.o,$(wildcard $(1)/*.cpp)) $${$(1)_SODEPS}
         @mkdir -p $$(dir $$@)
-        $${CXX} $${CXXFLAGS} -shared -o $$@ $$+ ${PKG_LIBS}
+        $${CXX} $${CXXFLAGS} -shared -o $$@ -Wl,--start-group $$+ -Wl,--end-group
 
 PARTARS += $(call libname,$(1).a)
 PARTSOS += $(call libname,$(1).so)
@@ -73,6 +77,11 @@ PARTARS :=
 PARTSOS :=
 IWYU_CPPS :=
 
+$(foreach part,${PARTS},$(eval $(call mksodeps,${part})))
+
+DEPFILES := $(shell find -mindepth 1 -name .\* -prune -o -type f -name \*.d -print)
+include ${DEPFILES}
+
 $(foreach part,${PARTS},$(eval $(call mklib,${part})))
 
 MAINOBJS := $(patsubst %.cpp,build/%.o,$(wildcard *.cpp))
@@ -92,11 +101,11 @@ issim-static: build/issim-static
 
 build/issim-dynamic: ${MAINOBJS} ${PARTSOS}
         @mkdir -p $(dir $@)
-        ${CXX} ${CXXFLAGS} -o $@ $+ ${PKG_LIBS}
+        ${CXX} ${CXXFLAGS} -o $@ -Wl,--start-group $+ -Wl,--end-group ${PKG_LIBS}
 
 build/issim-static: ${MAINOBJS} ${PARTARS}
         @mkdir -p $(dir $@)
-        ${CXX} ${CXXFLAGS} -o $@ $+ ${PKG_LIBS}
+        ${CXX} ${CXXFLAGS} -o $@ -Wl,--start-group $+ -Wl,--end-group ${PKG_LIBS}
 
 clean:
         rm -rf build issim issim-static
@@ -107,8 +116,6 @@ build/git-tag.cpp:
         @echo "$$GITTAGCPP" > $@
 .PHONY: build/git-tag.cpp
 
-include $(shell find -type f -name \*.d)
-
 build/%.o: %.cpp
         @mkdir -p $(dir $@)
         @$(call iwyu,$<)
diff --git a/aisa/aisa.cpp b/aisa/aisa.cpp
new file mode 100644
index 0000000..811c882
--- /dev/null
+++ b/aisa/aisa.cpp
@@ -0,0 +1,14 @@
+#include <memory>
+#include <optional>
+#include <utility>
+
+#include "aisa/aisa.h"
+
+namespace aisa {
+
+    std::optional<std::pair<std::unique_ptr<const Step>, regval_t>> Task::step(regval_t environment_val) const { return {}; }
+
+    MemInfo Step::meminfo(const Wires &wires) const { return {}; }
+    void Step::evaluate(Wires &wires) const { }
+
+}
diff --git a/aisa/aisa.h b/aisa/aisa.h
index 4488529..e4e1074 100644
--- a/aisa/aisa.h
+++ b/aisa/aisa.h
@@ -31,7 +31,7 @@ namespace aisa {
 
         virtual std::string disasm() const = 0;
 
-        virtual std::optional<std::pair<std::unique_ptr<const Step>, regval_t>> step(regval_t environment_val) const { return {}; }
+        virtual std::optional<std::pair<std::unique_ptr<const Step>, regval_t>> step(regval_t environment_val) const;
     };
 
     struct MemInfo {
@@ -78,8 +78,8 @@ namespace aisa {
 
         MOp mop = MOp::NONE;
 
-        virtual MemInfo meminfo(const Wires &wires) const { return {}; }
-        virtual void evaluate(Wires &wires) const { };
+        virtual MemInfo meminfo(const Wires &wires) const;
+        virtual void evaluate(Wires &wires) const;
     };
 
 }
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;
+    };
+
+}
diff --git a/main.cpp b/main.cpp
index f172226..4bd455a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,8 +8,8 @@
 #include "aisa/aisa.h"
 #include "aisa/async.h"
 #include "aisa/simple-models.h"
+#include "fib/fib.h"
 #include "git-tag.h"
-#include "isa/fib/fib.h"
 
 const bool show_mem_fetch = false;
 const bool show_mem_store = true;
@@ -21,7 +21,7 @@ int main(int argc, const char *argv[])
 {
     std::cout << "Version " << GIT_TAG << "\n";
 
-    isa::fib::Fib<2> fib;
+    fib::Fib<2> fib;
 
     struct Eval : public aisa::AsyncEval<Eval>, aisa::PagedMem<>, aisa::TaskStack, aisa::VectorRF {
         bool fetch_mem(aisa::byte_t *bytes, aisa::addr_t addr, aisa::addr_t size)
@@ -55,7 +55,7 @@ int main(int argc, const char *argv[])
         {
             if (aisa::VectorRF::store_reg(rn, rv)) {
                 if (show_regs)
-                    fmt::print(".{} = {}\n", isa::fib::Reg::disasm(rn), rv);
+                    fmt::print(".{} = {}\n", fib::Reg::disasm(rn), rv);
                 return true;
             }
             return false;