Hi, Please can someone review, comment on, and if appropriate commit the attached patch? This patch attempts to improve the quality of single stepping through an image when there are no mapping symbols or debug inforation available to help. Currently if you single-step in this case arm_pc_is_thumb () falls back to using the current ARM/Thumb state if it has no other information (and the APSR is available to be read). However, this is incorrect across an interworking branch when the state will change. This patch attempts to fix this by seeing if arm_pc_is_thumb () is being asked about the address we will end up at if we execute the instruction at the current PC. If so it 'executes' the current instruction to see if it will change state, and uses this information to determine the return value. Proposed ChangeLog: 2010-03-04 Matthew Gretton-Dann * arm-tdep.c (arm_pc_is_thumb): Add heuristic that tries to get the state right when single stepping. (arm_get_next_pc_raw, thumb_get_next_pc_raw): New functions. Get the next PC along with the instruction state. (thumb_get_next_pc): Remove. (arm_get_next_pc): Modified to use arm_get_next_pc_raw (). Thanks, Matt -- Matthew Gretton-Dann Principal Engineer - Tools, PD Software ARM Limited