Merge recent win64 breakage fixes from HEAD to 7.2 branch:

gdb/

	* target.c (debug_to_insert_breakpoint): Instead of casting to unsigned
	long and %ld, use core_addr_to_string() and %s to print CORE_ADDR vars
	and host_address_to_string() and %s for pointers.
	(debug_to_remove_breakpoint): Likewise.
	(debug_to_region_ok_for_hw_watchpoint): Likewise.
	(debug_to_can_accel_watchpoint_condition): Likewise.
	(debug_to_stopped_data_address): Likewise.
	(debug_to_watchpoint_addr_within_range): Likewise.
	(debug_to_insert_hw_breakpoint): Likewise.
	(debug_to_remove_hw_breakpoint): Likewise.
	(debug_to_insert_watchpoint): Likewise.
	(debug_to_remove_watchpoint): Likewise.

gdb/gdbserver/

	* server.c (handle_query): strcpy() the returned string from paddress()
	instead of sprintf().
	* utils.c (paddress): Return phex_nz().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e73968d3985f42818feb6c072e52af70a03d779a..b1066e095513602622950ca499fcb9df9df67c17 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-21  Ozkan Sezer  <sezeroz@gmail.com>
+
+       * target.c (debug_to_insert_breakpoint): Instead of casting to unsigned
+       long and %ld, use core_addr_to_string() and %s to print CORE_ADDR vars
+       and host_address_to_string() and %s for pointers.
+       (debug_to_remove_breakpoint): Likewise.
+       (debug_to_region_ok_for_hw_watchpoint): Likewise.
+       (debug_to_can_accel_watchpoint_condition): Likewise.
+       (debug_to_stopped_data_address): Likewise.
+       (debug_to_watchpoint_addr_within_range): Likewise.
+       (debug_to_insert_hw_breakpoint): Likewise.
+       (debug_to_remove_hw_breakpoint): Likewise.
+       (debug_to_insert_watchpoint): Likewise.
+       (debug_to_remove_watchpoint): Likewise.
+
 2010-07-21  Pedro Alves  <pedro@codesourcery.com>
 
        PR symtab/11827

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 8f50ce01e94dd4e1e731c86e72e940c1915b1ea3..7c182cbd154548a427b0e7a1e78d9c533ab5d2b8 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-21  Ozkan Sezer  <sezeroz@gmail.com>
+
+       * server.c (handle_query): strcpy() the returned string from paddress()
+       instead of sprintf().
+       * utils.c (paddress): Return phex_nz().
+
 2010-07-07  Joel Brobecker  <brobecker@adacore.com>
 
        * server.c (handle_v_cont): Call mourn_inferior if process

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 9125f0ef60f02ed44e7d6e6f4c22e94d23535ece..29b6cdcd1a81b6fd00f34a9e96cbd89df37a47e7 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1539,7 +1539,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
 
       if (err == 0)
        {
-         sprintf (own_buf, "%llx", address);
+         strcpy (own_buf, paddress(address));
          return;
        }
       else if (err > 0)
@@ -1563,7 +1563,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
       n = (*the_target->get_tib_address) (ptid, &tlb);
       if (n == 1)
        {
-         sprintf (own_buf, "%llx", tlb);
+         strcpy (own_buf, paddress(tlb));
          return;
        }
       else if (n == 0)

diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index b94296237a00cd1ba53142bf11b355f713d5460e..8a1acd9fc724cdd6f1c1bbbc19a73b73ef52139a 100644 (file)
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -257,17 +257,6 @@ xsnprintf (char *str, size_t size, const char *format, ...)
   return ret;
 }
 
-/* Convert a CORE_ADDR into a HEX string, like %lx.
-   The result is stored in a circular static buffer, NUMCELLS deep.  */
-
-char *
-paddress (CORE_ADDR addr)
-{
-  char *str = get_cell ();
-  xsnprintf (str, CELLSIZE, "%lx", (long) addr);
-  return str;
-}
-
 static char *
 decimal2str (char *sign, ULONGEST addr, int width)
 {
@@ -372,3 +361,12 @@ phex_nz (ULONGEST l, int sizeof_l)
 
   return str;
 }
+
+/* Convert a CORE_ADDR into a HEX string, like %lx.
+   The result is stored in a circular static buffer, NUMCELLS deep.  */
+
+char *
+paddress (CORE_ADDR addr)
+{
+  return phex_nz (addr, sizeof (CORE_ADDR));
+}

diff --git a/gdb/target.c b/gdb/target.c
index 862df4ec71b061c88dc7772f3d6f2aaf59ae5789..4cabcbd501d52bac4169cdf160d8ab0a1f436208 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3270,8 +3270,8 @@ debug_to_insert_breakpoint (struct gdbarch *gdbarch,
   retval = debug_target.to_insert_breakpoint (gdbarch, bp_tgt);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_insert_breakpoint (0x%lx, xxx) = %ld\n",
-                     (unsigned long) bp_tgt->placed_address,
+                     "target_insert_breakpoint (%s, xxx) = %ld\n",
+                     core_addr_to_string (bp_tgt->placed_address),
                      (unsigned long) retval);
   return retval;
 }
