cortex_a9: add source files for Cortex A9 support.

[fw/openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 6edc23986e1fefcb9f26f15baa329bc79b6dd848..66aa6bf7bf3d7987b3e31ece61835cd35940f895 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;
@@ -65,6 +66,7 @@ extern struct target_type dragonite_target;
 extern struct target_type xscale_target;
 extern struct target_type cortexm3_target;
 extern struct target_type cortexa8_target;
+extern struct target_type cortexa9_target;
 extern struct target_type arm11_target;
 extern struct target_type mips_m4k_target;
 extern struct target_type avr_target;
@@ -79,6 +81,7 @@ static struct target_type *target_types[] =
        &arm920t_target,
        &arm720t_target,
        &arm966e_target,
+       &arm946e_target,
        &arm926ejs_target,
        &fa526_target,
        &feroceon_target,
@@ -86,6 +89,7 @@ static struct target_type *target_types[] =
        &xscale_target,
        &cortexm3_target,
        &cortexa8_target,
+       &cortexa9_target,
        &arm11_target,
        &mips_m4k_target,
        &avr_target,
@@ -505,7 +509,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;
        }
 
@@ -1210,7 +1215,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
        }
 
        /* mark as used, and return the new (reused) area */
-       new_wa->free = 0;
+       new_wa->free = false;
        *area = new_wa;
 
        /* user pointer */
@@ -1244,7 +1249,7 @@ static int target_free_working_area_restore(struct target *target, struct workin
                        return retval;
        }
 
-       area->free = 1;
+       area->free = true;
 
        /* mark user pointer invalid */
        *area->user = NULL;
@@ -2311,7 +2316,7 @@ COMMAND_HANDLER(handle_md_command)
 
        bool physical=strcmp(CMD_ARGV[0], "phys")==0;
        int (*fn)(struct target *target,
-                       uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+                       uint32_t address, uint32_t size_value, uint32_t count, uint8_t *buffer);
        if (physical)
        {
                CMD_ARGC--;
@@ -3074,7 +3079,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)
        {
@@ -3101,7 +3106,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);
@@ -3627,7 +3632,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));
                        }
                }
        }
@@ -3656,6 +3662,7 @@ enum target_cfg_param {
        TCFG_WORK_AREA_BACKUP,
        TCFG_ENDIAN,
        TCFG_VARIANT,
+       TCFG_COREID,
        TCFG_CHAIN_POSITION,
 };
 
@@ -3668,6 +3675,7 @@ static Jim_Nvp nvp_config_opts[] = {
        { .name = "-work-area-backup", .value = TCFG_WORK_AREA_BACKUP },
        { .name = "-endian" ,          .value = TCFG_ENDIAN },
        { .name = "-variant",          .value = TCFG_VARIANT },
+       { .name = "-coreid",           .value = TCFG_COREID },
        { .name = "-chain-position",   .value = TCFG_CHAIN_POSITION },
 
        { .name = NULL, .value = -1 }
@@ -3709,7 +3717,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 {
@@ -3902,7 +3910,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;
@@ -3920,6 +3928,23 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
                        Jim_SetResultString(goi->interp, target->variant,-1);
                        /* loop for more */
                        break;
+
+               case TCFG_COREID:
+                       if (goi->isconfigure) {
+                               e = Jim_GetOpt_Wide(goi, &w);
+                               if (e != JIM_OK) {
+                                       return e;
+                               }
+                               target->coreid = (int)w;
+                       } else {
+                               if (goi->argc != 0) {
+                                       goto no_params;
+                               }
+                       }
+                       Jim_SetResult(goi->interp, Jim_NewIntObj(goi->interp, target->working_area_size));
+                       /* loop for more */
+                       break;
+
                case TCFG_CHAIN_POSITION:
                        if (goi->isconfigure) {
                                Jim_Obj *o_t;
@@ -3980,7 +4005,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;
        }
@@ -4051,7 +4076,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;
        }
@@ -4118,40 +4143,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;
                }
@@ -4173,7 +4200,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;
@@ -4197,7 +4224,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;
 }
 
@@ -4215,7 +4242,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;
@@ -4255,7 +4281,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;
@@ -4296,7 +4321,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;
@@ -4337,7 +4362,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;
        }
@@ -4360,10 +4385,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;
@@ -4412,7 +4439,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;
@@ -4583,7 +4610,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;
        }
 
@@ -4598,7 +4625,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,
@@ -4628,6 +4655,9 @@ static int target_create(Jim_GetOptInfo *goi)
        /* will be set by "-endian" */
        target->endianness = TARGET_ENDIAN_UNKNOWN;
 
+       /* default to first core, override with -coreid */
+       target->coreid = 0;
+
        target->working_area        = 0x0;
        target->working_area_size   = 0x0;
        target->working_areas       = NULL;
@@ -4808,7 +4838,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;
@@ -4825,8 +4855,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;
 }
 
@@ -4948,9 +4982,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;
@@ -4959,6 +4994,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;
        }
@@ -4970,6 +5006,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;
                }
 
@@ -5005,6 +5042,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);
@@ -5059,14 +5099,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;
 }