ASTCMD: add call clobber to rdefs graph

Author: sipma

chb/cmdline/astcmds.py

@@ -405,7 +405,7 @@ def buildast(args: argparse.Namespace) -> NoReturn:
                 functions_failed += 1
                 continue
 
-            if show_reachingdefs is not None:
+            if show_reachingdefs:
                 if output_reachingdefs is None:
                     UC.print_error("\nSpecify a file to save the reaching defs")
                     continue
@@ -421,7 +421,12 @@ def buildast(args: argparse.Namespace) -> NoReturn:
 
                 for reg in reachingdefs_registers:
                     print_reachingdefs(
-                        app, astinterface, output_reachingdefs + "__" + reg, fileformat, f, reg)
+                        app,
+                        astinterface,
+                        output_reachingdefs + "__" + reg,
+                        fileformat,
+                        f,
+                        reg)
 
         else:
             UC.print_error("Unable to find function " + faddr)
@@ -488,6 +493,24 @@ def print_reachingdefs(
                             rdefinstrs = rdefs,
                             useinstrs=[iaddr])
                         dotpaths.append((cfgpath, rdef, iaddr))
+                elif rdef.endswith("_clobber"):
+                    rdefaddr = rdef[:-8]
+                    rdblock = f.containing_block(rdefaddr)
+                    graph = UG.DirectedGraph(list(f.cfg.blocks.keys()), f.cfg.edges)
+                    graph.find_paths(rdblock, cblock)
+                    for (i, p) in enumerate(
+                            sorted(graph.get_paths(), key=lambda p: len(p))):
+                        cfgpath = DotRdefPath(
+                            "path_" + str(rdef) + "_" + str(iaddr) + "_" + str(i),
+                            f,
+                            astinterface,
+                            p,
+                            subgraph=True,
+                            nodeprefix = str(iaddr) + str(rdef) + str(i) + ":",
+                            rdefinstrs = rdefs,
+                            useinstrs=[iaddr])
+                        dotpaths.append((cfgpath, rdef, iaddr))
+
                 else:
                     rdblock = f.containing_block(rdef)
                     graph = UG.DirectedGraph(list(f.cfg.blocks.keys()), f.cfg.edges)

chb/cmdline/chkx

@@ -745,7 +745,7 @@ def parse() -> argparse.Namespace:
     buildast.add_argument(
         "--show_reachingdefs",
         action="store_true",
-        help="create a dot file for the reaching defs of <reg>")
+        help="create dot files for the reaching defs of untyped registers")
     buildast.add_argument(
         "--output_reachingdefs",
         help="name of output file (without extension) to store dot/pdf file of reachingdefs")

chb/cmdline/runcmds.py

@@ -177,7 +177,7 @@ def run_commands(args: argparse.Namespace) -> NoReturn:
                 opcode_output["opcode-distribution"] = opcode_distribution
                 opcode_output["unknowns"] = unknowns
                 with open(outputfilename, "w") as fp:
-                    json.dump(opcode_output, fp, indent=2)
+                    json.dump(opcode_output, fp, indent=2, sort_keys=True)
             else:
                 print("\nOpcode distribution")
                 for (opc, c) in sorted(opcode_distribution.items()):