diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:14:48 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:14:48 -0800 |
| commit | 31e3ea7c19d39589ac9a8b2220331206b6d1e25c (patch) | |
| tree | aeab882174f1d49a589b93f366ee13f5e3c500bc /src/target/arm_dpm.c | |
| parent | f67f6fe5bb8a466cc4d49f83608f026c4b233949 (diff) | |
| download | openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.gz openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.bz2 openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.xz openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.zip | |
ARM: rename ARMV4_5_STATE_* as ARM_STATE_*
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm_dpm.c')
| -rw-r--r-- | src/target/arm_dpm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c index a9ce8807..df9bd958 100644 --- a/src/target/arm_dpm.c +++ b/src/target/arm_dpm.c @@ -147,14 +147,14 @@ static int dpm_read_reg(struct arm_dpm *dpm, struct reg *r, unsigned regnum) * is always right except in those broken-by-intent cases. */ switch (dpm->arm->core_state) { - case ARMV4_5_STATE_ARM: + case ARM_STATE_ARM: value -= 8; break; - case ARMV4_5_STATE_THUMB: + case ARM_STATE_THUMB: case ARM_STATE_THUMB_EE: value -= 4; break; - case ARMV4_5_STATE_JAZELLE: + case ARM_STATE_JAZELLE: /* core-specific ... ? */ LOG_WARNING("Jazelle PC adjustment unknown"); break; @@ -744,14 +744,14 @@ static int dpm_remove_watchpoint(struct target *target, struct watchpoint *wp) void arm_dpm_report_wfar(struct arm_dpm *dpm, uint32_t addr) { switch (dpm->arm->core_state) { - case ARMV4_5_STATE_ARM: + case ARM_STATE_ARM: addr -= 8; break; - case ARMV4_5_STATE_THUMB: + case ARM_STATE_THUMB: case ARM_STATE_THUMB_EE: addr -= 4; break; - case ARMV4_5_STATE_JAZELLE: + case ARM_STATE_JAZELLE: /* ?? */ break; } |