@@ -3285,8 +3285,8 @@ debug_to_remove_breakpoint (struct gdbarch *gdbarch,
   retval = debug_target.to_remove_breakpoint (gdbarch, bp_tgt);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_remove_breakpoint (0x%lx, xxx) = %ld\n",
-                     (unsigned long) bp_tgt->placed_address,
+                     "target_remove_breakpoint (%s, xxx) = %ld\n",
+                     core_addr_to_string (bp_tgt->placed_address),
                      (unsigned long) retval);
   return retval;
 }
@@ -3315,10 +3315,9 @@ debug_to_region_ok_for_hw_watchpoint (CORE_ADDR addr, int len)
   retval = debug_target.to_region_ok_for_hw_watchpoint (addr, len);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_region_ok_for_hw_watchpoint (%ld, %ld) = 0x%lx\n",
-                     (unsigned long) addr,
-                     (unsigned long) len,
-                     (unsigned long) retval);
+                     "target_region_ok_for_hw_watchpoint (%s, %ld) = %s\n",
+                     core_addr_to_string (addr), (unsigned long) len,
+                     core_addr_to_string (retval));
   return retval;
 }
 
@@ -3331,9 +3330,9 @@ debug_to_can_accel_watchpoint_condition (CORE_ADDR addr, int len, int rw,
   retval = debug_target.to_can_accel_watchpoint_condition (addr, len, rw, cond);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_can_accel_watchpoint_condition (0x%lx, %d, %d, 0x%lx) = %ld\n",
-                     (unsigned long) addr, len, rw, (unsigned long) cond,
-                     (unsigned long) retval);
+                     "target_can_accel_watchpoint_condition (%s, %d, %d, %s) = %ld\n",
+                     core_addr_to_string (addr), len, rw,
+                     host_address_to_string (cond), (unsigned long) retval);
   return retval;
 }
 
@@ -3358,8 +3357,8 @@ debug_to_stopped_data_address (struct target_ops *target, CORE_ADDR *addr)
   retval = debug_target.to_stopped_data_address (target, addr);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_stopped_data_address ([0x%lx]) = %ld\n",
-                     (unsigned long)*addr,
+                     "target_stopped_data_address ([%s]) = %ld\n",
+                     core_addr_to_string (*addr),
                      (unsigned long)retval);
   return retval;
 }
@@ -3375,9 +3374,9 @@ debug_to_watchpoint_addr_within_range (struct target_ops *target,
                                                         start, length);
 
   fprintf_filtered (gdb_stdlog,
-                   "target_watchpoint_addr_within_range (0x%lx, 0x%lx, %d) = %d\n",
-                   (unsigned long) addr, (unsigned long) start, length,
-                   retval);
+                   "target_watchpoint_addr_within_range (%s, %s, %d) = %d\n",
+                   core_addr_to_string (addr), core_addr_to_string (start),
+                   length, retval);
   return retval;
 }
 
@@ -3390,8 +3389,8 @@ debug_to_insert_hw_breakpoint (struct gdbarch *gdbarch,
   retval = debug_target.to_insert_hw_breakpoint (gdbarch, bp_tgt);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_insert_hw_breakpoint (0x%lx, xxx) = %ld\n",
-                     (unsigned long) bp_tgt->placed_address,
+                     "target_insert_hw_breakpoint (%s, xxx) = %ld\n",
+                     core_addr_to_string (bp_tgt->placed_address),
                      (unsigned long) retval);
   return retval;
 }
@@ -3405,8 +3404,8 @@ debug_to_remove_hw_breakpoint (struct gdbarch *gdbarch,
   retval = debug_target.to_remove_hw_breakpoint (gdbarch, bp_tgt);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_remove_hw_breakpoint (0x%lx, xxx) = %ld\n",
-                     (unsigned long) bp_tgt->placed_address,
+                     "target_remove_hw_breakpoint (%s, xxx) = %ld\n",
+                     core_addr_to_string (bp_tgt->placed_address),
                      (unsigned long) retval);
   return retval;
 }
@@ -3420,9 +3419,9 @@ debug_to_insert_watchpoint (CORE_ADDR addr, int len, int type,
   retval = debug_target.to_insert_watchpoint (addr, len, type, cond);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_insert_watchpoint (0x%lx, %d, %d, 0x%ld) = %ld\n",
-                     (unsigned long) addr, len, type, (unsigned long) cond,
-                     (unsigned long) retval);
+                     "target_insert_watchpoint (%s, %d, %d, %s) = %ld\n",
+                     core_addr_to_string (addr), len, type,
+                     host_address_to_string (cond), (unsigned long) retval);
   return retval;
 }
 
@@ -3435,9 +3434,9 @@ debug_to_remove_watchpoint (CORE_ADDR addr, int len, int type,
   retval = debug_target.to_remove_watchpoint (addr, len, type, cond);
 
   fprintf_unfiltered (gdb_stdlog,
-                     "target_remove_watchpoint (0x%lx, %d, %d, 0x%ld) = %ld\n",
-                     (unsigned long) addr, len, type, (unsigned long) cond,
-                     (unsigned long) retval);
+                     "target_remove_watchpoint (%s, %d, %d, %s) = %ld\n",
+                     core_addr_to_string (addr), len, type,
+                     host_address_to_string (cond), (unsigned long) retval);
   return retval;
 }