diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2013-01-10 12:48:15 +0000 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-02-02 16:21:41 +0000 |
| commit | fc2abe63fd3cea7497da7be2955d333bd3f800b9 (patch) | |
| tree | 1fb9a62ccad401300abf3e9227aa0106d8c934e0 /src/target/hla_target.c | |
| parent | bf3f35092ea96b33ceda33d497ec04514e94cb00 (diff) | |
armv7m: use generic arm::core_mode
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>
Diffstat (limited to 'src/target/hla_target.c')
| -rw-r--r-- | src/target/hla_target.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/target/hla_target.c b/src/target/hla_target.c index 1a95d880..11926c78 100644 --- a/src/target/hla_target.c +++ b/src/target/hla_target.c @@ -346,18 +346,16 @@ static int adapter_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; @@ -371,7 +369,7 @@ static int adapter_debug_entry(struct target *target) } LOG_DEBUG("entered debug state in core mode: %s at PC 0x%08" 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)); |