refactor arm simulator to allow arm11 code to use it as well - no observable changes...

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

diff --git a/src/target/etm.c b/src/target/etm.c
index 11cb4781e8e5bab5cf49e1290683c3956eb1937e..2623ebe53fb41a77f31320fda155b01754346433 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -246,6 +246,12 @@ reg_cache_t* etm_build_reg_cache(target_t *target, arm_jtag_t *jtag_info, etm_co
                if (!etb)
                {
                        LOG_ERROR("etb selected as etm capture driver, but no ETB configured");
+                       for (i = 0; i < num_regs; i++)
+                       {
+                               free(reg_list[i].value);
+                       }
+                       free(reg_cache);
+                       free(arch_info);
                        return ERROR_OK;
                }
 
@@ -282,10 +288,10 @@ int etm_setup(target_t *target)
        buf_set_u32(etm_ctrl_reg->value, 0, etm_ctrl_reg->size, etm_ctrl_value);
        etm_store_reg(etm_ctrl_reg);
 
-       if ((retval=jtag_execute_queue())!=ERROR_OK)
+       if ((retval = jtag_execute_queue()) != ERROR_OK)
                return retval;
 
-       if ((retval=etm_ctx->capture_driver->init(etm_ctx)) != ERROR_OK)
+       if ((retval = etm_ctx->capture_driver->init(etm_ctx)) != ERROR_OK)
        {
                LOG_ERROR("ETM capture driver initialization failed");
                return retval;
@@ -1107,7 +1113,7 @@ static int handle_etm_tracemode_command(struct command_context_s *cmd_ctx, char
        }
        else if (argc != 0)
        {
-               command_print(cmd_ctx, "usage: configure trace mode <none|data|address|all> <context id bits> <cycle accurate> <branch output>");
+               command_print(cmd_ctx, "usage: configure trace mode <none | data | address | all> <context id bits> <cycle accurate> <branch output>");
                return ERROR_OK;
        }
 
@@ -1202,6 +1208,7 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
 
        if (argc != 5)
        {
+               free(etm_ctx);
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1209,12 +1216,14 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
        if (!target)
        {
                LOG_ERROR("target '%s' not defined", args[0]);
+               free(etm_ctx);
                return ERROR_FAIL;
        }
 
        if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
        {
                command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
+               free(etm_ctx);
                return ERROR_FAIL;
        }
 
@@ -1231,6 +1240,7 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
                        break;
                default:
                        command_print(cmd_ctx, "unsupported ETM port width '%s', must be 4, 8 or 16", args[1]);
+                       free(etm_ctx);
                        return ERROR_FAIL;
        }
 
@@ -1249,6 +1259,7 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
        else
        {
                command_print(cmd_ctx, "unsupported ETM port mode '%s', must be 'normal', 'multiplexed' or 'demultiplexed'", args[2]);
+               free(etm_ctx);
                return ERROR_FAIL;
        }
 
@@ -1263,15 +1274,16 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
        else
        {
                command_print(cmd_ctx, "unsupported ETM port clocking '%s', must be 'full' or 'half'", args[3]);
+               free(etm_ctx);
                return ERROR_FAIL;
        }
 
-       for (i=0; etm_capture_drivers[i]; i++)
+       for (i = 0; etm_capture_drivers[i]; i++)
        {
                if (strcmp(args[4], etm_capture_drivers[i]->name) == 0)
                {
                        int retval;
-                       if ((retval=etm_capture_drivers[i]->register_commands(cmd_ctx)) != ERROR_OK)
+                       if ((retval = etm_capture_drivers[i]->register_commands(cmd_ctx)) != ERROR_OK)
                        {
                                free(etm_ctx);
                                return retval;
@@ -1826,7 +1838,7 @@ int etm_register_commands(struct command_context_s *cmd_ctx)
 int etm_register_user_commands(struct command_context_s *cmd_ctx)
 {
        register_command(cmd_ctx, etm_cmd, "tracemode", handle_etm_tracemode_command,
-               COMMAND_EXEC, "configure trace mode <none|data|address|all> "
+               COMMAND_EXEC, "configure trace mode <none | data | address | all> "
                        "<context_id_bits> <cycle_accurate> <branch_output>");
 
        register_command(cmd_ctx, etm_cmd, "info", handle_etm_info_command,