Signals being used instead of wfm + rec targets

Those Python scripts may have to be cleaned up at some point...

2 files changed, 30 insertions, 11 deletions

diff --git a/instr-scripts/process_internals.py b/instr-scripts/process_internals.py
index e0034bf..d3c9ff5 100644
--- a/instr-scripts/process_internals.py
+++ b/instr-scripts/process_internals.py
@@ -158,7 +158,9 @@ class Process_Internals:
                 "(expr_reads "
                 + cond_node_id
                 + " "
-                + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                + self.wfm_manager.get_waveform_from_source(
+                    self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                )
                 + ")\n"
             )
 
@@ -327,16 +329,26 @@ class Process_Internals:
             "./target"
         )
 
-        if (target_xml.attrib.get("kind") == "indexed_name"):
-            target_xml = target_xml.find("./prefix/named_entity")
-        else:
-            target_xml = target_xml.find("./named_entity")
+        # Oddly enough, we can get a target as a ref...
+        # The (hacky) solution? Find the real source.
+        while (target_xml.tag == "target"):
+
+            if (target_xml.attrib.get("kind") == "indexed_name"):
+                target_xml = target_xml.find("./prefix/named_entity")
+            else:
+                target_xml = target_xml.find("./named_entity")
+
+            target_xml = self.xml_root.find(
+                ".//*[@id=\"" + target_xml.attrib.get("ref") + "\"]"
+            )
 
         self.output.write(
             "(expr_writes "
             + node_id
             + " "
-            + self.id_manager.get_id_from_xml(target_xml.attrib.get("ref"))
+            + self.wfm_manager.get_waveform_from_source(
+                self.id_manager.get_id_from_xml(target_xml.attrib.get("id"))
+            )
             + ")\n"
         )
 
@@ -362,7 +374,9 @@ class Process_Internals:
                 "(expr_reads "
                 + node_id
                 + " "
-                + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                + self.wfm_manager.get_waveform_from_source(
+                    self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                )
                 + ")\n"
             )
 
@@ -417,7 +431,9 @@ class Process_Internals:
                 "(expr_reads "
                 + cond_node_id
                 + " "
-                + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                + self.wfm_manager.get_waveform_from_source(
+                    self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                )
                 + ")\n"
             )
 
@@ -540,7 +556,9 @@ class Process_Internals:
                 "(expr_reads "
                 + node_id
                 + " "
-                + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                + self.wfm_manager.get_waveform_from_source(
+                    self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+                )
                 + ")\n"
             )
 
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 7aa3a82..3e69ba5 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,8 +1,9 @@
 ## Target(s) Configuration #####################################################
 #MODEL_FILES = $(wildcard ../data/instructions/*.mod)
-MODEL_FILES = $(wildcard ../instr-scripts/*.mod)
+MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod)
 LEVEL_DIR = $(wildcard ../data/level/*.lvl)
-PROPERTY_FILE = ../data/property/unread_waveforms.pro
+#PROPERTY_FILE = ../data/property/unread_waveforms.pro
+PROPERTY_FILE = ../data/property/combinational_processes.pro
 VAR_PREFIX = "_anon_"
 
 ## Executables #################################################################