Use release versions...

Improve disassembler output
Add funding

Author: rocky

.circleci/config.yml

@@ -14,9 +14,10 @@ jobs:
         password: $DOCKERHUB_PASSWORD
     steps:
       - checkout  # checkout source code to working directory
-      - run: pip install --local -e git+https://github.com/rocky/python-xdis.git#egg=xdis
+      - run: pip install xdis
       - run: pip install --local -e git+https://github.com/rocky/pytracer.git#egg=tracer
-      - run: pip install --local -e git+https://github.com/rocky/python-filecache.git#egg=pyficache
+      - run: pip install pyficache
+      - run: pip install uncompyle6
       - run: pip install --local -e git+https://github.com/rocky/python-decompile3.git#egg=decompyle3
       - run: pip install --local -e .
       - run: pip install -r requirements-dev.txt

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [rocky]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: rocky
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

trepan/lib/disassemble.py

@@ -17,6 +17,7 @@
     get_instructions_bytes,
     get_opcode,
 )
+from xdis.instruction import Instruction
 from xdis.std import distb
 from xdis.version_info import PYTHON_VERSION_TRIPLE
 
@@ -368,11 +369,17 @@ def null_print(x):
                     hasattr(opc, "opcode_extended_fmt")
                     and opc.opname[op] in opc.opcode_extended_fmt
                 ):
-                    result= opc.opcode_extended_fmt[opc.opname[op]](
+                    tos_str, start_offset = opc.opcode_extended_fmt[opc.opname[op]](
                         opc, list(reversed(instructions))
                     )
-                    if result is not None:
-                        argrepr = result[0]
+                    if start_offset is not None:
+                        argrepr = tos_str
+                        new_instruction = list(instructions[-1])
+                        new_instruction[-2] = tos_str
+                        new_instruction[-1] = start_offset
+                        del instructions[-1]
+                        instructions.append(Instruction(*new_instruction))
+
                 pass
         elif asm_format in ("extended", "extended-bytes"):
             # Note: instr.arg is also None
@@ -432,7 +439,8 @@ def section(msg_str):
     # dis(msg, msg_nocr, errmsg, section, curframe,
     #     start_offset=10, end_offset=20, highlight='dark')
     print("-" * 40)
-    for asm_format in ("extended", "bytes", "extended-bytes", "std"):
+    # for asm_format in ("std", "extended", "bytes", "extended-bytes"):
+    for asm_format in ("extended", "bytes", "extended-bytes"):
         print("Format is", asm_format)
         dis(msg, msg_nocr, section, errmsg, disassemble, asm_format=asm_format)
         print("=" * 30)