Conditional Z1 breakpoint hangs GDBserver.

[deliverable/binutils-gdb.git] / gdb / gdbserver / mem-break.c

diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index b77ce100ff499aa249ed8d2391ca4f25c6c5f0b2..5df950d34809148c042a8f6bd1dbe937c3aef4d9 100644 (file)
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -799,12 +799,12 @@ add_breakpoint_condition (CORE_ADDR addr, char **condition)
   char *actparm = *condition;
   struct agent_expr *cond;
 
-  if (bp == NULL)
-    return 1;
-
   if (condition == NULL)
     return 1;
 
+  if (bp == NULL)
+    return 0;
+
   cond = gdb_parse_agent_expr (&actparm);
 
   if (cond == NULL)
@@ -818,7 +818,7 @@ add_breakpoint_condition (CORE_ADDR addr, char **condition)
 
   *condition = actparm;
 
-  return 0;
+  return 1;
 }
 
 /* Evaluate condition (if any) at breakpoint BP.  Return 1 if
@@ -891,12 +891,12 @@ add_breakpoint_commands (CORE_ADDR addr, char **command, int persist)
   char *actparm = *command;
   struct agent_expr *cmd;
 
-  if (bp == NULL)
-    return 1;
-
   if (command == NULL)
     return 1;
 
+  if (bp == NULL)
+    return 0;
+
   cmd = gdb_parse_agent_expr (&actparm);
 
   if (cmd == NULL)
@@ -910,7 +910,7 @@ add_breakpoint_commands (CORE_ADDR addr, char **command, int persist)
 
   *command = actparm;
 
-  return 0;
+  return 1;
 }
 
 /* Return true if there are no commands to run at this location,