Improve disassemble range parsing/handling

Author: rocky

trepan/lib/disassemble.py

@@ -94,11 +94,11 @@ def dis(
     mess = ""
     if start_line > 1:
         mess += "from line %d " % start_line
-    elif start_offset > 1:
+    if start_offset >= 0:
         mess = "from offset %d " % start_offset
-    if end_line:
+    if end_line > 0:
         mess += "to line %d" % end_line
-    elif end_offset:
+    if end_offset:
         mess += "to offset %d" % end_offset
 
     sectioned = False
@@ -406,10 +406,10 @@ def disassemble_bytes(
     orig_msg: Callable,
     orig_msg_nocr: Callable,
     code: types.CodeType,
-    lasti=-1,
-    cur_line=0,
-    start_line=-1,
-    end_line=None,
+    lasti: int =-1,
+    cur_line: int =0,
+    start_line: int =-1,
+    end_line: int = -1,
     relative_pos=False,
     line_starts={},
     style="none",
@@ -425,7 +425,7 @@ def null_print(_):
         return None
 
     instructions = []
-    if end_line is None:
+    if end_line < 0:
         end_line = 10000
     elif relative_pos:
         end_line += start_line - 1

trepan/processor/command/disassemble.py

@@ -154,6 +154,7 @@ def run(self, args):
                 eval_args = args[1]
             try:
                 obj = self.proc.eval(eval_args, show_error=False)
+
             except Exception:
                 obj = None
             else:
@@ -187,6 +188,7 @@ def run(self, args):
 
         if is_offset:
             opts["start_offset"] = start
+            opts["start_line"] = -1
         else:
             opts["start_line"] = start
             if last is None:
@@ -203,6 +205,7 @@ def run(self, args):
 
         if last_is_offset:
             opts["end_offset"] = last
+            opts["end_line"] = -1
         else:
             opts["end_line"] = last
             opts["end_offset"] = None
@@ -240,7 +243,6 @@ def run(self, args):
                     return
 
         # We now have all information. Do the listing.
-        breakpoint()
         (obj, proc.list_offset) = dis(
             self.msg, self.msg_nocr, self.section, self.errmsg, obj, **opts
         )
@@ -269,25 +271,22 @@ def doit(cmd, args):
     command = DisassembleCommand(cp)
     prefix = "-" * 20 + " disassemble "
 
-    doit(command, ["disassemble", f"{doit_return_line}, {doit_return_line+2}"])
+    print(prefix + 'doit')
+    doit(command, ['disassemble', 'doit()'])
 
-    print(prefix + "os.path")
-    doit(command, ["disassemble", "cp.errmsg()"])
+    print(prefix + "*0, *10")
+    doit(command, ["disassemble", "*0, *10"])
 
-    print(prefix + "cp.errmsg()")
-    doit(command, ["disassemble", "cp.errmsg()"])
+    doit(command, ["disassemble", f"{doit_return_line}, {doit_return_line+2}"])
+
+    # FIXME
+    # print(prefix + "os.path")
+    # doit(command, ["disassemble", "os.path"])
 
     print(prefix + "cp.errmsg()")
     doit(command, ["disassemble", "cp.errmsg()"])
 
-    # print(prefix)
-    # doit(command, ['disassemble']) # no good
-
-    # print(prefix + 'me')
-    # doit(command, ['disassemble', 'me()']) # reports invalid function correctly
-
-    # print(prefix + "*0 +248")
-    # doit(command, ["disassemble", "*0,", "+248"])
+    # -----------------------
 
     # print(prefix + '+ 2-1')
     # doit(command, ['disassemble', '+', '2-1']) # not valid?

trepan/processor/location.py

@@ -279,15 +279,18 @@ def resolve_address_location(proc, location) -> Optional[Location]:
     elif location.line_number is not None:
         filename = frame2file(proc.core, curframe, canonic=False)
         offset = location.line_number
-        is_address = location.is_address
+        mod_or_func_or_code = proc.list_object
+    elif location.offset is not None:
+        filename = frame2file(proc.core, curframe, canonic=False)
+        offset = location.offset
         mod_or_func_or_code = proc.list_object
     else:
         proc.errmsg(
             f"Location {location} doesn't have enough information for a location."
         )
         return INVALID_LOCATION
 
-    return Location(filename, offset, is_address, mod_or_func_or_code, offset)
+    return Location(filename, offset, location.is_address, mod_or_func_or_code, offset)
 
 
 # Demo it

trepan/processor/parse/semantics.py

@@ -76,21 +76,31 @@ def n_location(self, node):
             # If there is a line number, it is the last token of a location
             if len(node) > 1 and node[-1] == "NUMBER":
                 line_number = node[-1].value
+                is_address = False
+            else:
+                offset = 0
+                is_address = True
         elif node[0] == "FUNCNAME":
             method = node[0].value[:-2]
             offset = 0
+            is_address = True
         elif node[0] == "NUMBER":
+            is_address = False
             line_number = node[0].value
+        elif node[0] == "ADDRESS":
+            is_address = True
+            offset = int(node[0].value[1:])
         else:
             assert True, "n_location: Something's is wrong; node[0] is %s" % node[0]
-        self.result = Location(path, line_number, False, method, offset=offset)
-        node.location = Location(path, line_number, False, method, offset=offset)
+        self.result = Location(path, line_number, is_address, method, offset=offset)
+        node.location = Location(path, line_number, is_address, method, offset=offset)
         self.prune()
 
     def n_NUMBER(self, node):
         self.result = Location(None, node.value, False, None, offset=None)
 
     def n_ADDRESS(self, node):
+        breakpoint()
         self.result = Location(None, None, True, None, offset=int(node.value[1:]))
 
     def n_FUNCNAME(self, node):
@@ -383,7 +393,7 @@ def doit(fn, line):
     #     )
     # lines = (
     #     "*10",
-    #     "@10",
+    #     "*10",
     #     "/tmp/foo.py:1, *5",
     #     "../foo.py:0,  +5",
     #     "../foo.py:5,  *30",