USER: add option to remove reaching definitions to userdata

Author: sipma

chb/astinterface/ASTInterface.py

@@ -988,6 +988,7 @@ def introduce_ssa_variables(
         for (reg, locs) in rdeflocs.items():
             for lst in locs:
                 if len(lst) > 0:
+                    # print("DEBUG: " + str(reg) + ": [" + ", ".join(str(loc) for loc in lst) + "]")
                     loc1 = lst[0]
                     vtype = None
                     if loc1 in ftypes:

chb/userdata/UserHints.py

@@ -635,7 +635,41 @@ def __str__(self) -> str:
             "action: " + self.action
             + "; locs: [" + ", ".join(self.locs) + "]"
             + "; name: " + self.name)
-            
+
+
+class RemoveReachingDefinitions:
+
+    def __init__(self, rdefspec: Dict[str, Any]) -> None:
+        self._rdefspec = rdefspec
+
+    @property
+    def rdefspec(self) -> Dict[str, Any]:
+        return self._rdefspec
+
+    @property
+    def uselocs(self) -> List[str]:
+        return self.rdefspec.get("uselocs", [])
+
+    @property
+    def rdeflocs(self) -> List[str]:
+        return self.rdefspec.get("rdeflocs", [])
+
+    @property
+    def var(self) -> str:
+        return self.rdefspec.get("var", "__no_var__")
+
+    def to_xml(self, node: ET.Element) -> None:
+        xremrdef = ET.Element("remove-var-rdefs")
+        node.append(xremrdef)
+        xremrdef.set("var", self.var)
+        xremrdef.set("uselocs", ",".join(self.uselocs))
+        xremrdef.set("rdeflocs", ",".join(self.rdeflocs))
+
+    def __str__(self) -> str:
+        return (
+            "var: " + self.var
+            + "; uselocs: " + ", ".join(self.uselocs)
+            + "; rdeflocs: " + ", ".join(self.rdeflocs))
 
 
 class FunctionAnnotation:
@@ -678,6 +712,14 @@ def typingrules(self) -> List[TypingRule]:
             result.append(tr)
         return result
 
+    @property
+    def remove_reaching_definitions(self) -> List[RemoveReachingDefinitions]:
+        result: List[RemoveReachingDefinitions] = []
+        for d in self.fnannotation.get("remove-reaching-definitions", []):
+            rrd = RemoveReachingDefinitions(d)
+            result.append(rrd)
+        return result
+
     def has_register_variable_introduction(self, iaddr: str) -> bool:
         return iaddr in self.register_variable_introductions
 
@@ -714,6 +756,11 @@ def to_xml(self, node: ET.Element) -> None:
             node.append(xtypingrules)
             for tr in self.typingrules:
                 tr.to_xml(xtypingrules)
+        if len(self.remove_reaching_definitions) > 0:
+            xrrds = ET.Element("remove-rdefs")
+            node.append(xrrds)
+            for rd in self.remove_reaching_definitions:
+                rd.to_xml(xrrds)
 
     def __str__(self) -> str:
         lines: List[str] = []

chb/util/dotutil.py

@@ -74,7 +74,7 @@ def print_dot_subgraphs(
     if len(subgraphs) == 0:
         print("No subgraphs supplied")
         return "error"
-    if len(subgraphs) > 10:
+    if len(subgraphs) > 20:
         print("Too many subgraphs: " + str(len(subgraphs)))
         return "error"