ntdll: Save context->Lr in the arm version of RtlRaiseException.
RtlCaptureContext doesn't set context->Lr, which is needed for being able to unwind from the context. This matches what is done in the arm64 version. Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
324150c0ae
commit
611911ca05
|
@ -811,6 +811,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4,
|
||||||
"bl " __ASM_NAME("RtlCaptureContext") "\n\t"
|
"bl " __ASM_NAME("RtlCaptureContext") "\n\t"
|
||||||
"ldr r0, [sp, #0x1a0]\n\t" /* rec */
|
"ldr r0, [sp, #0x1a0]\n\t" /* rec */
|
||||||
"ldr r1, [sp, #0x1a4]\n\t"
|
"ldr r1, [sp, #0x1a4]\n\t"
|
||||||
|
"str r1, [sp, #0x3c]\n\t" /* context->Lr */
|
||||||
"str r1, [sp, #0x40]\n\t" /* context->Pc */
|
"str r1, [sp, #0x40]\n\t" /* context->Pc */
|
||||||
"mrs r2, CPSR\n\t"
|
"mrs r2, CPSR\n\t"
|
||||||
"bfi r2, r1, #5, #1\n\t" /* Thumb bit */
|
"bfi r2, r1, #5, #1\n\t" /* Thumb bit */
|
||||||
|
|
Loading…
Reference in New Issue