PIRINSPECTOR: allow choice of output format

Author: sipma

chb/ast/ASTViewer.py

@@ -382,10 +382,13 @@ def visit_binary_expression(self, expr: AST.ASTBinaryOp) -> None:
             name,
             labeltxt="binop:" + expr.op + ":" + str(expr.exprid) + connections,
             color=nodecolors["expr"])
-        self.add_edge(name, self.expr_name(expr.exp1), labeltxt="exp1")
-        self.add_edge(name, self.expr_name(expr.exp2), labeltxt="exp2")
-        expr.exp1.accept(self)
-        expr.exp2.accept(self)
+        if self.cutoff_at_stmt() or self.cutoff_at_instr():
+            return
+        else:
+            self.add_edge(name, self.expr_name(expr.exp1), labeltxt="exp1")
+            self.add_edge(name, self.expr_name(expr.exp2), labeltxt="exp2")
+            expr.exp1.accept(self)
+            expr.exp2.accept(self)
 
     def visit_address_of_expression(self, expr: AST.ASTAddressOf) -> None:
         name = self.expr_name(expr)

chb/ast/astdotutil.py

@@ -214,16 +214,17 @@ def __str__(self) -> str:
 
 def print_dot(
         filename: str,
-        g: "ASTDotGraph") -> str:
+        g: "ASTDotGraph",
+        fileformat: str = "pdf") -> str:
     dotfilename = filename + ".dot"
-    pdffilename = filename + ".pdf"
+    pdffilename = filename + "." + fileformat
 
     # write graph to dot format
     with open(dotfilename, "w") as fp:
         fp.write(str(g))
 
     # convert dot file to pdf
-    cmd = ["dot", "-Tpdf", "-o", pdffilename, dotfilename]
+    cmd = ["dot", "-T%s" % fileformat, "-o", pdffilename, dotfilename]
     try:
         subprocess.call(cmd, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:

chb/ast/astutil.py

@@ -181,14 +181,15 @@ def viewastcmd(args: argparse.Namespace) -> NoReturn:
     function: Optional[str] = args.function
     level: str = args.level
     outputfilename: str = args.outputfile
+    fileformat: str = args.fileformat
     cutoff: Optional[str] = args.cutoff
 
     with open(pirfile, "r") as fp:
         pirjson = json.load(fp)
 
     faddr = get_function_addr(pirjson, function)
     g = view_ast_function(faddr, level, pirjson, cutoff)
-    DU.print_dot(outputfilename, g)
+    DU.print_dot(outputfilename, g, fileformat=fileformat)
     exit(0)
 
 
@@ -199,6 +200,7 @@ def viewstmtcmd(args: argparse.Namespace) -> NoReturn:
     function: Optional[str] = args.function
     stmtid: int = args.stmtid
     provenance: bool = args.provenance
+    fileformat: str = args.fileformat
     outputfilename: str = args.output
 
     with open(pirfile, "r") as fp:
@@ -218,7 +220,7 @@ def viewstmtcmd(args: argparse.Namespace) -> NoReturn:
             else:
                 g = viewer.to_graph(stmt)
 
-        DU.print_dot(outputfilename, g)
+        DU.print_dot(outputfilename, g, fileformat=fileformat)
     exit(0)
 
 
@@ -229,6 +231,7 @@ def viewinstrcmd(args: argparse.Namespace) -> NoReturn:
     function: Optional[str] = args.function
     instrid: int = args.instrid
     provenance: bool = args.provenance
+    fileformat: str = args.fileformat
     outputfilename: str = args.output
 
     with open(pirfile, "r") as fp:
@@ -251,7 +254,7 @@ def viewinstrcmd(args: argparse.Namespace) -> NoReturn:
             else:
                 g = viewer.instr_to_graph(instr)
 
-            DU.print_dot(outputfilename, g)
+            DU.print_dot(outputfilename, g, fileformat=fileformat)
 
     exit(0)
 

chb/ast/pirinspector

@@ -85,6 +85,12 @@ def parse() -> argparse.Namespace:
         help="stop expansion at stmt or instruction level",
         choices=["stmt", "instr"],
     )
+    viewastcmd.add_argument(
+        "--fileformat",
+        help="desired format for output file (default is pdf)",
+        choices=["pdf", "png"],
+        default=["pdf"]
+    )
     viewastcmd.add_argument(
         "-o",
         "--outputfile",
@@ -104,6 +110,12 @@ def parse() -> argparse.Namespace:
         help="show associated low-level instructions",
         action="store_true",
     )
+    viewstmtcmd.add_argument(
+        "--fileformat",
+        help="desired format for output file (default is pdf)",
+        choices=["pdf", "png"],
+        default=["pdf"]
+    )
     viewstmtcmd.add_argument(
         "-o", "--output",
         help="name of output graph file (without extension)",
@@ -123,6 +135,12 @@ def parse() -> argparse.Namespace:
         help="show associated low-level instruction",
         action="store_true",
     )
+    viewinstrcmd.add_argument(
+        "--fileformat",
+        help="desired format for output file (default is pdf)",
+        choices=["pdf", "png"],
+        default=["pdf"]
+    )
     viewinstrcmd.add_argument(
         "-o",
         "--output",