X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/e4ada918b2a53ca7e00f426a102ec864d8b8e387..6a3d653c3ef38efa52448d6db0d2efab098224a5:/base/regdump-arm.S diff --git a/base/regdump-arm.S b/base/regdump-arm.S index 963a60ee..6adcbdda 100644 --- a/base/regdump-arm.S +++ b/base/regdump-arm.S @@ -60,15 +60,8 @@ FUNC(regdump_gpsave) add r0, r4, #REGDUMP_GPSIZE str r0, [r4, #13*4] - // Capture the status flags and return address. If the return - // address has its low bit set, then the caller was in Thumb state: - // clear the bit from the reconstructed PC, and set the corresponding - // CPSR bit. - mrs r0, cpsr - tst r14, #1 + // Clear the magic Thumb-state bit from the return address. bic r1, r14, #1 - orrne r0, r0, #0x00000020 - str r0, [r13, #4*REGIX_CPSR] str r1, [r13, #15*4] // Load the focus address and save it as r6.