Support for reading stdin, better timeout display.

pano/decompiler.py

@@ -140,7 +140,7 @@ def _decompile_with_loader(loader, only_func_name=None) -> Decompilation:
             if target > 1 and loader.lines[target][1] == "jumpdest":
                 target += 1
 
-            @timeout_decorator.timeout(120, use_signals=True)
+            @timeout_decorator.timeout(60*3, use_signals=True)
             def dec():
                 trace = VM(loader).run(target, stack=stack, timeout=60)
                 explain("Initial decompiled trace", trace[1:])

pano/prettify.py

@@ -658,8 +658,8 @@ def pretty_line(r, add_color=True):
         yield "stop"
 
     elif opcode(r) == "undefined":
-        _, *params = r
-        yield COLOR_WARNING + "..." + ENDC + COLOR_GRAY + f"  # unusual jump {params}, couldn't decompile, sorry" + ENDC
+        params = tuple(r[1:])
+        yield COLOR_WARNING + "..." + ENDC + COLOR_GRAY + f"  # Decompilation aborted, sorry: {params}" + ENDC
 
     elif opcode(r) == "invalid":
         _, *rest = r

pano/vm.py

@@ -106,7 +106,7 @@ def __init__(self, vm, start, safe, stack, condition=True, trace=None):
 
     def make_trace(self):
         if self.trace is None:
-            return ["...unterminated..."]
+            return [("undefined", "decompilation didn't finish")]
 
         begin_vars = []
         if self.is_label():
@@ -346,7 +346,7 @@ def _run(self, start, safe, stack, condition):
 
         if i not in lines:
             if type(i) != int:
-                return [("undefined", "remco jump", i)]
+                return [("undefined", "jump to a parameter computed at runtime", i)]
             else:
                 return [("invalid", "jumdest", i)]
 

panoramix.py

@@ -73,7 +73,14 @@ def print_decompilation(this_addr):
         if not sys.argv[2].startswith("--"):
             function_name = sys.argv[2]
 
-    decompilation = decompile_address(this_addr, function_name)
+    if this_addr == '-':
+        this_addr = sys.stdin.read().strip()
+
+    if len(this_addr) == 42:
+        decompilation = decompile_address(this_addr, function_name)
+    else:
+        decompilation = decompile_bytecode(this_addr, function_name)
+
     print(decompilation.text)