1 files changed, 3 insertions, 17 deletions

diff --git a/aisa/aisa.h b/aisa/aisa.h
index e4e1074..a986cd7 100644
--- a/aisa/aisa.h
+++ b/aisa/aisa.h
@@ -17,7 +17,7 @@ namespace aisa {
     struct Task;
 
     struct ISA {
-        virtual ~ISA() { }
+        virtual ~ISA();
 
         virtual std::pair<std::unique_ptr<const Task>, regval_t> initial_task() const = 0;
     };
@@ -27,7 +27,7 @@ namespace aisa {
     struct Task {
         regnum_t environment;
 
-        virtual ~Task() { }
+        virtual ~Task();
 
         virtual std::string disasm() const = 0;
 
@@ -58,24 +58,10 @@ namespace aisa {
         std::vector<regnum_t> source_regs;
         std::vector<regnum_t> destination_regs;
 
-        virtual ~Step() { }
+        virtual ~Step();
 
         virtual std::string disasm(const Wires *w = nullptr) const = 0;
 
-        std::optional<regnum_t> predicate_reg() const
-        {
-            if (predicate.has_value())
-                return predicate->first;
-            return {};
-        }
-
-        std::optional<regnum_t> expected_predicate_val() const
-        {
-            if (predicate.has_value())
-                return predicate->second;
-            return {};
-        }
-
         MOp mop = MOp::NONE;
 
         virtual MemInfo meminfo(const Wires &wires) const;