imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net>:

Browse Source 
Currently the "debug_level 3" command tracing ignores commands
that could return values to TCL scripts (by plugging in to a
slightly lower level of the interpreter stack).

Fix that by abstracting the tracing command and starting to
make some of those previously-untraced commands use this new
mechanism.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2224 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-12 22:06:02 +00:00
parent 7b65cb367f
commit cdd8f23b9b
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/helper/command.c
View File

@ -61,6 +61,23 @@ static void tcl_output(void *privData, const char *file, int line, const char *f
extern command_context_t *global_cmd_ctx;
void script_debug(Jim_Interp *interp, const char *name, int argc, Jim_Obj *const *argv)
{
int i;
LOG_DEBUG("command - %s", name);
for (i = 0; i < argc; i++) {
int len;
const char *w = Jim_GetString(argv[i], &len);
/* end of line comment? */
if (*w == '#')
break;
LOG_DEBUG("%s - argv[%d]=%s", name, i, w);
}
}
static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
/* the private data is stashed in the interp structure */
@ -85,7 +102,7 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
target_call_timer_callbacks_now();
LOG_USER_N("%s", ""); /* Keep GDB connection alive*/
LOG_DEBUG("script_command - %s", c->name);
script_debug(interp, c->name, argc, argv);
words = malloc(sizeof(char *) * argc);
for (i = 0; i < argc; i++)
@ -102,7 +119,6 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
return JIM_ERR;
}
LOG_DEBUG("script_command - %s, argv[%u]=%s", c->name, i, words[i]);
}
nwords = i;

2
src/helper/command.h
View File

@ -123,4 +123,6 @@ DEFINE_PARSE_ULONG(u32, uint32_t, UINT32_MAX)
DEFINE_PARSE_ULONG(u16, uint16_t, UINT16_MAX)
DEFINE_PARSE_ULONG(u8, uint8_t, UINT8_MAX)
void script_debug(Jim_Interp *interp, const char *cmd, int argc, Jim_Obj *const *argv);
#endif /* COMMAND_H */

6
src/jtag/tcl.c
View File

@ -1248,6 +1248,8 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
endstate = TAP_IDLE;
script_debug(interp, "drscan", argc, args);
/* validate arguments as numbers */
e = JIM_OK;
for (i = 2; i < argc; i+=2)
@ -1369,6 +1371,8 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
return JIM_ERR;
}
script_debug(interp, "pathmove", argc, args);
int i;
for (i=0; i<argc-1; i++)
{
@ -1403,6 +1407,8 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
static int Jim_Command_flush_count(Jim_Interp *interp, int argc, Jim_Obj *const *args)
{
script_debug(interp, "flush_count", argc, args);
Jim_SetResult(interp, Jim_NewIntObj(interp, jtag_get_flush_queue_count()));
return JIM_OK;