2007-10-09 Markus Deuling <deuling@de.ibm.com>

	* monitor.c (monitor_supply_register): Use get_regcache_arch to get at
	the current architecture by regcache.
	(monitor_store_register, monitor_store_registers): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f4380b63280ded82f5def7d09e8c1d99c034601c..10de53bb5aea638479b3096ad6ae1ff989887235 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-09  Markus Deuling  <deuling@de.ibm.com>
+
+       * monitor.c (monitor_supply_register): Use get_regcache_arch to get at
+       the current architecture by regcache.
+       (monitor_store_register, monitor_store_registers): Likewise.
+
 2007-10-09  Markus Deuling  <deuling@de.ibm.com>
 
        * dbug-rom.c (dbug_supply_register): Use get_regcache_arch to get at

diff --git a/gdb/monitor.c b/gdb/monitor.c
index 33ba8c5e409998b47cabfa222276b495e2cb38aa..410ce629c63b67cf0a4dc4e57e874187cf42a123 100644 (file)
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -883,7 +883,9 @@ monitor_supply_register (struct regcache *regcache, int regno, char *valstr)
 
   /* supply register stores in target byte order, so swap here */
 
-  store_unsigned_integer (regbuf, register_size (current_gdbarch, regno), val);
+  store_unsigned_integer (regbuf,
+                         register_size (get_regcache_arch (regcache), regno),
+                         val);
 
   regcache_raw_supply (regcache, regno, regbuf);
 
@@ -1190,7 +1192,7 @@ monitor_fetch_register (struct regcache *regcache, int regno)
      spaces, but stop reading if something else is seen.  Some monitors
      like to drop leading zeros.  */
 
-  for (i = 0; i < register_size (current_gdbarch, regno) * 2; i++)
+  for (i = 0; i < register_size (get_regcache_arch (regcache), regno) * 2; i++)
     {
       int c;
       c = readchar (timeout);
@@ -1277,7 +1279,8 @@ monitor_fetch_registers (struct regcache *regcache, int regno)
          return;
        }
 
-      for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++)
+      for (regno = 0; regno < gdbarch_num_regs (get_regcache_arch (regcache));
+          regno++)
        monitor_fetch_register (regcache, regno);
     }
   else
@@ -1307,7 +1310,8 @@ monitor_store_register (struct regcache *regcache, int regno)
 
   regcache_cooked_read_unsigned (regcache, regno, &val);
   monitor_debug ("MON storeg %d %s\n", regno,
-                phex (val, register_size (current_gdbarch, regno)));
+                phex (val,
+                      register_size (get_regcache_arch (regcache), regno)));
 
   /* send the register deposit command */
 
@@ -1354,7 +1358,8 @@ monitor_store_registers (struct regcache *regcache, int regno)
       return;
     }
 
-  for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++)
+  for (regno = 0; regno < gdbarch_num_regs (get_regcache_arch (regcache));
+       regno++)
     monitor_store_register (regcache, regno);
 }