Index: src/server/gdb_server.c =================================================================== --- src/server/gdb_server.c (revision 766) +++ src/server/gdb_server.c (working copy) @@ -579,7 +579,7 @@ { struct command_context_s *cmd_ctx = priv; - target_invoke_script(cmd_ctx, target, "gdb_program"); + execute_script(cmd_ctx, target->gdb_program_script); jtag_execute_queue(); return ERROR_OK; Index: src/target/target.c =================================================================== --- src/target/target.c (revision 766) +++ src/target/target.c (working copy) @@ -215,6 +215,23 @@ return target; } +void execute_script(struct command_context_s *cmd_ctx, char *script_name) +{ + if (script_name==NULL) + return; + FILE *script; + script = open_file_from_path(script_name, "r"); + if (!script) + { + LOG_ERROR("couldn't open script file %s", script_name); + return; + } + + LOG_INFO("executing script '%s'", script_name); + command_run_file(cmd_ctx, script, COMMAND_EXEC); + fclose(script); +} + /* Process target initialization, when target entered debug out of reset * the handler is unregistered at the end of this function, so it's only called once */ @@ -226,7 +243,7 @@ { target_unregister_event_callback(target_init_handler, priv); - target_invoke_script(cmd_ctx, target, "reset"); + execute_script(cmd_ctx, target->reset_script); jtag_execute_queue(); } @@ -288,7 +305,7 @@ target = targets; while (target) { - target_invoke_script(cmd_ctx, target, "pre_reset"); + execute_script(cmd_ctx, target->pre_reset_script); target = target->next; } @@ -933,8 +950,7 @@ { register_command(cmd_ctx, NULL, "target", handle_target_command, COMMAND_CONFIG, "target [reset_init default - DEPRECATED] [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, - "target_script "); + register_command(cmd_ctx, NULL, "target_script", handle_target_script_command, COMMAND_CONFIG, NULL); register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, " "); register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area
<'backup'|'nobackup'> [virtual address]"); register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys "); @@ -1421,6 +1437,12 @@ } (*last_target_p)->run_and_halt_time = 1000; /* default 1s */ + (*last_target_p)->reset_script = NULL; + (*last_target_p)->pre_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; @@ -1465,14 +1487,7 @@ return ERROR_OK; } -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)); -} - - +/* usage: target_script */ int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = NULL; @@ -1490,14 +1505,41 @@ 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]); + if ((strcmp(args[1], "reset") == 0)||(strcmp(args[1], "post_reset") == 0)) + { + if (target->reset_script) + free(target->reset_script); + target->reset_script = strdup(args[2]); + } + else if (strcmp(args[1], "pre_reset") == 0) + { + if (target->pre_reset_script) + free(target->pre_reset_script); + target->pre_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; + } return ERROR_OK; } Index: src/target/target.h =================================================================== --- src/target/target.h (revision 766) +++ src/target/target.h (working copy) @@ -200,9 +200,13 @@ target_type_t *type; /* target type definition (name, access functions) */ enum target_reset_mode reset_mode; /* what to do after a reset */ int run_and_halt_time; /* how long the target should run after a run_and_halt reset */ + char *pre_reset_script; /* script file to initialize the target before a reset */ + char *reset_script; /* script file to initialize the target after a reset */ + char *post_halt_script; /* script file to execute after the target halted */ + char *pre_resume_script; /* script file to execute before the target resumed */ + char *gdb_program_script; /* script file to execute before programming vis gdb */ u32 working_area; /* working area (initialized RAM). Evaluated - upon first allocation from virtual/physical address. - */ + upon first allocation from virtual/physical address. */ u32 working_area_virt; /* virtual address */ u32 working_area_phys; /* physical address */ u32 working_area_size; /* size in bytes */ @@ -320,9 +324,8 @@ /* Issues USER() statements with target state information */ int target_arch_state(struct target_s *target); -int target_invoke_script(struct command_context_s *cmd_ctx, target_t *target, char *name); +void execute_script(struct command_context_s *cmd_ctx, char *script_name); - #define ERROR_TARGET_INVALID (-300) #define ERROR_TARGET_INIT_FAILED (-301) #define ERROR_TARGET_TIMEOUT (-302)