[GDBserver] Make Zx/zx packet handling idempotent.

[binutils-gdb.git] / gdb / gdbserver / mem-break.h

diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
index ffc1b80acffb47a2be0812f910b67a0aa1b89a61..2649462b50c96c2b140192e9c82956af0aef57fd 100644 (file)
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-break.h
@@ -26,6 +26,8 @@
 /* Breakpoints are opaque.  */
 struct breakpoint;
 struct fast_tracepoint_jump;
+struct raw_breakpoint;
+struct process_info;
 
 #define Z_PACKET_SW_BP '0'
 #define Z_PACKET_HW_BP '1'
@@ -33,41 +35,78 @@ struct fast_tracepoint_jump;
 #define Z_PACKET_READ_WP '3'
 #define Z_PACKET_ACCESS_WP '4'
 
-/* Map the protocol breakpoint/watchpoint type TYPE to enum
-   target_hw_bp_type.  */
+/* The low level breakpoint types.  */
 
-enum target_hw_bp_type Z_packet_to_target_hw_bp_type (char type);
+enum raw_bkpt_type
+  {
+    /* Software/memory breakpoint.  */
+    raw_bkpt_type_sw,
 
-/* Create a new GDB breakpoint at WHERE.  Returns -1 if breakpoints
-   are not supported on this target, 0 otherwise.  */
+    /* Hardware-assisted breakpoint.  */
+    raw_bkpt_type_hw,
 
-int set_gdb_breakpoint_at (CORE_ADDR where);
+    /* Hardware-assisted write watchpoint.  */
+    raw_bkpt_type_write_wp,
 
-/* Returns TRUE if there's any breakpoint at ADDR in our tables,
-   inserted, or not.  */
+    /* Hardware-assisted read watchpoint.  */
+    raw_bkpt_type_read_wp,
+
+    /* Hardware-assisted access watchpoint.  */
+    raw_bkpt_type_access_wp
+  };
+
+/* Map the protocol breakpoint/watchpoint type Z_TYPE to the internal
+   raw breakpoint type.  */
+
+enum raw_bkpt_type Z_packet_to_raw_bkpt_type (char z_type);
+
+/* Map a raw breakpoint type to an enum target_hw_bp_type.  */
+
+enum target_hw_bp_type raw_bkpt_type_to_target_hw_bp_type
+  (enum raw_bkpt_type raw_type);
+
+/* Create a new GDB breakpoint of type Z_TYPE at ADDR with size SIZE.
+   Returns a pointer to the newly created breakpoint on success.  On
+   failure returns NULL and sets *ERR to either -1 for error, or 1 if
+   Z_TYPE breakpoints are not supported on this target.  */
+
+struct breakpoint *set_gdb_breakpoint (char z_type, CORE_ADDR addr, int size,
+                                      int *err);
+
+/* Delete a GDB breakpoint of type Z_TYPE and size SIZE previously
+   inserted at ADDR with set_gdb_breakpoint_at.  Returns 0 on success,
+   -1 on error, and 1 if Z_TYPE breakpoints are not supported on this
+   target.  */
+
+int delete_gdb_breakpoint (char z_type, CORE_ADDR addr, int size);
+
+/* Returns TRUE if there's a software or hardware (code) breakpoint at
+   ADDR in our tables, inserted, or not.  */
 
 int breakpoint_here (CORE_ADDR addr);
 
-/* Returns TRUE if there's any inserted breakpoint set at ADDR.  */
+/* Returns TRUE if there's any inserted software or hardware (code)
+   breakpoint set at ADDR.  */
 
 int breakpoint_inserted_here (CORE_ADDR addr);
 
 /* Clear all breakpoint conditions associated with this address.  */
 
-void clear_gdb_breakpoint_conditions (CORE_ADDR addr);
+void clear_breakpoint_conditions (struct breakpoint *bp);
 
 /* Set target-side condition CONDITION to the breakpoint at ADDR.
    Returns false on failure.  On success, advances CONDITION pointer
    past the condition and returns true.  */
 
-int add_breakpoint_condition (CORE_ADDR addr, char **condition);
+int add_breakpoint_condition (struct breakpoint *bp, char **condition);
 
 /* Set target-side commands COMMANDS to the breakpoint at ADDR.
    Returns false on failure.  On success, advances COMMANDS past the
    commands and returns true.  If PERSIST, the commands should run
    even while GDB is disconnected.  */
 
-int add_breakpoint_commands (CORE_ADDR addr, char **commands, int persist);
+int add_breakpoint_commands (struct breakpoint *bp, char **commands,
+                            int persist);
 
 int any_persistent_commands (void);
 
@@ -80,7 +119,8 @@ int gdb_no_commands_at_breakpoint (CORE_ADDR where);
 
 void run_breakpoint_commands (CORE_ADDR where);
 
-/* Returns TRUE if there's a GDB breakpoint set at ADDR.  */
+/* Returns TRUE if there's a GDB breakpoint (Z0 or Z1) set at
+   WHERE.  */
 
 int gdb_breakpoint_here (CORE_ADDR where);
 
@@ -91,11 +131,6 @@ int gdb_breakpoint_here (CORE_ADDR where);
 struct breakpoint *set_breakpoint_at (CORE_ADDR where,
                                      int (*handler) (CORE_ADDR));
 
-/* Delete a GDB breakpoint previously inserted at ADDR with
-   set_gdb_breakpoint_at.  */
-
-int delete_gdb_breakpoint_at (CORE_ADDR addr);
-
 /* Delete a breakpoint.  */
 
 int delete_breakpoint (struct breakpoint *bkpt);
@@ -199,4 +234,12 @@ void uninsert_fast_tracepoint_jumps_at (CORE_ADDR pc);
 
 void reinsert_fast_tracepoint_jumps_at (CORE_ADDR where);
 
+/* Insert a memory breakpoint.  */
+
+int insert_memory_breakpoint (struct raw_breakpoint *bp);
+
+/* Remove a previously inserted memory breakpoint.  */
+
+int remove_memory_breakpoint (struct raw_breakpoint *bp);
+
 #endif /* MEM_BREAK_H */