2004-10-08 Andrew Cagney <cagney@gnu.org>

	* target.c (debug_target): Move to near start of file.
	(target_stopped_data_address_p): Re-org logic, add casts.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bef6e178fa9b57bb690e74bc9b5589cbf3501649..d6dcc91008e730bed6d2723471c6a4337439ab06 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-08  Andrew Cagney  <cagney@gnu.org>
+
+       * target.c (debug_target): Move to near start of file.
+       (target_stopped_data_address_p): Re-org logic, add casts.
+
 2004-10-02  Mark Kettenis  <kettenis@gnu.org>
 
        * solib-sunos.c [HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS] (link_map)

diff --git a/gdb/target.c b/gdb/target.c
index ce51f3d6de4fff04c596328d5c00e2ebcc371961..2f27bfad383c33965d925d86ec09b31ef99b84be 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -86,6 +86,8 @@ static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
 
 static void init_dummy_target (void);
 
+static struct target_ops debug_target;
+
 static void debug_to_open (char *, int);
 
 static void debug_to_close (int);
@@ -1015,12 +1017,14 @@ target_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
 int
 target_stopped_data_address_p (struct target_ops *target)
 {
-  if (target->to_stopped_data_address == return_zero
-      || (target->to_stopped_data_address == debug_to_stopped_data_address
-         && debug_target.to_stopped_data_address == return_zero))
+  if (target->to_stopped_data_address
+      == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero)
     return 0;
-  else
-    return 1;
+  if (target->to_stopped_data_address == debug_to_stopped_data_address
+      && (debug_target.to_stopped_data_address
+         == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero))
+    return 0;
+  return 1;
 }
 #endif
 
@@ -1791,9 +1795,6 @@ init_dummy_target (void)
   dummy_target.to_magic = OPS_MAGIC;
 }
 \f
-
-static struct target_ops debug_target;
-
 static void
 debug_to_open (char *args, int from_tty)
 {