Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target: do not expose error numbers to users
[openocd.git] / src / target / target.c
diff --git a/src/target/target.c b/src/target/target.c
index d7607e3a4710e9bfd85cd0353e67267909467301..ba7aa5767355b2e17cf0cc10a6375ef876e3eae3 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -58,6 +58,7 @@ extern struct target_type arm720t_target;
 extern struct target_type arm9tdmi_target;
 extern struct target_type arm920t_target;
 extern struct target_type arm966e_target;
+extern struct target_type arm946e_target;
 extern struct target_type arm926ejs_target;
 extern struct target_type fa526_target;
 extern struct target_type feroceon_target;
@@ -70,6 +71,7 @@ extern struct target_type mips_m4k_target;
 extern struct target_type avr_target;
 extern struct target_type dsp563xx_target;
 extern struct target_type testee_target;
+extern struct target_type avr32_ap7k_target;
 
 static struct target_type *target_types[] =
 {
@@ -78,6 +80,7 @@ static struct target_type *target_types[] =
        &arm920t_target,
        &arm720t_target,
        &arm966e_target,
+       &arm946e_target,
        &arm926ejs_target,
        &fa526_target,
        &feroceon_target,
@@ -90,6 +93,7 @@ static struct target_type *target_types[] =
        &avr_target,
        &dsp563xx_target,
        &testee_target,
+       &avr32_ap7k_target,
        NULL,
 };
 
@@ -503,7 +507,8 @@ static int target_process_reset(struct command_context *cmd_ctx, enum target_res
        jtag_poll_set_enabled(save_poll);
 
        if (retval != JIM_OK) {
-               Jim_PrintErrorMessage(cmd_ctx->interp);
+               Jim_MakeErrorMessage(cmd_ctx->interp);
+               command_print(NULL,"%s\n", Jim_GetString(Jim_GetResult(cmd_ctx->interp), NULL));
                return ERROR_FAIL;
        }
 
@@ -2594,33 +2599,25 @@ COMMAND_HANDLER(handle_load_image_command)
 COMMAND_HANDLER(handle_dump_image_command)
 {
        struct fileio fileio;
-
        uint8_t buffer[560];
-       int retvaltemp;
-
-
+       int retval, retvaltemp;
+       uint32_t address, size;
+       struct duration bench;
        struct target *target = get_current_target(CMD_CTX);
 
        if (CMD_ARGC != 3)
-       {
-               command_print(CMD_CTX, "usage: dump_image <filename> <address> <size>");
-               return ERROR_OK;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       uint32_t address;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], address);
-       uint32_t size;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], size);
 
-       if (fileio_open(&fileio, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
-       {
-               return ERROR_OK;
-       }
+       retval = fileio_open(&fileio, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY);
+       if (retval != ERROR_OK)
+               return retval;
 
-       struct duration bench;
        duration_start(&bench);
 
-       int retval = ERROR_OK;
+       retval = ERROR_OK;
        while (size > 0)
        {
                size_t size_written;
@@ -2641,16 +2638,20 @@ COMMAND_HANDLER(handle_dump_image_command)
                address += this_run_size;
        }
 
-       if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
-               return retvaltemp;
-
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
+               int filesize;
+               retval = fileio_size(&fileio, &filesize);
+               if (retval != ERROR_OK)
+                       return retval;
                command_print(CMD_CTX,
-                               "dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio.size,
-                               duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
+                               "dumped %ld bytes in %fs (%0.3f KiB/s)", (long)filesize,
+                               duration_elapsed(&bench), duration_kbps(&bench, filesize));
        }
 
+       if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+               return retvaltemp;
+
        return retval;
 }
 
@@ -3076,7 +3077,7 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, const char *filenam
 
        int addressSpace = (max-min + 1);
 
