cortex: autostep correctly handle user breakpoint

[fw/openocd] / src / target / breakpoints.h

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 57c06c73e7780c5a64f1ae0e04085e622ace7471..a019e967b39d98f2488a9c4cd9cea265b3c99bbf 100644 (file)
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -17,37 +17,34 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "types.h"
-
-struct target_s;
+struct target;
 
-enum breakpoint_type
-{
+enum breakpoint_type {
        BKPT_HARD,
        BKPT_SOFT,
 };
 
-enum watchpoint_rw
-{
+enum watchpoint_rw {
        WPT_READ = 0, WPT_WRITE = 1, WPT_ACCESS = 2
 };
 
-typedef struct breakpoint_s
-{
+struct breakpoint {
        uint32_t address;
+       uint32_t asid;
        int length;
        enum breakpoint_type type;
        int set;
        uint8_t *orig_instr;
-       struct breakpoint_s *next;
-       int unique_id;
-} breakpoint_t;
+       struct breakpoint *next;
+       uint32_t unique_id;
+       int linked_BRP;
+};
 
-struct watchpoint
-{
+struct watchpoint {
        uint32_t address;
        uint32_t length;
        uint32_t mask;
@@ -58,17 +55,21 @@ struct watchpoint
        int unique_id;
 };
 
-void breakpoint_clear_target(struct target_s *target);
-int breakpoint_add(struct target_s *target,
+void breakpoint_clear_target(struct target *target);
+int breakpoint_add(struct target *target,
                uint32_t address, uint32_t length, enum breakpoint_type type);
-void breakpoint_remove(struct target_s *target, uint32_t address);
+int context_breakpoint_add(struct target *target,
+               uint32_t asid, uint32_t length, enum breakpoint_type type);
+int hybrid_breakpoint_add(struct target *target,
+               uint32_t address, uint32_t asid, uint32_t length, enum breakpoint_type type);
+void breakpoint_remove(struct target *target, uint32_t address);
 
-breakpoint_t* breakpoint_find(struct target_s *target, uint32_t address);
+struct breakpoint *breakpoint_find(struct target *target, uint32_t address);
 
-void watchpoint_clear_target(struct target_s *target);
-int watchpoint_add(struct target_s *target,
+void watchpoint_clear_target(struct target *target);
+int watchpoint_add(struct target *target,
                uint32_t address, uint32_t length,
                enum watchpoint_rw rw, uint32_t value, uint32_t mask);
-void watchpoint_remove(struct target_s *target, uint32_t address);
+void watchpoint_remove(struct target *target, uint32_t address);
 
 #endif /* BREAKPOINTS_H */