- fixes issue with reset and arm926ejs core. Thanks Øyvind Harboe

[openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index f77de33939fa8dd232cf0e452f1fafd813d19261..25df2a2b85e4048e8f209b90f9c95f881149ca51 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -313,23 +313,6 @@ int target_process_reset(struct command_context_s *cmd_ctx)
        while (target)
        {
                target->type->deassert_reset(target);
-
-               switch (target->reset_mode)
-               {
-                       case RESET_INIT:
-                       case RESET_HALT:
-                               // If we're already halted, then this is harmless(reducing # of execution paths here)
-                               // If nSRST & nTRST are tied together then the halt during reset failed(logged) and
-                               // we use this as fallback(there is no other output to tell the user that reset halt 
-                               // didn't work).
-                               target->type->poll(target);
-                               target->type->halt(target);
-                               break;
-                       default:
-                               break;
-               }
-               
-               
                target = target->next;
        }
        jtag_execute_queue();
@@ -781,6 +764,11 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
                size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
        {
                buffer = malloc(size);
+               if (buffer == NULL)
+               {
+                       ERROR("error allocating buffer for section (%d bytes)", size);
+                       return ERROR_OK;
+               }
                target_read_buffer(target, address, size, buffer);
 
                /* convert to target endianess */
@@ -1066,7 +1054,7 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
                                
                                (*last_target_p)->dbgmsg = NULL;
                                (*last_target_p)->dbg_msg_enabled = 0;
-                               
+                                                               
                                (*last_target_p)->type->target_command(cmd_ctx, cmd, args, argc, *last_target_p);
                                
                                found = 1;
@@ -1435,10 +1423,10 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                                break;
                        case ERROR_TARGET_TIMEOUT:
                                command_print(cmd_ctx, "target timed out... shutting down");
-                               exit(-1);
+                               return retval;
                        default:
                                command_print(cmd_ctx, "unknown error... shutting down");
-                               exit(-1);
+                               return retval;
                }
        }
        
@@ -1588,7 +1576,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
        const int line_bytecnt = 32;
        int count = 1;
        int size = 4;
-       u32 address = 0;  
+       u32 address = 0;
        int line_modulo;
        int i;
 
@@ -1920,6 +1908,11 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch
        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);
+               if (buffer == NULL)
+               {
+                       command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
+                       break;
+               }
                if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
                {
                        ERROR("image_read_section failed with error code: %i", retval);
@@ -2150,3 +2143,4 @@ int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args
 }
 
 
+