* cris-tdep.c (cris_stopped_data_address): Read register values

	from current frame instead of calling read_register.
	* frv-tdep.c (frv_stopped_data_address): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 766e969..6860ae9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,9 +1,14 @@
 2007-06-15  Ulrich Weigand  <uweigand@de.ibm.com>
 
+       * cris-tdep.c (cris_stopped_data_address): Read register values
+       from current frame instead of calling read_register.
+       * frv-tdep.c (frv_stopped_data_address): Likewise.
+
+2007-06-15  Ulrich Weigand  <uweigand@de.ibm.com>
+
        * solib-sunos.c (sunos_solib_create_inferior_hook): Use write_pc
        instead of write_register (PC_REGNUM, ...).
 
-
 2007-06-15  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * solib-sunos.c (sunos_solib_create_inferior_hook): Add comment

diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 7ef468c..8b86028 100644 (file)
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -535,7 +535,7 @@ CORE_ADDR
 cris_stopped_data_address (void)
 {
   CORE_ADDR eda;
-  eda = read_register (EDA_REGNUM);
+  eda = get_frame_register_unsigned (get_current_frame (), EDA_REGNUM);
   return eda;
 }
 

diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index e21b3ec..948736f 100644 (file)
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1291,13 +1291,14 @@ frv_check_watch_resources (int type, int cnt, int ot)
 int
 frv_stopped_data_address (CORE_ADDR *addr_p)
 {
+  struct frame_info *frame = get_current_frame ();
   CORE_ADDR brr, dbar0, dbar1, dbar2, dbar3;
 
-  brr = read_register (brr_regnum);
-  dbar0 = read_register (dbar0_regnum);
-  dbar1 = read_register (dbar1_regnum);
-  dbar2 = read_register (dbar2_regnum);
-  dbar3 = read_register (dbar3_regnum);
+  brr = get_frame_register_unsigned (frame, brr_regnum);
+  dbar0 = get_frame_register_unsigned (frame, dbar0_regnum);
+  dbar1 = get_frame_register_unsigned (frame, dbar1_regnum);
+  dbar2 = get_frame_register_unsigned (frame, dbar2_regnum);
+  dbar3 = get_frame_register_unsigned (frame, dbar3_regnum);
 
   if (brr & (1<<11))
     *addr_p = dbar0;