-       static const uint32_t maxBuckets = 256 * 1024; /* maximum buckets. */
+       static const uint32_t maxBuckets = 16 * 1024; /* maximum buckets. */
        uint32_t length = addressSpace;
        if (length > maxBuckets)
        {
@@ -3103,7 +3104,7 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, const char *filenam
        writeLong(f, min);                      /* low_pc */
        writeLong(f, max);                      /* high_pc */
        writeLong(f, length);           /* # of samples */
-       writeLong(f, 64000000);         /* 64MHz */
+       writeLong(f, 100);                      /* KLUDGE! We lie, ca. 100Hz best case. */
        writeString(f, "seconds");
        for (i = 0; i < (15-strlen("seconds")); i++)
                writeData(f, &zero, 1);
@@ -3629,7 +3630,8 @@ void target_handle_event(struct target *target, enum target_event e)
                                           Jim_GetString(teap->body, NULL));
                        if (Jim_EvalObj(teap->interp, teap->body) != JIM_OK)
                        {
-                               Jim_PrintErrorMessage(teap->interp);
+                               Jim_MakeErrorMessage(teap->interp);
+                               command_print(NULL,"%s\n", Jim_GetString(Jim_GetResult(teap->interp), NULL));
                        }
                }
        }
@@ -3711,7 +3713,7 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
                case TCFG_TYPE:
                        /* not setable */
                        if (goi->isconfigure) {
-                               Jim_SetResult_sprintf(goi->interp,
+                               Jim_SetResultFormatted(goi->interp,
                                                "not settable: %s", n->name);
                                return JIM_ERR;
                        } else {
@@ -3904,7 +3906,7 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
                case TCFG_VARIANT:
                        if (goi->isconfigure) {
                                if (goi->argc < 1) {
-                                       Jim_SetResult_sprintf(goi->interp,
+                                       Jim_SetResultFormatted(goi->interp,
                                                                                   "%s ?STRING?",
                                                                                   n->name);
                                        return JIM_ERR;
@@ -3982,7 +3984,7 @@ static int jim_target_mw(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
        if (goi.argc < 2 || goi.argc > 4)
        {
-               Jim_SetResult_sprintf(goi.interp,
+               Jim_SetResultFormatted(goi.interp,
                                "usage: %s [phys] <address> <data> [<count>]", cmd_name);
                return JIM_ERR;
        }
@@ -4053,7 +4055,7 @@ static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
        if ((goi.argc < 1) || (goi.argc > 3))
        {
-               Jim_SetResult_sprintf(goi.interp,
+               Jim_SetResultFormatted(goi.interp,
                                "usage: %s [phys] <address> [<count>]", cmd_name);
                return JIM_ERR;
        }
@@ -4120,40 +4122,42 @@ static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                }
                e = fn(target, a, b, y / b, target_buf);
                if (e != ERROR_OK) {
-                       Jim_SetResult_sprintf(interp, "error reading target @ 0x%08lx", (int)(a));
+                       char tmp[10];
+                       snprintf(tmp, sizeof(tmp), "%08lx", (long)a);
+                       Jim_SetResultFormatted(interp, "error reading target @ 0x%s", tmp);
                        return JIM_ERR;
                }
 
-               Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a));
+               command_print(NULL, "0x%08x ", (int)(a));
                switch (b) {
                case 4:
                        for (x = 0; x < 16 && x < y; x += 4)
                        {
                                z = target_buffer_get_u32(target, &(target_buf[ x ]));
-                               Jim_fprintf(interp, interp->cookie_stdout, "%08x ", (int)(z));
+                               command_print(NULL, "%08x ", (int)(z));
                        }
                        for (; (x < 16) ; x += 4) {
-                               Jim_fprintf(interp, interp->cookie_stdout, "         ");
+                               command_print(NULL, "         ");
                        }
                        break;
                case 2:
                        for (x = 0; x < 16 && x < y; x += 2)
                        {
                                z = target_buffer_get_u16(target, &(target_buf[ x ]));
-                               Jim_fprintf(interp, interp->cookie_stdout, "%04x ", (int)(z));
+                               command_print(NULL, "%04x ", (int)(z));
                        }
                        for (; (x < 16) ; x += 2) {
-                               Jim_fprintf(interp, interp->cookie_stdout, "     ");
+                               command_print(NULL, "     ");
                        }
                        break;
                case 1:
                default:
                        for (x = 0 ; (x < 16) && (x < y) ; x += 1) {
                                z = target_buffer_get_u8(target, &(target_buf[ x ]));
-                               Jim_fprintf(interp, interp->cookie_stdout, "%02x ", (int)(z));
+                               command_print(NULL, "%02x ", (int)(z));
                        }
                        for (; (x < 16) ; x += 1) {
-                               Jim_fprintf(interp, interp->cookie_stdout, "   ");
+                               command_print(NULL, "   ");
                        }
                        break;
                }
@@ -4175,7 +4179,7 @@ static int jim_target_md(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                /* terminate */
                target_buf[16] = 0;
                /* print - with a newline */
-               Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf);
+               command_print(NULL, "%s\n", target_buf);
                /* NEXT... */
                c -= 16;
                a += 16;
@@ -4199,7 +4203,7 @@ static int jim_target_array2mem(Jim_Interp *interp,
 
 static int jim_target_tap_disabled(Jim_Interp *interp)
 {
-       Jim_SetResult_sprintf(interp, "[TAP is disabled]");
+       Jim_SetResultFormatted(interp, "[TAP is disabled]");
        return JIM_ERR;
 }
 
@@ -4217,7 +4221,6 @@ static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv
        int e = target->type->examine(target);
        if (e != ERROR_OK)
        {
-               Jim_SetResult_sprintf(interp, "examine-fails: %d", e);
                return JIM_ERR;
        }
        return JIM_OK;
@@ -4257,7 +4260,6 @@ static int jim_target_poll(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        }
        if (e != ERROR_OK)
        {
-               Jim_SetResult_sprintf(interp, "poll-fails: %d", e);
                return JIM_ERR;
        }
        return JIM_OK;
@@ -4298,7 +4300,7 @@ static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        }
        if (!target->type->assert_reset || !target->type->deassert_reset)
        {
-               Jim_SetResult_sprintf(interp,
+               Jim_SetResultFormatted(interp,
                                "No target-specific reset for %s",
                                target_name(target));
                return JIM_ERR;
@@ -4339,7 +4341,7 @@ static int jim_target_wait_state(Jim_Interp *interp, int argc, Jim_Obj *const *a
        if (goi.argc != 2)
        {
                const char *cmd_name = Jim_GetString(argv[0], NULL);
-               Jim_SetResult_sprintf(goi.interp,
+               Jim_SetResultFormatted(goi.interp,
                                "%s <state_name> <timeout_in_msec>", cmd_name);
                return JIM_ERR;
        }
@@ -4362,10 +4364,12 @@ static int jim_target_wait_state(Jim_Interp *interp, int argc, Jim_Obj *const *a
        e = target_wait_state(target, n->value, a);
        if (e != ERROR_OK)
        {
-               Jim_SetResult_sprintf(goi.interp,
-                               "target: %s wait %s fails (%d) %s",
+               Jim_Obj *eObj = Jim_NewIntObj(interp, e);
+               Jim_SetResultFormatted(goi.interp,
+                               "target: %s wait %s fails (%#s) %s",
                                target_name(target), n->name,
-                               e, target_strerror_safe(e));
+                               eObj, target_strerror_safe(e));
+               Jim_FreeNewObj(interp, eObj);
                return JIM_ERR;
        }
        return JIM_OK;
@@ -4414,7 +4418,7 @@ static int jim_target_invoke_event(Jim_Interp *interp, int argc, Jim_Obj *const
        if (goi.argc != 1)
        {
                const char *cmd_name = Jim_GetString(argv[0], NULL);
-               Jim_SetResult_sprintf(goi.interp, "%s <eventname>", cmd_name);
+               Jim_SetResultFormatted(goi.interp, "%s <eventname>", cmd_name);
                return JIM_ERR;
        }
        Jim_Nvp *n;
@@ -4585,7 +4589,7 @@ static int target_create(Jim_GetOptInfo *goi)
        cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
        if (cmd) {
                cp = Jim_GetString(new_cmd, NULL);
-               Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
+               Jim_SetResultFormatted(goi->interp, "Command/target: %s Exists", cp);
                return JIM_ERR;
        }
 
@@ -4600,7 +4604,7 @@ static int target_create(Jim_GetOptInfo *goi)
                }
        }
        if (target_types[x] == NULL) {
-               Jim_SetResult_sprintf(goi->interp, "Unknown target type %s, try one of ", cp);
+               Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
                for (x = 0 ; target_types[x] ; x++) {
                        if (target_types[x + 1]) {
                                Jim_AppendStrings(goi->interp,
@@ -4810,7 +4814,7 @@ static int jim_target_number(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        LOG_WARNING("don't use numbers as target identifiers; use names");
        if (goi.argc != 1)
        {
-               Jim_SetResult_sprintf(goi.interp, "usage: target number <number>");
+               Jim_SetResultFormatted(goi.interp, "usage: target number <number>");
                return JIM_ERR;
        }
        jim_wide w;
@@ -4827,8 +4831,12 @@ static int jim_target_number(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
                Jim_SetResultString(goi.interp, target_name(target), -1);
                return JIM_OK;
        }
-       Jim_SetResult_sprintf(goi.interp,
-                       "Target: number %d does not exist", (int)(w));
+       {
+               Jim_Obj *wObj = Jim_NewIntObj(goi.interp, w);
+               Jim_SetResultFormatted(goi.interp,
+                       "Target: number %#s does not exist", wObj);
+               Jim_FreeNewObj(interp, wObj);
+       }
        return JIM_ERR;
 }
 
@@ -4950,9 +4958,10 @@ COMMAND_HANDLER(handle_fast_load_image_command)
        struct duration bench;
        duration_start(&bench);
 
-       if (image_open(&image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL) != ERROR_OK)
+       retval = image_open(&image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL);
+       if (retval != ERROR_OK)
        {
-               return ERROR_OK;
+               return retval;
        }
 
        image_size = 0x0;
@@ -4961,6 +4970,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
        fastload = (struct FastLoad *)malloc(sizeof(struct FastLoad)*image.num_sections);
        if (fastload == NULL)
        {
+               command_print(CMD_CTX, "out of memory");
                image_close(&image);
                return ERROR_FAIL;
        }
@@ -4972,6 +4982,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
                {
                        command_print(CMD_CTX, "error allocating buffer for section (%d bytes)",
                                                  (int)(image.sections[i].size));
+                       retval = ERROR_FAIL;
                        break;
                }
 
@@ -5007,6 +5018,9 @@ COMMAND_HANDLER(handle_fast_load_image_command)
                        if (fastload[i].data == NULL)
                        {
                                free(buffer);
+                               command_print(CMD_CTX, "error allocating buffer for section (%d bytes)",
+                                                         length);
+                               retval = ERROR_FAIL;
                                break;
                        }
                        memcpy(fastload[i].data, buffer + offset, length);
@@ -5061,14 +5075,18 @@ COMMAND_HANDLER(handle_fast_load_command)
                command_print(CMD_CTX, "Write to 0x%08x, length 0x%08x",
                                          (unsigned int)(fastload[i].address),
                                          (unsigned int)(fastload[i].length));
-               if (retval == ERROR_OK)
+               retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
+               if (retval != ERROR_OK)
                {
-                       retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
+                       break;
                }
                size += fastload[i].length;
        }
-       int after = timeval_ms();
-       command_print(CMD_CTX, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
+       if (retval == ERROR_OK)
+       {
+               int after = timeval_ms();
+               command_print(CMD_CTX, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
+       }
        return retval;
 }
 
@@ -5296,7 +5314,7 @@ static const struct command_registration target_exec_command_handlers[] = {
                .usage = "filename [offset [type]]",
        },
        {
-               .name = "ocd_mem2array",
+               .name = "mem2array",
                .mode = COMMAND_EXEC,
                .jim_handler = jim_mem2array,
                .help = "read 8/16/32 bit memory and return as a TCL array "
@@ -5304,7 +5322,7 @@ static const struct command_registration target_exec_command_handlers[] = {
                .usage = "arrayname bitwidth address count",
        },
        {
-               .name = "ocd_array2mem",
+               .name = "array2mem",
                .mode = COMMAND_EXEC,
                .jim_handler = jim_array2mem,
                .help = "convert a TCL array to memory locations "
Open On-Chip Debugger

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)