about summary refs log tree commit diff stats
path: root/miasm2/analysis/sandbox.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2018-06-22 10:28:38 +0200
committerGitHub <noreply@github.com>2018-06-22 10:28:38 +0200
commit9f040a7013f471ecb96c5f64e5ab3f139d1a09c7 (patch)
treef4f21334788d6c153ce08cead01e614349cdf700 /miasm2/analysis/sandbox.py
parent1c64ca68ff3ad2985d2c89b4b8a8e13ec282c0e1 (diff)
parent189d72985236b0b35586669e7d9309951ffdccb6 (diff)
downloadmiasm-9f040a7013f471ecb96c5f64e5ab3f139d1a09c7.tar.gz
miasm-9f040a7013f471ecb96c5f64e5ab3f139d1a09c7.zip
Merge branch 'master' into patch-2
Diffstat (limited to 'miasm2/analysis/sandbox.py')
-rw-r--r--miasm2/analysis/sandbox.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py
index e77b1669..b1147adb 100644
--- a/miasm2/analysis/sandbox.py
+++ b/miasm2/analysis/sandbox.py
@@ -57,16 +57,15 @@ class Sandbox(object):
                 cls.__init__(self, **kwargs)
 
         # Logging options
-        if self.options.singlestep:
-            self.jitter.jit.log_mn = True
-            self.jitter.jit.log_regs = True
+        self.jitter.set_trace_log(
+            trace_instr=self.options.singlestep,
+            trace_regs=self.options.singlestep,
+            trace_new_blocks=self.options.dumpblocs
+        )
 
         if not self.options.quiet_function_calls:
             log_func.setLevel(logging.INFO)
 
-        if self.options.dumpblocs:
-            self.jitter.jit.log_newbloc = True
-
     @classmethod
     def parser(cls, *args, **kwargs):
         """