Docs and slightly better performance

pwndbg/commands/next.py

@@ -10,25 +10,32 @@ import pwndbg.next
 @pwndbg.commands.Command
 @pwndbg.commands.OnlyWhenRunning
 def nextjmp(*args):
-    pwndbg.next.break_next_branch()
+    """Breaks at the next jump instruction"""
+    if pwndbg.next.break_next_branch():
+        pwndbg.commands.context.context()
 
 @pwndbg.commands.Command
 @pwndbg.commands.OnlyWhenRunning
 def nextj(*args):
+    """Breaks at the next jump instruction"""
     nextjmp(*args)
 
 @pwndbg.commands.Command
 @pwndbg.commands.OnlyWhenRunning
 def nextjump(*args):
+    """Breaks at the next jump instruction"""
     nextjmp(*args)
 
 @pwndbg.commands.Command
 @pwndbg.commands.OnlyWhenRunning
 def nextcall(*args):
-    pwndbg.next.break_next_call()
+    """Breaks at the next call instruction"""
+    if pwndbg.next.break_next_call():
+        pwndbg.commands.context.context()
 
 @pwndbg.commands.Command
 @pwndbg.commands.OnlyWhenRunning
 def nextc(*args):
+    """Breaks at the next call instruction"""
     nextcall(*args)
 

pwndbg/disasm/arch.py

@@ -4,6 +4,8 @@ import capstone
 import collections
 from capstone import *
 
+debug = False
+
 groups = {v:k for k,v in globals().items() if k.startswith('CS_GRP_')}
 ops    = {v:k for k,v in globals().items() if k.startswith('CS_OP_')}
 access = {v:k for k,v in globals().items() if k.startswith('CS_AC_')}
@@ -40,6 +42,8 @@ class DisassemblyAssistant(object):
         enhancer.enhance_symbol(instruction)
         enhancer.enhance_conditional(instruction)
         enhancer.enhance_next(instruction)
+
+        if debug:
             print(enhancer.dump(instruction))
 
     def enhance_conditional(self, instruction):

pwndbg/next.py

@@ -36,7 +36,7 @@ def break_next_branch(address=None):
     ins = next_branch(address)
 
     if ins:
-        gdb.Breakpoint("*%#x" % ins.address, temporary=True)
+        gdb.Breakpoint("*%#x" % ins.address, internal=True, temporary=True)
         gdb.execute('continue')
         return ins