diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2015-10-27 22:48:56 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2015-10-27 22:48:56 +0100 |
| commit | 3f9071a50671bb7a72d68e2dece83795aa9f9728 (patch) | |
| tree | 0772e7aa28487f314206b9d5658981a56162d865 /miasm2/analysis/debugging.py | |
| parent | 6e0eb4f5eb8c53fc6002b955b96a5c06213d220f (diff) | |
| parent | 5dbf046bbe07a28485a84eca14405d271d1ea7fa (diff) | |
| download | miasm-3f9071a50671bb7a72d68e2dece83795aa9f9728.tar.gz miasm-3f9071a50671bb7a72d68e2dece83795aa9f9728.zip | |
Merge pull request #244 from a-vincent/allow_int_base_selection
In interactive use, allow C-like prefixes to choose the base of integers
Diffstat (limited to 'miasm2/analysis/debugging.py')
| -rw-r--r-- | miasm2/analysis/debugging.py | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/miasm2/analysis/debugging.py b/miasm2/analysis/debugging.py index 3fffbf66..74551a72 100644 --- a/miasm2/analysis/debugging.py +++ b/miasm2/analysis/debugging.py @@ -273,10 +273,7 @@ class DebugCmd(cmd.Cmd, object): def add_breakpoints(self, bp_addr): for addr in bp_addr: - if "0x" in addr: - addr = int(addr, 16) - else: - addr = int(addr) + addr = int(addr, 0) good = True for i, dbg_obj in enumerate(self.dbg.bp_list): @@ -359,17 +356,11 @@ class DebugCmd(cmd.Cmd, object): args = arg.split(" ") if len(args) >= 2: - if "0x" in args[1]: - size = int(args[1], 16) - else: - size = int(args[1]) + size = int(args[1], 0) else: size = 0xF - if "0x" in args[0]: - addr = int(args[0], 16) - else: - addr = int(args[0]) + addr = int(args[0], 0) self.dbg.watch_mem(addr, size) @@ -445,16 +436,10 @@ class DebugCmd(cmd.Cmd, object): else: args = arg.split(" ") if len(args) >= 2: - if "0x" in args[1]: - size = int(args[1], 16) - else: - size = int(args[1]) + size = int(args[1], 0) else: size = 0xF - if "0x" in args[0]: - addr = int(args[0], 16) - else: - addr = int(args[0]) + addr = int(args[0], 0) self.dbg.get_mem(addr, size) |