zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve problem with single stepping. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1455 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
mlu 2009-04-14 16:33:52 +00:00
parent aed582e422
commit 699d246b1c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/target/arm_simulator.c
View File

@ -415,7 +415,12 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc)
u8 carry_out; u8 carry_out;
Rd = 0x0; Rd = 0x0;
Rn = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, instruction.info.data_proc.Rn).value, 0, 32); /* ARM_MOV and ARM_MVN does not use Rn */
if ((instruction.type != ARM_MOV) && (instruction.type != ARM_MVN))
Rn = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5->core_mode, instruction.info.data_proc.Rn).value, 0, 32);
else
Rn = 0;
shifter_operand = arm_shifter_operand(armv4_5, instruction.info.data_proc.variant, instruction.info.data_proc.shifter_operand, &carry_out); shifter_operand = arm_shifter_operand(armv4_5, instruction.info.data_proc.variant, instruction.info.data_proc.shifter_operand, &carry_out);
/* adjust Rn in case the PC is being read */ /* adjust Rn in case the PC is being read */
@ -446,6 +451,8 @@ int arm_simulate_step(target_t *target, u32 *dry_run_pc)
Rd = shifter_operand; Rd = shifter_operand;
else if (instruction.type == ARM_MVN) else if (instruction.type == ARM_MVN)
Rd = ~shifter_operand; Rd = ~shifter_operand;
else
LOG_WARNING("unhandled instruction type");
if (dry_run_pc) if (dry_run_pc)
{ {