diff options
Diffstat (limited to 'gdb/gdbserver/regcache.c')
-rw-r--r-- | gdb/gdbserver/regcache.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c index 9b837e7..43e78a5 100644 --- a/gdb/gdbserver/regcache.c +++ b/gdb/gdbserver/regcache.c @@ -54,7 +54,7 @@ get_thread_regcache (struct thread_info *thread, int fetch) current_thread = thread; /* Invalidate all registers, to prevent stale left-overs. */ memset (regcache->register_status, REG_UNAVAILABLE, - regcache->tdesc->num_registers); + VEC_length (tdesc_reg_p, regcache->tdesc->reg_defs)); fetch_inferior_registers (regcache, -1); current_thread = saved_thread; regcache->registers_valid = 1; @@ -145,9 +145,9 @@ init_register_cache (struct regcache *regcache, = (unsigned char *) xcalloc (1, tdesc->registers_size); regcache->registers_owned = 1; regcache->register_status - = (unsigned char *) xmalloc (tdesc->num_registers); + = (unsigned char *) xmalloc (VEC_length (tdesc_reg_p, tdesc->reg_defs)); memset ((void *) regcache->register_status, REG_UNAVAILABLE, - tdesc->num_registers); + VEC_length (tdesc_reg_p, tdesc->reg_defs)); #else gdb_assert_not_reached ("can't allocate memory from the heap"); #endif @@ -204,7 +204,7 @@ regcache_cpy (struct regcache *dst, struct regcache *src) #ifndef IN_PROCESS_AGENT if (dst->register_status != NULL && src->register_status != NULL) memcpy (dst->register_status, src->register_status, - src->tdesc->num_registers); + VEC_length (tdesc_reg_p, src->tdesc->reg_defs)); #endif dst->registers_valid = src->registers_valid; } @@ -218,8 +218,9 @@ registers_to_string (struct regcache *regcache, char *buf) unsigned char *registers = regcache->registers; const struct target_desc *tdesc = regcache->tdesc; int i; + reg *reg; - for (i = 0; i < tdesc->num_registers; i++) + for (i = 0; VEC_iterate (tdesc_reg_p, tdesc->reg_defs, i, reg); i++) { if (regcache->register_status[i] == REG_VALID) { @@ -257,22 +258,23 @@ int find_regno (const struct target_desc *tdesc, const char *name) { int i; + reg *reg; - for (i = 0; i < tdesc->num_registers; i++) - if (strcmp (name, tdesc->reg_defs[i].name) == 0) + for (i = 0; VEC_iterate (tdesc_reg_p, tdesc->reg_defs, i, reg); i++) + if (strcmp (name, reg->name) == 0) return i; internal_error (__FILE__, __LINE__, "Unknown register %s requested", name); } +#endif + struct reg * find_register_by_number (const struct target_desc *tdesc, int n) { - return &tdesc->reg_defs[n]; + return VEC_index (tdesc_reg_p, tdesc->reg_defs, n); } -#endif - #ifndef IN_PROCESS_AGENT static void free_register_cache_thread (struct thread_info *thread) @@ -312,7 +314,7 @@ register_cache_size (const struct target_desc *tdesc) int register_size (const struct target_desc *tdesc, int n) { - return tdesc->reg_defs[n].size / 8; + return find_register_by_number (tdesc, n)->size / 8; } /* See common/common-regcache.h. */ @@ -326,7 +328,8 @@ regcache_register_size (const struct regcache *regcache, int n) static unsigned char * register_data (struct regcache *regcache, int n, int fetch) { - return regcache->registers + regcache->tdesc->reg_defs[n].offset / 8; + return (regcache->registers + + find_register_by_number (regcache->tdesc, n)->offset / 8); } /* Supply register N, whose contents are stored in BUF, to REGCACHE. @@ -385,7 +388,7 @@ supply_regblock (struct regcache *regcache, const void *buf) { int i; - for (i = 0; i < tdesc->num_registers; i++) + for (i = 0; i < VEC_length (tdesc_reg_p, tdesc->reg_defs); i++) regcache->register_status[i] = REG_VALID; } #endif @@ -399,7 +402,7 @@ supply_regblock (struct regcache *regcache, const void *buf) { int i; - for (i = 0; i < tdesc->num_registers; i++) + for (i = 0; i < VEC_length (tdesc_reg_p, tdesc->reg_defs); i++) regcache->register_status[i] = REG_UNAVAILABLE; } #endif @@ -431,7 +434,8 @@ regcache_raw_read_unsigned (struct regcache *regcache, int regnum, int size; gdb_assert (regcache != NULL); - gdb_assert (regnum >= 0 && regnum < regcache->tdesc->num_registers); + gdb_assert (regnum >= 0 + && regnum < VEC_length (tdesc_reg_p, regcache->tdesc->reg_defs)); size = register_size (regcache->tdesc, regnum); |