diff options
author | Andrew Burgess <aburgess@redhat.com> | 2022-09-01 14:01:11 +0100 |
---|---|---|
committer | Andrew Burgess <aburgess@redhat.com> | 2022-10-02 14:21:24 +0100 |
commit | 7df4240040277fb752fd010f5a947cf2d32bc3a5 (patch) | |
tree | a32440970f906c64b01f1d547a583250b0dcb76c /gdb/gdbarch.py | |
parent | 9a103324fee16bf4d0bc4fa7b19f5d937d47b881 (diff) | |
download | gdb-7df4240040277fb752fd010f5a947cf2d32bc3a5.zip gdb-7df4240040277fb752fd010f5a947cf2d32bc3a5.tar.gz gdb-7df4240040277fb752fd010f5a947cf2d32bc3a5.tar.bz2 |
gdb: add asserts to gdbarch_register_name
This commit adds asserts to gdbarch_register_name that validate the
parameters, and the return value.
The interesting thing here is that gdbarch_register_name is generated
by gdbarch.py, and so, to add these asserts, I need to update the
generation script.
I've added two new arguments for Functions and Methods (as declared in
gdbarch-components.py), these arguments are 'param_checks' and
'result_checks'. Each of these new arguments can be used to list some
expressions that are then used within gdb_assert calls in the
generated code.
The asserts that validate the API as described in the comment I added
to gdbarch_register_name a few commits back; the register number
passed in needs to be a valid cooked register number, and the result
being returned should not be nullptr.
Diffstat (limited to 'gdb/gdbarch.py')
-rwxr-xr-x | gdb/gdbarch.py | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gdb/gdbarch.py b/gdb/gdbarch.py index 696b302..da848fe 100755 --- a/gdb/gdbarch.py +++ b/gdb/gdbarch.py @@ -49,6 +49,11 @@ class _Component: setattr(self, key, kwargs[key]) components.append(self) + # It doesn't make sense to have a check of the result value + # for a function or method with void return type. + if self.type == "void" and self.result_checks: + raise Exception("can't have result checks with a void return type") + def get_predicate(self): "Return the expression used for validity checking." assert self.predicate and not isinstance(self.invalid, str) @@ -112,6 +117,8 @@ class Function(_Component): postdefault=None, invalid=None, printer=None, + param_checks=None, + result_checks=None, ): super().__init__( comment=comment, @@ -123,6 +130,8 @@ class Function(_Component): invalid=invalid, printer=printer, params=params, + param_checks=param_checks, + result_checks=result_checks, ) def ftype(self): @@ -444,6 +453,9 @@ with open("gdbarch.c", "w") as f: f" /* Do not check predicate: {c.get_predicate()}, allow call. */", file=f, ) + if c.param_checks: + for rule in c.param_checks: + print(f" gdb_assert ({rule});", file=f) print(" if (gdbarch_debug >= 2)", file=f) print( f""" gdb_printf (gdb_stdlog, "gdbarch_{c.name} called\\n");""", @@ -451,8 +463,15 @@ with open("gdbarch.c", "w") as f: ) print(" ", file=f, end="") if c.type != "void": - print("return ", file=f, end="") + if c.result_checks: + print("auto result = ", file=f, end="") + else: + print("return ", file=f, end="") print(f"gdbarch->{c.name} ({c.actuals()});", file=f) + if c.type != "void" and c.result_checks: + for rule in c.result_checks: + print(f" gdb_assert ({rule});", file=f) + print(" return result;", file=f) print("}", file=f) print(file=f) print("void", file=f) |