Add target breakpoint and watchpoint wrapper:

- replaces all calls to target->type->{add,remove}_{break,watch}point.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1967 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 106095cd8cfb194bcc36a3a9f52c6e8ccf4696bd..55524a7661a358f867fa4f4ba4c24d78faee78be 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -61,7 +61,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
        (*breakpoint_p)->orig_instr = malloc(length);
        (*breakpoint_p)->next = NULL;
        
        (*breakpoint_p)->orig_instr = malloc(length);
        (*breakpoint_p)->next = NULL;
        

-       if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
+       if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK)

        {
                switch (retval)
                {
        {
                switch (retval)
                {


@@ -108,7 +108,7 @@ static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove)
        if (breakpoint==NULL)
                return;
        
        if (breakpoint==NULL)
                return;
        

-       target->type->remove_breakpoint(target, breakpoint);
+       target_remove_breakpoint(target, breakpoint);

        
        (*breakpoint_p) = breakpoint->next;
        free(breakpoint->orig_instr);
        
        (*breakpoint_p) = breakpoint->next;
        free(breakpoint->orig_instr);


@@ -184,7 +184,7 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw
        (*watchpoint_p)->set = 0;
        (*watchpoint_p)->next = NULL;
                
        (*watchpoint_p)->set = 0;
        (*watchpoint_p)->next = NULL;
                

-       if ((retval = target->type->add_watchpoint(target, *watchpoint_p)) != ERROR_OK)
+       if ((retval = target_add_watchpoint(target, *watchpoint_p)) != ERROR_OK)

        {
                switch (retval)
                {
        {
                switch (retval)
                {


@@ -229,7 +229,7 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
        
        if (watchpoint==NULL)
                return;
        
        if (watchpoint==NULL)
                return;

-       target->type->remove_watchpoint(target, watchpoint);
+       target_remove_watchpoint(target, watchpoint);

        (*watchpoint_p) = watchpoint->next;
        free(watchpoint);
 }
        (*watchpoint_p) = watchpoint->next;
        free(watchpoint);
 }

diff --git a/src/target/target.c b/src/target/target.c
index a54e0654b02384354f824d1b4e7baf919cd4d10e..16d28727bc9c4c4d7e956f6524e8ec5ed0d55e77 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -546,6 +546,27 @@ int target_bulk_write_memory(struct target_s *target,
        return target->type->bulk_write_memory(target, address, count, buffer);
 }
 
        return target->type->bulk_write_memory(target, address, count, buffer);
 }
 

+int target_add_breakpoint(struct target_s *target,
+               struct breakpoint_s *breakpoint)
+{
+       return target->type->add_breakpoint(target, breakpoint);
+}
+int target_remove_breakpoint(struct target_s *target,
+               struct breakpoint_s *breakpoint)
+{
+       return target->type->remove_breakpoint(target, breakpoint);
+}
+
+int target_add_watchpoint(struct target_s *target,
+               struct watchpoint_s *watchpoint)
+{
+       return target->type->add_watchpoint(target, watchpoint);
+}
+int target_remove_watchpoint(struct target_s *target,
+               struct watchpoint_s *watchpoint)
+{
+       return target->type->remove_watchpoint(target, watchpoint);
+}

 
 int target_get_gdb_reg_list(struct target_s *target,
                struct reg_s **reg_list[], int *reg_list_size)
 
 int target_get_gdb_reg_list(struct target_s *target,
                struct reg_s **reg_list[], int *reg_list_size)

diff --git a/src/target/target.h b/src/target/target.h
index 91dd1b15422f4a7dfe1ca9ba8838147bfeb6fb03..6e282d9ee02fa804d323168e95b311c1835b4661 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -413,6 +413,36 @@ extern void target_set_examined(struct target_s *target);
 /// Reset the @c examined flag for the given target.
 extern void target_reset_examined(struct target_s *target);
 
 /// Reset the @c examined flag for the given target.
 extern void target_reset_examined(struct target_s *target);
 

+
+/**
+ * Add the @a breakpoint for @a target.
+ *
+ * This routine is a wrapper for target->type->add_breakpoint.
+ */
+extern int target_add_breakpoint(struct target_s *target,
+               struct breakpoint_s *breakpoint);
+/**
+ * Remove the @a breakpoint for @a target.
+ *
+ * This routine is a wrapper for target->type->remove_breakpoint.
+ */
+extern int target_remove_breakpoint(struct target_s *target,
+               struct breakpoint_s *breakpoint);
+/**
+ * Add the @a watchpoint for @a target.
+ *
+ * This routine is a wrapper for target->type->add_watchpoint.
+ */
+extern int target_add_watchpoint(struct target_s *target,
+               struct watchpoint_s *watchpoint);
+/**
+ * Remove the @a watchpoint for @a target.
+ *
+ * This routine is a wrapper for target->type->remove_watchpoint.
+ */
+extern int target_remove_watchpoint(struct target_s *target,
+               struct watchpoint_s *watchpoint);
+

 /**
  * Obtain the registers for GDB.
  *
 /**
  * Obtain the registers for GDB.
  *