* write.c (relax_segment <rs_space>): Calculate growth using

[deliverable/binutils-gdb.git] / gdb / remote.c

diff --git a/gdb/remote.c b/gdb/remote.c
index a9dd2df974cf283d0aa00f54dab8de8251b192be..e2e9f7395388e05c2c2671974263ca20c32a0c87 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3060,6 +3060,7 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status)
              {
                unsigned char *p1;
                char *p_temp;
+               int fieldsize;
 
                /* Read the register number */
                regno = strtol ((const char *) p, &p_temp, 16);
@@ -3093,8 +3094,9 @@ Packet: '%s'\n",
 Packet: '%s'\n",
                               regno, p, buf);
 
-                   if (hex2bin (p, regs, REGISTER_RAW_SIZE (regno)) 
-                       < REGISTER_RAW_SIZE (regno))
+                   fieldsize = hex2bin (p, regs, REGISTER_RAW_SIZE (regno));
+                   p += 2 * fieldsize;
+                   if (fieldsize < REGISTER_RAW_SIZE (regno))
                      warning ("Remote reply is too short: %s", buf);
                    supply_register (regno, regs);
                  }
@@ -3630,6 +3632,7 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len)
         increasing byte addresses.  Each byte is encoded as a two hex
         value.  */
       nr_bytes = bin2hex (myaddr, p, todo);
+      p += 2 * nr_bytes;
       break;
     case PACKET_SUPPORT_UNKNOWN:
       internal_error (__FILE__, __LINE__,