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
#include <openocd_tcl.h>
int fast_and_dangerous = 0;
#include <openocd_tcl.h>
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_fast_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);
if (retcode != JIM_OK)
return ERROR_FAIL;
if (retcode != JIM_OK)
return ERROR_FAIL;
- active_cmd_ctx = context;
retcode = Jim_Eval(interp, line);
if (retcode == JIM_ERR) {
if (retval!=ERROR_COMMAND_CLOSE_CONNECTION)
retcode = Jim_Eval(interp, line);
if (retcode == JIM_ERR) {
if (retval!=ERROR_COMMAND_CLOSE_CONNECTION)
-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)
{
static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
target_t *target;
static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
target_t *target;
+ command_context_t *context;
long l;
u32 width;
u32 len;
long l;
u32 width;
u32 len;
- 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;
+ }
static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
target_t *target;
static int Jim_Command_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
target_t *target;
+ command_context_t *context;
long l;
u32 width;
u32 len;
long l;
u32 width;
u32 len;
- 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;
+ }
{
if (argc != 2)
return JIM_ERR;
{
if (argc != 2)
return JIM_ERR;
- char *str = (char*)Jim_GetString(argv[1], NULL);
+ const char *str = Jim_GetString(argv[1], NULL);
LOG_USER("%s", str);
return JIM_OK;
}
LOG_USER("%s", str);
return JIM_OK;
}
{
size_t nbytes;
const char *ptr;
{
size_t nbytes;
const char *ptr;
+ Jim_Interp *interp;
+ command_context_t *context;
/* make it a char easier to read code */
ptr = _ptr;
/* make it a char easier to read code */
ptr = _ptr;
+ if (ptr == NULL || interp == NULL || nbytes == 0) {
+ context = Jim_GetAssocData(interp, "context");
+ if (context == NULL)
+ {
+ LOG_ERROR("openocd_jim_fwrite: no command context");
/* TODO: Where should this go? */
return n;
}
/* do we have to chunk it? */
/* TODO: Where should this go? */
return n;
}
/* 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);
}
/* GRR we must chunk - not null terminated */
return strlen(ptr);
}
/* GRR we must chunk - not null terminated */
/* terminate it */
chunk[n] = 0;
/* output it */
/* terminate it */
chunk[n] = 0;
/* output it */
- command_output_text(active_cmd_ctx, chunk);
+ command_output_text(context, chunk);
-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 */
return 0;
{
/* TCL wants to read... tell him no */
return 0;
+ Jim_Interp *interp;
+ command_context_t *context;
+
- if (active_cmd_ctx) {
- cp = alloc_vprintf(fmt, ap);
- if (cp) {
- command_output_text(active_cmd_ctx, cp);
- n = strlen(cp);
- free(cp);
- }
+ interp = cookie;
+ if (interp == NULL)
+ return n;
+
+ context = Jim_GetAssocData(interp, "context");
+ 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);
extern unsigned const char startup_tcl[];
void initJim(void)
extern unsigned const char startup_tcl[];
void initJim(void)
Jim_CreateCommand(interp, "openocd_find", Jim_Command_find, NULL, NULL);
Jim_CreateCommand(interp, "echo", Jim_Command_echo, NULL, NULL);
Jim_CreateCommand(interp, "mem2array", Jim_Command_mem2array, NULL, NULL );
Jim_CreateCommand(interp, "array2mem", Jim_Command_array2mem, NULL, NULL );
/* Set Jim's STDIO */
Jim_CreateCommand(interp, "openocd_find", Jim_Command_find, NULL, NULL);
Jim_CreateCommand(interp, "echo", Jim_Command_echo, NULL, NULL);
Jim_CreateCommand(interp, "mem2array", Jim_Command_mem2array, NULL, NULL );
Jim_CreateCommand(interp, "array2mem", Jim_Command_array2mem, NULL, NULL );
/* Set Jim's STDIO */
- interp->cookie_stdin = NULL;
- interp->cookie_stdout = NULL;
- interp->cookie_stderr = NULL;
+ interp->cookie_stdin = interp;
+ interp->cookie_stdout = interp;
+ interp->cookie_stderr = interp;
interp->cb_fwrite = openocd_jim_fwrite;
interp->cb_fread = openocd_jim_fread ;
interp->cb_vfprintf = openocd_jim_vfprintf;
interp->cb_fwrite = openocd_jim_fwrite;
interp->cb_fread = openocd_jim_fread ;
interp->cb_vfprintf = openocd_jim_vfprintf;
LOG_OUTPUT( OPENOCD_VERSION "\n" );
LOG_OUTPUT( OPENOCD_VERSION "\n" );
register_command(cmd_ctx, NULL, "init", handle_init_command,
COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
register_command(cmd_ctx, NULL, "init", handle_init_command,
COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
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)