[Openocd-svn] r1455 - trunk/src/target

[<ml...@ma...>]

Author: mlu
Date: 2009-04-14 18:33:52 +0200 (Tue, 14 Apr 2009)
New Revision: 1455

Modified:
   trunk/src/target/arm_simulator.c
Log:
Solve problem with single stepping.

Modified: trunk/src/target/arm_simulator.c
===================================================================
--- trunk/src/target/arm_simulator.c	2009-04-03 12:55:25 UTC (rev 1454)
+++ trunk/src/target/arm_simulator.c	2009-04-14 16:33:52 UTC (rev 1455)
@@ -415,7 +415,12 @@
 		u8 carry_out;
 		
 		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);
 
 		/* adjust Rn in case the PC is being read */
@@ -446,6 +451,8 @@
 			Rd = shifter_operand;
 		else if (instruction.type == ARM_MVN)
 			Rd = ~shifter_operand;
+		else
+			LOG_WARNING("unhandled instruction type");
 		
 		if (dry_run_pc)
 		{