* remote.c (init_remote_state): Eliminate use of

	deprecated_register_bytes().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bafa202..8b189cb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-28  Kevin Buettner  <kevinb@redhat.com>
+
+       * remote.c (init_remote_state): Eliminate use of
+       deprecated_register_bytes().
+
 2005-04-28  Andrew Cagney  <cagney@gnu.org>
 
        * valops.c (check_field): Make buffer a bfd_byte.

diff --git a/gdb/remote.c b/gdb/remote.c
index 450ef5b..e7d76da 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -248,10 +248,7 @@ init_remote_state (struct gdbarch *gdbarch)
   int regnum;
   struct remote_state *rs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct remote_state);
 
-  if (deprecated_register_bytes () != 0)
-    rs->sizeof_g_packet = deprecated_register_bytes ();
-  else
-    rs->sizeof_g_packet = 0;
+  rs->sizeof_g_packet = 0;
 
   /* Assume a 1:1 regnum<->pnum table.  */
   rs->regs = GDBARCH_OBSTACK_CALLOC (gdbarch, NUM_REGS + NUM_PSEUDO_REGS,
@@ -266,8 +263,8 @@ init_remote_state (struct gdbarch *gdbarch)
       /* ...name = REGISTER_NAME (regnum); */
 
       /* Compute packet size by accumulating the size of all registers.  */
-      if (deprecated_register_bytes () == 0)
-        rs->sizeof_g_packet += register_size (current_gdbarch, regnum);
+      if (regnum < NUM_REGS)
+       rs->sizeof_g_packet += register_size (current_gdbarch, regnum);
     }
 
   /* Default maximum number of characters in a packet body. Many