diff --git a/manticore/__main__.py b/manticore/__main__.py index 370e3bc..9ed912c 100644 --- a/manticore/__main__.py +++ b/manticore/__main__.py @@ -23,7 +23,7 @@ def parse_arguments(): parser = argparse.ArgumentParser(description='Symbolically analyze a program') parser.add_argument('--workspace', type=str, default=None, help='A folder name for temporaries and results. (default mcore_?????)') - parser.add_argument('--verbose', action='store_true', help='Enable debug mode.') + parser.add_argument('-v', action='count', default=1, help='Specify verbosity level from -v to -vvvv') parser.add_argument('--profile', action='store_true', help='Enable profiling mode.') parser.add_argument('--buffer', type=str, help='Specify buffer to make symbolic') @@ -106,10 +106,7 @@ def main(): if args.assertions: m.load_assertions(args.assertions) - if args.verbose: - m.verbosity = 4 - else: - m.verbosity = 1 + m.verbosity = args.v logger.info('Loading program: {}'.format(args.programs)) logger.info('Workspace: {}'.format(m.workspace)) diff --git a/manticore/manticore.py b/manticore/manticore.py index 6e546d0..85c0a1d 100644 --- a/manticore/manticore.py +++ b/manticore/manticore.py @@ -274,8 +274,8 @@ class Manticore(object): [('MAIN', logging.INFO), ('EXECUTOR', logging.INFO)], [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG)], [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG), ('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG)], - [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG), ('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG)], - [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG), ('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG), ('SMT', logging.DEBUG), ('REGISTERS', logging.DEBUG)]] + [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG), ('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG), ('REGISTERS', logging.DEBUG)], + [('MAIN', logging.INFO), ('EXECUTOR', logging.DEBUG), ('MODEL', logging.DEBUG), ('MEMORY', logging.DEBUG), ('CPU', logging.DEBUG), ('REGISTERS', logging.DEBUG), ('SMT', logging.DEBUG)]] # Takes a value and ensures it's in a certain range def clamp(val, minimum, maximum): return sorted((minimum, val, maximum))[1]