Skip to content

Commit

Permalink
Remove the assert on get_register (#754)
Browse files Browse the repository at this point in the history
* Remove the `assert` on `get_register` + linting

Fixes #752
  • Loading branch information
hugsy committed Nov 28, 2021
1 parent 721ad4b commit 34a14bc
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions gef.py
Original file line number Diff line number Diff line change
Expand Up @@ -3041,18 +3041,21 @@ def get_register(regname):

@lru_cache()
def __get_register_for_selected_frame(regname, hash_key):
# 1st chance
try:
return parse_address(regname)
except gdb.error:
assert regname[0] == "$"
regname = regname[1:]
try:
value = gdb.selected_frame().read_register(regname)
return int(value)
except ValueError:
return None
except gdb.error:
return None
pass

# 2nd chance
try:
regname == regname.lstrip("$")
value = gdb.selected_frame().read_register(regname)
return int(value)
except (ValueError, gdb.error):
pass
return None


def get_path_from_info_proc():
for x in gdb.execute("info proc", to_string=True).splitlines():
Expand Down Expand Up @@ -8109,7 +8112,6 @@ def do_invoke(self, argv, *args, **kwargs):
Shdr.SHT_PREINIT_ARRAY: "PREINIT_ARRAY",
Shdr.SHT_GROUP: "GROUP",
Shdr.SHT_SYMTAB_SHNDX: "SYMTAB_SHNDX",
Shdr.SHT_NUM: "NUM",
Shdr.SHT_LOOS: "LOOS",
Shdr.SHT_GNU_ATTRIBUTES:"GNU_ATTRIBUTES",
Shdr.SHT_GNU_HASH: "GNU_HASH",
Expand Down

0 comments on commit 34a14bc

Please sign in to comment.