Import disasm folder gdblib (#2260)

pwndbg/color/disasm.py

@@ -6,7 +6,6 @@ import capstone
 
 import pwndbg.chain
 import pwndbg.color.context as C
-import pwndbg.gdblib.disasm.jump
 from pwndbg.color import ColorConfig
 from pwndbg.color import ColorParamSpec
 from pwndbg.color import ljust_colored

pwndbg/gdblib/__init__.py

@@ -31,6 +31,14 @@ def load_gdblib() -> None:
     import pwndbg.gdblib.argv
     import pwndbg.gdblib.bpoint
     import pwndbg.gdblib.ctypes
+    import pwndbg.gdblib.disasm
+    import pwndbg.gdblib.disasm.aarch64
+    import pwndbg.gdblib.disasm.arm
+    import pwndbg.gdblib.disasm.mips
+    import pwndbg.gdblib.disasm.ppc
+    import pwndbg.gdblib.disasm.riscv
+    import pwndbg.gdblib.disasm.sparc
+    import pwndbg.gdblib.disasm.x86
     import pwndbg.gdblib.dynamic
     import pwndbg.gdblib.elf
     import pwndbg.gdblib.events

pwndbg/gdblib/disasm/jump.py

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-from capstone import CS_GRP_JUMP
-
-import pwndbg.gdblib.arch
-import pwndbg.gdblib.disasm.x86
-
-
-def is_jump_taken(instruction):
-    """
-    Attempt to determine if a conditional instruction is executed.
-    Only valid for the current instruction.
-
-    Returns:
-        Returns True IFF the current instruction is a conditional
-        *or* jump instruction, and it is taken.
-
-        Returns False in all other cases.
-    """
-    if CS_GRP_JUMP not in instruction.groups:
-        return False
-    if pwndbg.gdblib.regs.pc != instruction.address:
-        return False
-
-    return {
-        "i386": pwndbg.gdblib.disasm.x86.is_jump_taken,
-        "x86-64": pwndbg.gdblib.disasm.x86.is_jump_taken,
-    }.get(pwndbg.gdblib.arch.current, lambda *a: False)(instruction)

pyproject.toml

@@ -90,7 +90,6 @@ module = [
     "pwndbg.commands.telescope",
     "pwndbg.commands.version",
     "pwndbg.exception",
-    "pwndbg.gdblib.disasm.jump",
     "pwndbg.gdblib.dt",
     "pwndbg.gdblib.dynamic",
     "pwndbg.gdblib.events",