- fix cross endian ELF loading

[openocd.git] / src / target / breakpoints.c

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index ac8d7dfd6e773d21b8f3d057ac00db4744d8ed78..f52ff3067a11a9c83c4ad46e789c120326907141 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -62,7 +62,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
        (*breakpoint_p)->length = length;
        (*breakpoint_p)->type = type;
        (*breakpoint_p)->set = 0;
-       (*breakpoint_p)->orig_instr = malloc(CEIL(length, 8));
+       (*breakpoint_p)->orig_instr = malloc(length);
        (*breakpoint_p)->next = NULL;
        
        if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
@@ -224,8 +224,17 @@ int watchpoint_remove(target_t *target, u32 address)
        {
                if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK)
                {
-                       ERROR("BUG: can't remove watchpoint");
-                       exit(-1);
+                       switch (retval)
+                       {
+                               case ERROR_TARGET_NOT_HALTED:
+                                       INFO("can't remove watchpoint while target is running");
+                                       return retval;
+                                       break;
+                               default:
+                                       ERROR("unknown error");
+                                       exit(-1);
+                                       break;
+                       }
                }
                (*watchpoint_p) = watchpoint->next;
                free(watchpoint);