interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Charles Hardin ckhardin at gmail.com Instead of stashing the context in a global variable, just use the "context" 

associated with the interp structure being passed around

And fixed the message referring to mem2array in the array2mem function


git-svn-id: svn://svn.berlios.de/openocd/trunk@821 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-07-17 17:31:07 +00:00
parent 5fefa83d07
commit 0ebb33b185
2 changed files with 64 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/helper/command.c
View File

@ -41,7 +41,6 @@
#include <openocd_tcl.h> #include <openocd_tcl.h>
int fast_and_dangerous = 0; int fast_and_dangerous = 0;
extern command_context_t *active_cmd_ctx;
int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@ -396,7 +395,6 @@ int command_run_line(command_context_t *context, char *line)
if (retcode != JIM_OK) if (retcode != JIM_OK)
return ERROR_FAIL; return ERROR_FAIL;
active_cmd_ctx = context;
retcode = Jim_Eval(interp, line); retcode = Jim_Eval(interp, line);
if (retcode == JIM_ERR) { if (retcode == JIM_ERR) {
if (retval!=ERROR_COMMAND_CLOSE_CONNECTION) if (retval!=ERROR_COMMAND_CLOSE_CONNECTION)

84
src/openocd.c
View File

@ -155,7 +155,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
} }
Jim_Interp *interp; Jim_Interp *interp;
command_context_t *active_cmd_ctx;
static int new_int_array_element(Jim_Interp * interp, const char *varname, int idx, u32 val) static int new_int_array_element(Jim_Interp * interp, const char *varname, int idx, u32 val)
{ {
@ -188,6 +187,7 @@ static int new_int_array_element(Jim_Interp * interp, const char *varname, int i
static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{ {
target_t *target; target_t *target;
command_context_t *context;
long l; long l;
u32 width; u32 width;
u32 len; u32 len;
@ -270,7 +270,18 @@ static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *a
return JIM_ERR; return JIM_ERR;
} }
target = get_current_target(active_cmd_ctx); context = Jim_GetAssocData(interp, "context");
if (context == NULL)
{
LOG_ERROR("mem2array: no command context");
return JIM_ERR;
}
target = get_current_target(context);
if (target == NULL)
{
LOG_ERROR("mem2array: no current target");
return JIM_ERR;
}
/* Transfer loop */ /* Transfer loop */
@ -353,6 +364,7 @@ static int get_int_array_element(Jim_Interp * interp, const char *varname, int i
static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{ {
target_t *target; target_t *target;
command_context_t *context;
long l; long l;
u32 width; u32 width;
u32 len; u32 len;
@ -435,7 +447,18 @@ static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *a
return JIM_ERR; return JIM_ERR;
} }
target = get_current_target(active_cmd_ctx); context = Jim_GetAssocData(interp, "context");
if (context == NULL)
{
LOG_ERROR("array2mem: no command context");
return JIM_ERR;
}
target = get_current_target(context);
if (target == NULL)
{
LOG_ERROR("array2mem: no current target");
return JIM_ERR;
}
/* Transfer loop */ /* Transfer loop */
@ -506,7 +529,7 @@ static int Jim_Command_echo(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{ {
if (argc != 2) if (argc != 2)
return JIM_ERR; return JIM_ERR;
char *str = (char*)Jim_GetString(argv[1], NULL); const char *str = Jim_GetString(argv[1], NULL);
LOG_USER("%s", str); LOG_USER("%s", str);
return JIM_OK; return JIM_OK;
} }
@ -517,24 +540,30 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
{ {
size_t nbytes; size_t nbytes;
const char *ptr; const char *ptr;
Jim_Interp *interp;
command_context_t *context;
/* make it a char easier to read code */ /* make it a char easier to read code */
ptr = _ptr; ptr = _ptr;
interp = cookie;
nbytes = size * n; nbytes = size * n;
if (nbytes == 0) { if (ptr == NULL || interp == NULL || nbytes == 0) {
return 0; return 0;
} }
if (!active_cmd_ctx) { context = Jim_GetAssocData(interp, "context");
if (context == NULL)
{
LOG_ERROR("openocd_jim_fwrite: no command context");
/* TODO: Where should this go? */ /* TODO: Where should this go? */
return n; return n;
} }
/* do we have to chunk it? */ /* do we have to chunk it? */
if (ptr[nbytes] == 0) { if (ptr[nbytes] == 0)
{
/* no it is a C style string */ /* no it is a C style string */
command_output_text(active_cmd_ctx, ptr); command_output_text(context, ptr);
return strlen(ptr); return strlen(ptr);
} }
/* GRR we must chunk - not null terminated */ /* GRR we must chunk - not null terminated */
@ -551,7 +580,7 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
/* terminate it */ /* terminate it */
chunk[n] = 0; chunk[n] = 0;
/* output it */ /* output it */
command_output_text(active_cmd_ctx, chunk); command_output_text(context, chunk);
ptr += x; ptr += x;
nbytes -= x; nbytes -= x;
} }
@ -559,7 +588,7 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
return n; return n;
} }
static size_t openocd_jim_fread(void *ptr, size_t size, size_t n, void *cookie ) static size_t openocd_jim_fread(void *ptr, size_t size, size_t n, void *cookie)
{ {
/* TCL wants to read... tell him no */ /* TCL wants to read... tell him no */
return 0; return 0;
@ -569,15 +598,27 @@ static int openocd_jim_vfprintf(void *cookie, const char *fmt, va_list ap)
{ {
char *cp; char *cp;
int n; int n;
Jim_Interp *interp;
command_context_t *context;
n = -1; n = -1;
if (active_cmd_ctx) { interp = cookie;
cp = alloc_vprintf(fmt, ap); if (interp == NULL)
if (cp) { return n;
command_output_text(active_cmd_ctx, cp);
n = strlen(cp); context = Jim_GetAssocData(interp, "context");
free(cp); if (context == NULL)
} {
LOG_ERROR("openocd_jim_vfprintf: no command context");
return n;
}
cp = alloc_vprintf(fmt, ap);
if (cp)
{
command_output_text(context, cp);
n = strlen(cp);
free(cp);
} }
return n; return n;
} }
@ -625,9 +666,9 @@ void initJim(void)
Jim_CreateCommand(interp, "array2mem", Jim_Command_array2mem, NULL, NULL ); Jim_CreateCommand(interp, "array2mem", Jim_Command_array2mem, NULL, NULL );
/* Set Jim's STDIO */ /* Set Jim's STDIO */
interp->cookie_stdin = NULL; interp->cookie_stdin = interp;
interp->cookie_stdout = NULL; interp->cookie_stdout = interp;
interp->cookie_stderr = NULL; interp->cookie_stderr = interp;
interp->cb_fwrite = openocd_jim_fwrite; interp->cb_fwrite = openocd_jim_fwrite;
interp->cb_fread = openocd_jim_fread ; interp->cb_fread = openocd_jim_fread ;
interp->cb_vfprintf = openocd_jim_vfprintf; interp->cb_vfprintf = openocd_jim_vfprintf;
@ -676,7 +717,6 @@ command_context_t *setup_command_handler(void)
LOG_OUTPUT( OPENOCD_VERSION "\n" ); LOG_OUTPUT( OPENOCD_VERSION "\n" );
register_command(cmd_ctx, NULL, "init", handle_init_command, register_command(cmd_ctx, NULL, "init", handle_init_command,
COMMAND_ANY, "initializes target and servers - nop on subsequent invocations"); COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");