auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ETM: simplify ETM initialization code paths

Browse Source 
Return NULL from etm_build_reg_cache() not ERROR_OK; and share
code on that fault path.

Let ETM code handle any tracking of its cache -- not callers.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell
2009-11-13 16:26:39 -08:00
parent a7f5cdf999
commit 78c6b922e2
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/target/etm.c
View File

@@ -349,10 +349,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
break;
default:
LOG_WARNING("Bad ETMv1 protocol %d", config >> 28);
free(reg_cache);
free(reg_list);
free(arch_info);
return ERROR_OK;
goto fail;
}
}
etm_ctx->bcd_vers = bcd_vers;
@@ -396,10 +393,7 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
if (!etb)
{
LOG_ERROR("etb selected as etm capture driver, but no ETB configured");
free(reg_cache);
free(reg_list);
free(arch_info);
return ERROR_OK;
goto fail;
}
reg_cache->next = etb_build_reg_cache(etb);
@@ -409,6 +403,12 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
etm_ctx->reg_cache = reg_cache;
return reg_cache;
fail:
free(reg_cache);
free(reg_list);
free(arch_info);
return NULL;
}
static int etm_read_reg(struct reg *reg)