]> git.sur5r.net Git - openocd/commitdiff
- fix xscale memory leak and warnings. Thanks Øyvind Harboe
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 15 Feb 2008 19:07:43 +0000 (19:07 +0000)
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 15 Feb 2008 19:07:43 +0000 (19:07 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@297 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/xscale.c

index ec49a8c6b311fbc2f59c28167f4b722c8b062ade..f652ee35d0f11e417480f65dbd5a5d5ecd4f7359 100644 (file)
@@ -1014,7 +1014,7 @@ int xscale_debug_entry(target_t *target)
        armv4_5_common_t *armv4_5 = target->arch_info;
        xscale_common_t *xscale = armv4_5->arch_info;
        u32 pc;
-       u32 *buffer = malloc(4 * 10);
+       u32 buffer[10];
        int i;
 
        u32 moe;
@@ -1199,7 +1199,7 @@ int xscale_halt(target_t *target)
        {
                /* this must not happen for a xscale target */
                ERROR("target was in unknown state when halt was requested");
-               exit(-1);
+               return ERROR_TARGET_INVALID;
        }
        else if (target->state == TARGET_RESET)
        {
@@ -2269,7 +2269,7 @@ int xscale_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        xscale_common_t *xscale = armv4_5->arch_info;
-       u8 enable;
+       u8 enable = 0;
        reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON];
        u32 dbcon_value = buf_get_u32(dbcon->value, 0, 32);