DeforaNetworks/manticore
3
0
Fork 0
Code Releases Activity

Switch to ssh-style verbosity CLI flags (#222)

Browse Source 
* switch to ssh-style verbosity CLI flags

* add register logging to level 4
This commit is contained in:
JP Smith
2017-05-04 14:40:22 -05:00
committed by GitHub
parent 538dfea8fe
commit 93f9d77f40
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manticore/__main__.py
+2 -5
View File
@@ -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))
manticore/manticore.py
+2 -2
View File
@@ -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]