diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-03-17 10:22:26 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-03-17 10:22:26 +0000 |
| commit | c13924e32cf58e51aa6b86f785c7961daf3da01e (patch) | |
| tree | f7ee97ebb848c3275e97729ced8a95102de16165 /src/target/xscale.c | |
| parent | ae62743a4c1d28914a4c7f68c1e9b4f6394f94d7 (diff) | |
| download | openocd_libswd-c13924e32cf58e51aa6b86f785c7961daf3da01e.tar.gz openocd_libswd-c13924e32cf58e51aa6b86f785c7961daf3da01e.tar.bz2 openocd_libswd-c13924e32cf58e51aa6b86f785c7961daf3da01e.tar.xz openocd_libswd-c13924e32cf58e51aa6b86f785c7961daf3da01e.zip | |
- remove build warnings
git-svn-id: svn://svn.berlios.de/openocd/trunk@1415 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/xscale.c')
| -rw-r--r-- | src/target/xscale.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c index 0a162959..a11ed71b 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -1450,17 +1450,18 @@ static int xscale_step_inner(struct target_s *target, int current, u32 address, armv4_5_common_t *armv4_5 = target->arch_info; xscale_common_t *xscale = armv4_5->arch_info; - u32 current_pc, next_pc; + u32 next_pc; int retval; int i; - target->debug_reason = DBG_REASON_SINGLESTEP; /* calculate PC of next instruction */ if ((retval = arm_simulate_step(target, &next_pc)) != ERROR_OK) { - u32 current_opcode; + u32 current_opcode, current_pc; + current_pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32); + target_read_u32(target, current_pc, ¤t_opcode); LOG_ERROR("BUG: couldn't calculate PC of next instruction, current opcode was 0x%8.8x", current_opcode); return retval; |