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

ETM: update arm[79]tdmi_examine()

Browse Source 
Make ARM7 and ARM9 cores use the new toplevel ETM handle to
trigger ETM setup, not the to-be-removed lower level one.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell
2009-11-11 21:50:10 -08:00
parent 4b20ed6b5c
commit 3ae4401901
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/target/arm7tdmi.c
View File

@@ -663,11 +663,12 @@ int arm7tdmi_examine(struct target_s *target)
(*cache_p) = t; (*cache_p) = t;
arm7_9->eice_cache = (*cache_p); arm7_9->eice_cache = (*cache_p);
if (arm7_9->etm_ctx) if (arm7_9->armv4_5_common.etm)
{ {
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
(*cache_p)->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx); (*cache_p)->next = etm_build_reg_cache(target,
arm7_9->etm_ctx->reg_cache = (*cache_p)->next; jtag_info, arm7_9->armv4_5_common.etm);
arm7_9->armv4_5_common.etm->reg_cache = (*cache_p)->next;
} }
target_set_examined(target); target_set_examined(target);
} }
@@ -675,7 +676,7 @@ int arm7tdmi_examine(struct target_s *target)
return retval; return retval;
if ((retval = arm7_9_setup(target)) != ERROR_OK) if ((retval = arm7_9_setup(target)) != ERROR_OK)
return retval; return retval;
if (arm7_9->etm_ctx) if (arm7_9->armv4_5_common.etm)
{ {
if ((retval = etm_setup(target)) != ERROR_OK) if ((retval = etm_setup(target)) != ERROR_OK)
return retval; return retval;

9
src/target/arm9tdmi.c
View File

@@ -758,11 +758,12 @@ int arm9tdmi_examine(struct target_s *target)
(*cache_p) = t; (*cache_p) = t;
arm7_9->eice_cache = (*cache_p); arm7_9->eice_cache = (*cache_p);
if (arm7_9->etm_ctx) if (arm7_9->armv4_5_common.etm)
{ {
arm_jtag_t *jtag_info = &arm7_9->jtag_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info;
(*cache_p)->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx); (*cache_p)->next = etm_build_reg_cache(target,
arm7_9->etm_ctx->reg_cache = (*cache_p)->next; jtag_info, arm7_9->armv4_5_common.etm);
arm7_9->armv4_5_common.etm->reg_cache = (*cache_p)->next;
} }
target_set_examined(target); target_set_examined(target);
} }
@@ -770,7 +771,7 @@ int arm9tdmi_examine(struct target_s *target)
return retval; return retval;
if ((retval = arm7_9_setup(target)) != ERROR_OK) if ((retval = arm7_9_setup(target)) != ERROR_OK)
return retval; return retval;
if (arm7_9->etm_ctx) if (arm7_9->armv4_5_common.etm)
{ {
if ((retval = etm_setup(target)) != ERROR_OK) if ((retval = etm_setup(target)) != ERROR_OK)
return retval; return retval;