2008-06-21 Michael Snyder <msnyder@specifix.com>

	* gdbfreeplay-back.c (handle_special_case): Silence gcc warning.
	* gdbfreeplay-i386.c (target_compose_g_packet): Ditto.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index d148880b4e6aefb734751d5d3f9496a8de1f17af..672171e0b41e1cea5b910d4554b30aefe824bf40 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-21  Michael Snyder  <msnyder@specifix.com>
 
+       * gdbfreeplay-back.c (handle_special_case): Silence gcc warning.
+       * gdbfreeplay-i386.c (target_compose_g_packet): Ditto.
+
        Add monitor gdbreplay-next command.
        * gdbfreeplay-back.c (freeplay_show_next_commands): New function.
        Echo the next set of gdb commands, in the manner of gdbreplay.

diff --git a/gdb/gdbserver/gdbfreeplay-back.c b/gdb/gdbserver/gdbfreeplay-back.c
index b060f82c8d00f47a672af3021bb68408da5feb08..cf9d409c0aece0a4986722989f819982678bfc03 100644 (file)
--- a/gdb/gdbserver/gdbfreeplay-back.c
+++ b/gdb/gdbserver/gdbfreeplay-back.c
@@ -682,7 +682,7 @@ handle_special_case (FILE *infile, int fd, char *request)
 {
   unsigned long addr;
   unsigned long len;
-  int next_event_frame, c;
+  int next_event_frame;
   char *p;
 
   static char *monitor_verbose_off = "$qRcmd,766572626f7365206f6666#13";

diff --git a/gdb/gdbserver/gdbfreeplay-i386.c b/gdb/gdbserver/gdbfreeplay-i386.c
index aaeb7c661ad3e96959b328f5350d78d6d31e2637..aaeb8cff6dc3f0c0a83d9e43b520b0b1f40b1fe2 100644 (file)
--- a/gdb/gdbserver/gdbfreeplay-i386.c
+++ b/gdb/gdbserver/gdbfreeplay-i386.c
@@ -361,10 +361,12 @@ target_compose_g_packet (char *tpac)
   if (*tpac++ == '$' && *tpac++ == 'T')
     {
       /* We won't actually use signum.  */
-      signum = (hex_to_int (*tpac++) << 4) + hex_to_int (*tpac++);
+      signum = (hex_to_int (*tpac++) << 4);
+      signum += hex_to_int (*tpac++);
       while (*tpac)
        {
-         regnum = (hex_to_int (*tpac++) << 4) + hex_to_int (*tpac++);
+         regnum = (hex_to_int (*tpac++) << 4);
+         regnum += hex_to_int (*tpac++);
          if (*tpac++ == ':')
            {
              gotreg[regnum] = 1;