diff mbox

Remove MAX_REGISTER_SIZE from mi/mi-main.c

Message ID 4AA96E9D-7905-4D03-9424-2BC71D117CE2@arm.com
State New
Headers show

Commit Message

Alan Hayward June 8, 2017, 9:42 a.m. UTC
Updated register_changed_p() to use cooked_read_value().

I considered moving this function into regcache as:
int regcache::register_cooked_compare (int regnum, struct regcache *prev_regs)
Decided not to because nothing else needs it. Would be happy to change.

Tested on a --enable-targets=all build
No regressions in gdb.mi/*.exp
Also tested with board files unix and native-gdbserver.


Ok to commit?

Alan.


2017-06-08  Alan Hayward  <alan.hayward@arm.com>

	* mi/mi-main.c (register_changed_p): Use cooked_read_value

Comments

Pedro Alves June 8, 2017, 9:55 a.m. UTC | #1
On 06/08/2017 10:42 AM, Alan Hayward wrote:

>    /* Get register contents and compare.  */
> -  prev_status = regcache_cooked_read (prev_regs, regnum, prev_buffer);
> -  this_status = regcache_cooked_read (this_regs, regnum, this_buffer);
> -
> -  if (this_status != prev_status)
> -    return 1;
> -  else if (this_status == REG_VALID)
> -    return memcmp (prev_buffer, this_buffer,
> -		   register_size (gdbarch, regnum)) != 0;
> +  prev_value = prev_regs->cooked_read_value (regnum);
> +  this_value = this_regs->cooked_read_value (regnum);
> +  gdb_assert (prev_value != NULL);
> +  gdb_assert (this_value != NULL);
> +
> +  if (value_optimized_out (prev_value) != value_optimized_out (this_value)
> +      || value_entirely_available (prev_value)
> +	 != value_entirely_available (this_value))
> +    ret = 1;
> +  if (value_optimized_out (prev_value)
> +      || !value_entirely_available (prev_value))
> +    ret = 0;
>    else
> -    return 0;
> +    ret = memcmp (value_contents_all (prev_value),
> +		  value_contents_all (this_value),
> +		  register_size (gdbarch, regnum)) != 0;
> +
> +  release_value (prev_value);
> +  release_value (this_value);
> +  value_free (prev_value);
> +  value_free (this_value);
> +  return ret;
>  }
> 

Use value_contents_eq?

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index bdc5dda30537c7e5797fb8c44b689a63c5c0f4b8..38d737f49f35953c7f5a9c957e918606baac63e3 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1111,10 +1111,8 @@  register_changed_p (int regnum, struct regcache *prev_regs,
 		    struct regcache *this_regs)
 {
   struct gdbarch *gdbarch = get_regcache_arch (this_regs);
-  gdb_byte prev_buffer[MAX_REGISTER_SIZE];
-  gdb_byte this_buffer[MAX_REGISTER_SIZE];
-  enum register_status prev_status;
-  enum register_status this_status;
+  struct value *prev_value, *this_value;
+  int ret;

   /* First time through or after gdbarch change consider all registers
      as changed.  */
@@ -1122,16 +1120,28 @@  register_changed_p (int regnum, struct regcache *prev_regs,
     return 1;

   /* Get register contents and compare.  */
-  prev_status = regcache_cooked_read (prev_regs, regnum, prev_buffer);
-  this_status = regcache_cooked_read (this_regs, regnum, this_buffer);
-
-  if (this_status != prev_status)
-    return 1;
-  else if (this_status == REG_VALID)
-    return memcmp (prev_buffer, this_buffer,
-		   register_size (gdbarch, regnum)) != 0;
+  prev_value = prev_regs->cooked_read_value (regnum);
+  this_value = this_regs->cooked_read_value (regnum);
+  gdb_assert (prev_value != NULL);
+  gdb_assert (this_value != NULL);
+
+  if (value_optimized_out (prev_value) != value_optimized_out (this_value)
+      || value_entirely_available (prev_value)
+	 != value_entirely_available (this_value))
+    ret = 1;
+  if (value_optimized_out (prev_value)
+      || !value_entirely_available (prev_value))
+    ret = 0;
   else
-    return 0;
+    ret = memcmp (value_contents_all (prev_value),
+		  value_contents_all (this_value),
+		  register_size (gdbarch, regnum)) != 0;
+
+  release_value (prev_value);
+  release_value (this_value);
+  value_free (prev_value);
+  value_free (this_value);
+  return ret;
 }

 /* Return a list of register number and value pairs.  The valid