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

armv7m: use generic arm::core_mode

Browse Source 
To simplify things change over to using the generic core_mode struct rather
than maintaining a armv7m specific one.

Change-Id: Ibf32b785d896fef4f33307fabe0d8eb266f7086f
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/966
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Spencer Oliver
2013-01-10 12:48:15 +00:00
committed by Andreas Fritiofson
parent bf3f35092e
commit fc2abe63fd
16 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/cortex_m.c
View File

@@ -451,18 +451,16 @@ static int cortex_m3_debug_entry(struct target *target)
/* Are we in an exception handler */
if (xPSR & 0x1FF) {
armv7m->core_mode = ARMV7M_MODE_HANDLER;
armv7m->exception_number = (xPSR & 0x1FF);
arm->core_mode = ARM_MODE_HANDLER;
arm->map = armv7m_msp_reg_map;
} else {
unsigned control = buf_get_u32(armv7m->core_cache
unsigned control = buf_get_u32(arm->core_cache
->reg_list[ARMV7M_CONTROL].value, 0, 2);
/* is this thread privileged? */
armv7m->core_mode = control & 1;
arm->core_mode = armv7m->core_mode
arm->core_mode = control & 1
? ARM_MODE_USER_THREAD
: ARM_MODE_THREAD;
@@ -479,7 +477,7 @@ static int cortex_m3_debug_entry(struct target *target)
cortex_m3_examine_exception_reason(target);
LOG_DEBUG("entered debug state in core mode: %s at PC 0x%" PRIx32 ", target->state: %s",
armv7m_mode_strings[armv7m->core_mode],
arm_mode_name(arm->core_mode),
*(uint32_t *)(arm->pc->value),
target_state_name(target));