moving Tcl stuff around slightly.
[openocd.git] / src / target / target.c
index d1e807284c355380b1aa43d511549f16a478f41d..86b42db26a1b9914378895d6c5804f33674b3b7f 100644 (file)
@@ -220,33 +220,13 @@ target_t* get_current_target(command_context_t *cmd_ctx)
  */
 int target_init_handler(struct target_s *target, enum target_event event, void *priv)
 {
-       FILE *script;
        struct command_context_s *cmd_ctx = priv;
        
-       if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
+       if (event == TARGET_EVENT_HALTED)
        {
-               if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0)
-               {
-                       reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1);
-                       u32 t=*((u32 *)reg->value);
-                       if (t!=0)
-                       {
-                               LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?");
-                       }
-               }
-
                target_unregister_event_callback(target_init_handler, priv);
 
-               script = open_file_from_path(target->reset_script, "r");
-               if (!script)
-               {
-                       LOG_ERROR("couldn't open script file %s", target->reset_script);
-                               return ERROR_OK;
-               }
-
-               LOG_INFO("executing reset script '%s'", target->reset_script);
-               command_run_file(cmd_ctx, script, COMMAND_EXEC);
-               fclose(script);
+               target_invoke_script(cmd_ctx, target, "reset");
 
                jtag_execute_queue();
        }
@@ -305,6 +285,13 @@ int target_process_reset(struct command_context_s *cmd_ctx)
 
        jtag->speed(jtag_speed);
 
+       target = targets;
+       while (target)
+       {
+               target_invoke_script(cmd_ctx, target, "pre_reset");
+               target = target->next;
+       }
+       
        if ((retval = jtag_init_reset(cmd_ctx)) != ERROR_OK)
                return retval;
        
@@ -946,7 +933,8 @@ int target_register_commands(struct command_context_s *cmd_ctx)
 {
        register_command(cmd_ctx, NULL, "target", handle_target_command, COMMAND_CONFIG, "target <cpu> [reset_init default - DEPRECATED] <chainpos> <endianness> <variant> [cpu type specifc args]");
        register_command(cmd_ctx, NULL, "targets", handle_targets_command, COMMAND_EXEC, NULL);
-       register_command(cmd_ctx, NULL, "target_script", handle_target_script_command, COMMAND_CONFIG, NULL);
+       register_command(cmd_ctx, NULL, "target_script", handle_target_script_command, COMMAND_CONFIG, 
+       "target_script <target#> <event=reset/pre_reset/post_halt/pre_resume/gdb_program_config> <script_file>");
        register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, "<target> <run time ms>");
        register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area <target#> <address> <size> <'backup'|'nobackup'> [virtual address]");
        register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys <virtual address>");
@@ -1146,6 +1134,23 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
        return retval;
 }
 
+int target_blank_check_memory(struct target_s *target, u32 address, u32 size, u32* blank)
+{
+       int retval;
+       if (!target->type->examined)
+       {
+               LOG_ERROR("Target not examined yet");
+               return ERROR_FAIL;
+       }
+       
+       if (target->type->blank_check_memory == 0)
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       
+       retval = target->type->blank_check_memory(target, address, size, blank);
+                       
+       return retval;
+}
+
 int target_read_u32(struct target_s *target, u32 address, u32 *value)
 {
        u8 value_buf[4];
@@ -1382,7 +1387,9 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
 
                                *last_target_p = malloc(sizeof(target_t));
                                
-                               (*last_target_p)->type = target_types[i];
+                               /* allocate memory for each unique target type */
+                               (*last_target_p)->type = (target_type_t*)malloc(sizeof(target_type_t));
+                               *((*last_target_p)->type) = *target_types[i]; 
                                
                                if (strcmp(args[1], "big") == 0)
                                        (*last_target_p)->endianness = TARGET_BIG_ENDIAN;
@@ -1414,11 +1421,6 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
                                }
                                (*last_target_p)->run_and_halt_time = 1000; /* default 1s */
                                
-                               (*last_target_p)->reset_script = NULL;
-                               (*last_target_p)->post_halt_script = NULL;
-                               (*last_target_p)->pre_resume_script = NULL;
-                               (*last_target_p)->gdb_program_script = NULL;
-                               
                                (*last_target_p)->working_area = 0x0;
                                (*last_target_p)->working_area_size = 0x0;
                                (*last_target_p)->working_areas = NULL;
@@ -1463,7 +1465,14 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
        return ERROR_OK;
 }
 
-/* usage: target_script <target#> <event> <script_file> */
+int target_invoke_script(struct command_context_s *cmd_ctx, target_t *target, char *name)
+{
+       return command_run_linef(cmd_ctx, " if {[catch {info body target_%s_%d} t]==0} {target_%s_%d}", 
+       name, get_num_by_target(target),
+       name, get_num_by_target(target));
+}
+
+
 int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        target_t *target = NULL;
@@ -1481,35 +1490,14 @@ int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, c
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
        
-       if (strcmp(args[1], "reset") == 0)
-       {
-               if (target->reset_script)
-                       free(target->reset_script);
-               target->reset_script = strdup(args[2]);
-       }
-       else if (strcmp(args[1], "post_halt") == 0)
-       {
-               if (target->post_halt_script)
-                       free(target->post_halt_script);
-               target->post_halt_script = strdup(args[2]);
-       }
-       else if (strcmp(args[1], "pre_resume") == 0)
-       {
-               if (target->pre_resume_script)
-                       free(target->pre_resume_script);
-               target->pre_resume_script = strdup(args[2]);
-       }
-       else if (strcmp(args[1], "gdb_program_config") == 0)
-       {
-               if (target->gdb_program_script)
-                       free(target->gdb_program_script);
-               target->gdb_program_script = strdup(args[2]);
-       }
-       else
-       {
-               LOG_ERROR("unknown event type: '%s", args[1]);
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       }
+       /* Define a tcl procedure which we'll invoke upon some event */
+       command_run_linef(cmd_ctx, 
+       "proc target_%s_%d {} {"
+       "openocd {script %s}" 
+       "}",
+       args[1],
+       get_num_by_target(target),
+       args[2]);
        
        return ERROR_OK;
 }
@@ -1991,14 +1979,11 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
                                output_len = 0;
                        }
                }
-       } else
-       {
-               LOG_ERROR("Failure examining memory");
        }
 
        free(buffer);
        
-       return ERROR_OK;
+       return retval;
 }
 
 int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
@@ -2414,7 +2399,7 @@ int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
 
                while (watchpoint)
                {
-                       command_print(cmd_ctx, "address: 0x%8.8x, mask: 0x%8.8x, r/w/a: %i, value: 0x%8.8x, mask: 0x%8.8x", watchpoint->address, watchpoint->length, watchpoint->rw, watchpoint->value, watchpoint->mask);
+                       command_print(cmd_ctx, "address: 0x%8.8x, len: 0x%8.8x, r/w/a: %i, value: 0x%8.8x, mask: 0x%8.8x", watchpoint->address, watchpoint->length, watchpoint->rw, watchpoint->value, watchpoint->mask);
                        watchpoint = watchpoint->next;
                }
        } 

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)