CMD: add logging options

Author: sipma

chb/cmdline/chkx

@@ -376,8 +376,7 @@ def parse() -> argparse.Namespace:
         help="output intermediate information")
     analyzecmd.add_argument(
         "--save_asm",
-        default="yes",
-        choices=["yes", "no"],
+        action="store_true",
         help='save asm listing in analysis directory')
     analyzecmd.add_argument(
         "--save_asm_cfg_info",
@@ -1362,6 +1361,10 @@ def parse() -> argparse.Namespace:
         "--save_asm",
         action="store_true",
         help="save the assembly file")
+    relationalprepare.add_argument(
+        "--collect_diagnostics",
+        action="store_true",
+        help="save diagnostic information in diagnostics log")
     relationalprepare.add_argument(
         "--hints",
         nargs="*",

chb/cmdline/commandutil.py

@@ -396,7 +396,7 @@ def analyzecmd(args: argparse.Namespace) -> NoReturn:
     doextract: bool = args.extract
     verbose: bool = args.verbose
     collectdiagnostics: bool = args.collect_diagnostics
-    save_asm: str = args.save_asm
+    save_asm: bool = args.save_asm
     save_asm_cfg_info: bool = args.save_asm_cfg_info
     thumb: List[str] = args.thumb
     preamble_cutoff: int = args.preamble_cutoff
@@ -549,7 +549,6 @@ def analyzecmd(args: argparse.Namespace) -> NoReturn:
                 verbose=verbose,
                 collectdiagnostics=collectdiagnostics,
                 preamble_cutoff=preamble_cutoff,
-                save_asm=save_asm,
                 save_asm_cfg_info=save_asm_cfg_info)
         except subprocess.CalledProcessError as e:
             print_error(str(e.output))
@@ -584,6 +583,7 @@ def analyzecmd(args: argparse.Namespace) -> NoReturn:
                 analysisrepeats=analysisrepeats,
                 iterations=iterations,
                 verbose=verbose,
+                save_asm=save_asm,
                 construct_all_functions=construct_all_functions,
                 collectdiagnostics=collectdiagnostics,
                 preamble_cutoff=preamble_cutoff)

chb/cmdline/relationalcmds.py

@@ -153,6 +153,7 @@ def relational_prepare_command(args: argparse.Namespace) -> NoReturn:
     xpatchresults: Optional[str] = args.patch_results_file
     xprint: bool = not args.json
     xssa: bool = args.ssa
+    collectdiagnostics = args.collect_diagnostics
     xconstruct_all_functions: bool = args.construct_all_functions
     loglevel: str = args.loglevel
     logfilename: Optional[str] = args.logfilename
@@ -241,6 +242,9 @@ def relational_prepare_command(args: argparse.Namespace) -> NoReturn:
             lines.append(" - New code inserted in the following memory regions:")
             for (x, y) in xcomparison.newcode:
                 lines.append("    * From " + x + " to " + y)
+        if len(xcomparison.messages) > 0:
+            lines.append("\nMessages:")
+            lines.append("\n".join(xcomparison.messages))
         lines.append("=" * 80)
         lines.append(
             "||" + (str(datetime.datetime.now()) + "  ").rjust(76) + "||")
@@ -300,12 +304,13 @@ def relational_prepare_command(args: argparse.Namespace) -> NoReturn:
         fns_include=fns_include,
         fns_exclude=fns_exclude,
         use_ssa=xssa,
-        thumb=True)
+        thumb=xcomparison.is_thumb)
 
     try:
         am.analyze(
             iterations=10,
             save_asm=xsave_asm,
+            collectdiagnostics=collectdiagnostics,
             construct_all_functions=xconstruct_all_functions)
     except subprocess.CalledProcessError as e:
         print(e.output)