[binutils-gdb] gdbserver: Add assert in find_register_by_number

Thiago Bauermann bauermann@sourceware.org
Wed Feb 1 21:33:02 GMT 2023


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cbd02f9fa521a6cb21c04b15ee7671c8bb4be55b

commit cbd02f9fa521a6cb21c04b15ee7671c8bb4be55b
Author: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Date:   Tue Aug 16 17:18:47 2022 +0000

    gdbserver: Add assert in find_register_by_number
    
    It helped me during development, catching bugs closer to when they actually
    happened.
    
    Also remove the equivalent gdb_assert in regcache_raw_read_unsigned, since
    it's checking the same condition a few frames above.
    
    Suggested-By: Simon Marchi <simon.marchi@efficios.com>
    Approved-By: Simon Marchi <simon.marchi@efficios.com>

Diff:
---
 gdbserver/regcache.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc
index 3aeefcc79a3..0b1141662ac 100644
--- a/gdbserver/regcache.cc
+++ b/gdbserver/regcache.cc
@@ -199,6 +199,9 @@ regcache_cpy (struct regcache *dst, struct regcache *src)
 static const struct gdb::reg &
 find_register_by_number (const struct target_desc *tdesc, int n)
 {
+  gdb_assert (n >= 0);
+  gdb_assert (n < tdesc->reg_defs.size ());
+
   return tdesc->reg_defs[n];
 }
 
@@ -440,8 +443,6 @@ regcache_raw_read_unsigned (struct regcache *regcache, int regnum,
   int size;
 
   gdb_assert (regcache != NULL);
-  gdb_assert (regnum >= 0
-	      && regnum < regcache->tdesc->reg_defs.size ());
 
   size = register_size (regcache->tdesc, regnum);


More information about the Gdb-cvs mailing list