GP-6353: post-review

GP-6353:  what I could find
GP-6353: Fix lldb types.GP-6353: More type fixes.

Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py

@@ -562,6 +562,8 @@ def ghidra_trace_putval(value: str, pages: bool = True, *, is_mi: bool,
 
     STATE.require_tx()
     val = gdb.parse_and_eval(value)
+    if val.address is None:
+        raise gdb.GdbError(f"Value '{value}' has no address")
     try:
         start = int(val.address)
     except gdb.error as e:
@@ -1066,7 +1068,7 @@ def ghidra_trace_put_inferiors(*, is_mi: bool, **kwargs) -> None:
         put_inferiors()
 
 
-def put_available() -> List[util.Available]:
+def put_available() -> None:
     trace = STATE.require_trace()
     availables = util.AVAILABLE_INFO_READER.get_availables()
     keys = []

Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/hooks.py

@@ -456,7 +456,7 @@ def on_breakpoint_deleted(b: gdb.Breakpoint) -> None:
 
 
 @log_errors
-def on_before_prompt() -> object:
+def on_before_prompt(a: None) -> object:
     HOOK_STATE.end_batch()
     return None
 

Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/util.py

@@ -18,7 +18,7 @@ from collections import namedtuple
 import bisect
 from dataclasses import dataclass
 import re
-from typing import Callable, Dict, List, Optional, Set, Tuple, Union
+from typing import Callable, Dict, List, Optional, Sequence, Set, Tuple, Union
 
 import gdb
 
@@ -305,9 +305,9 @@ REGION_INFO_READER = _choose_region_info_reader()
 
 AVAILABLES_CMD = 'info os processes'
 AVAILABLE_PATTERN = re.compile("\\s*" +
-                            "(?P<pid>[0-9]+)\\s+" +
-                            "(?P<user>[0-9,A-Z,a-z]+)\\s+" +
-                            "(?P<command>.*)")
+                               "(?P<pid>[0-9]+)\\s+" +
+                               "(?P<user>[0-9,A-Z,a-z]+)\\s+" +
+                               "(?P<command>.*)")
 
 
 class AvailableInfoReader(object):
@@ -321,7 +321,7 @@ class AvailableInfoReader(object):
         pid = mat['pid']
         user = mat['user']
         command = mat['command']
-        return Available(pid, user, command)
+        return Available(int(pid), user, command)
 
     def get_availables(self) -> List[Available]:
         availables: List[Available] = []
@@ -365,12 +365,12 @@ class BreakpointLocation:
 
 # Quite a hack, but only needed for type annotations
 if not hasattr(gdb, 'BreakpointLocation'):
-    gdb.BreakpointLocation = BreakpointLocation
+    gdb.BreakpointLocation = BreakpointLocation  # type: ignore
 
 
 class BreakpointLocationInfoReader(object):
     @abstractmethod
-    def get_locations(self, breakpoint: gdb.Breakpoint) -> List[Union[
+    def get_locations(self, breakpoint: gdb.Breakpoint) -> Sequence[Union[
             BreakpointLocation, gdb.BreakpointLocation]]:
         pass
 
@@ -396,8 +396,10 @@ class BreakpointLocationInfoReaderV9(BreakpointLocationInfoReader):
         if breakpoint.location is None:
             return []
         try:
-            address = int(gdb.parse_and_eval(
-                breakpoint.location).address) & compute_max_addr()
+            loc_eval = gdb.parse_and_eval(breakpoint.location)
+            if loc_eval.address is None:
+                return []
+            address = int(loc_eval.address) & compute_max_addr()
             loc = BreakpointLocation(
                 address, breakpoint.enabled, thread_groups)
             return [loc]
@@ -407,7 +409,7 @@ class BreakpointLocationInfoReaderV9(BreakpointLocationInfoReader):
 
 
 class BreakpointLocationInfoReaderV13(BreakpointLocationInfoReader):
-    def get_locations(self, breakpoint: gdb.Breakpoint) -> List[Union[
+    def get_locations(self, breakpoint: gdb.Breakpoint) -> Sequence[Union[
             BreakpointLocation, gdb.BreakpointLocation]]:
         return breakpoint.locations