allow enabling python harness log output via --debug argument

Author: Scepticz

harness/fuzzware_harness/exit.py

@@ -23,11 +23,10 @@ def invoke_exit_callbacks(status, kill_signal=-1):
     """
     global exit_hooks
 
-    from .globs import debug_enabled, uc
+    from .globs import uc
 
     for fn in exit_hooks:
-        if debug_enabled:
-            logger.debug(f"Calling exit hook {exit_hooks}")
+        logger.debug(f"Calling exit hook {exit_hooks}")
         try:
             fn(uc)
         except:

harness/fuzzware_harness/globs.py

@@ -1,4 +1,3 @@
-debug_enabled = False
 input_file_name = None
 uc = None
 regions = {}

harness/fuzzware_harness/harness.py

@@ -17,6 +17,7 @@
 from .util import (bytes2int, load_config_deep, parse_address_value,
                    parse_symbols, resolve_region_file_paths)
 
+logging.basicConfig(stream=sys.stdout, level=logging.WARNING)
 logger = logging.getLogger("emulator")
 
 def unicorn_trace_syms(uc, address, size=0, user_data=None):
@@ -371,11 +372,8 @@ def main():
         logger.error("input file is no regular file")
         sys.exit(1)
 
-    debug_flags = [args.trace_memory, args.trace_funcs, args.breakpoints, args.gdb_port != 0]
-    if any(debug_flags):
-        args.debug = True
-
-    globs.debug_enabled = args.debug
+    if args.debug:
+        logger.setLevel(logging.DEBUG)
 
     uc = configure_unicorn(args)
     globs.uc = uc

harness/fuzzware_harness/user_hooks/__init__.py

@@ -9,7 +9,6 @@
 
 from .. import globs
 from ..exit import do_exit
-from ..globs import debug_enabled
 
 
 logger = logging.getLogger("emulator")
@@ -103,8 +102,7 @@ def add_func_hook(uc, addr, func, do_return=True):
 def func_hook_handler(uc, addr, size, user_data):
     if addr in func_hooks:
         for hook in func_hooks[addr]:
-            if debug_enabled:
-                logger.info("Calling hook %s at %#08x" % (func_hooks[addr].__name__, addr))
+            logger.info("Calling hook %s at %#08x" % (func_hooks[addr].__name__, addr))
             try:
                 hook(uc)
             except: