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/xscale.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/xscale.c')
| -rw-r--r-- | src/target/xscale.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c index 1acaba07..f52965a3 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -2607,7 +2607,7 @@ static int xscale_read_instruction(struct target *target, return ERROR_TRACE_INSTRUCTION_UNAVAILABLE; } - if (xscale->trace.core_state == ARMV4_5_STATE_ARM) + if (xscale->trace.core_state == ARM_STATE_ARM) { uint8_t buf[4]; if ((retval = image_read_section(xscale->trace.image, section, @@ -2620,7 +2620,7 @@ static int xscale_read_instruction(struct target *target, opcode = target_buffer_get_u32(target, buf); arm_evaluate_opcode(opcode, xscale->trace.current_pc, instruction); } - else if (xscale->trace.core_state == ARMV4_5_STATE_THUMB) + else if (xscale->trace.core_state == ARM_STATE_THUMB) { uint8_t buf[2]; if ((retval = image_read_section(xscale->trace.image, section, @@ -2672,7 +2672,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c int rollover; int branch; int exception; - xscale->trace.core_state = ARMV4_5_STATE_ARM; + xscale->trace.core_state = ARM_STATE_ARM; chkpt = 0; rollover = 0; @@ -2806,7 +2806,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c } else { - xscale->trace.current_pc += (xscale->trace.core_state == ARMV4_5_STATE_ARM) ? 4 : 2; + xscale->trace.current_pc += (xscale->trace.core_state == ARM_STATE_ARM) ? 4 : 2; } command_print(cmd_ctx, "%s", instruction.text); } @@ -2821,7 +2821,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c } } - for (; xscale->trace.current_pc < trace_data->last_instruction; xscale->trace.current_pc += (xscale->trace.core_state == ARMV4_5_STATE_ARM) ? 4 : 2) + for (; xscale->trace.current_pc < trace_data->last_instruction; xscale->trace.current_pc += (xscale->trace.core_state == ARM_STATE_ARM) ? 4 : 2) { struct arm_instruction instruction; if ((retval = xscale_read_instruction(target, &instruction)) != ERROR_OK) |