* arm-tdep.h (struct displaced_step_closure): Add two new fields
	is_thumb and insn_size.
	* arm-tdep.c (displaced_read_reg): Adjust correct pipeline offset
	on both ARM and Thumb mode.
	(arm_process_displaced_insn): Set is_thumb and insn_size.
	(arm_displaced_init_closure): Handle both 16-bit and 32-bit.
	(arm_displaced_step_fixup): Likewise.
This commit is contained in:
Yao Qi
2011-03-02 05:33:37 +00:00
parent b123da992d
commit 4db71c0b79
3 changed files with 74 additions and 10 deletions

View File

@@ -262,6 +262,17 @@ struct displaced_step_closure
struct displaced_step_closure *dsc);
} svc;
} u;
/* The size of original instruction, 2 or 4. */
unsigned int insn_size;
/* True if the original insn (and thus all replacement insns) are Thumb
instead of ARM. */
unsigned int is_thumb;
/* The slots in the array is used in this way below,
- ARM instruction occupies one slot,
- Thumb 16 bit instruction occupies one slot,
- Thumb 32-bit instruction occupies *two* slots, one part for each. */
unsigned long modinsn[DISPLACED_MODIFIED_INSNS];
int numinsns;
CORE_ADDR insn_addr;