Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 46123f0

Browse files
committed
Arm32 restore d8-d15 in ThrowExceptionFromContextInternal (#25777)
1 parent 3f18045 commit 46123f0

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

src/pal/src/arch/arm/exceptionhelper.S

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,27 @@ LEAF_ENTRY ThrowExceptionFromContextInternal, _TEXT
2121

2222
push_nonvol_reg {r7} /* FP. x64-RBP */
2323

24-
ldr r4, [r0, #(CONTEXT_R4)]
25-
ldr r5, [r0, #(CONTEXT_R5)]
26-
ldr r6, [r0, #(CONTEXT_R6)]
27-
ldr r7, [r0, #(CONTEXT_R7)]
28-
ldr r8, [r0, #(CONTEXT_R8)]
29-
ldr r9, [r0, #(CONTEXT_R9)]
30-
ldr r10, [r0, #(CONTEXT_R10)]
31-
ldr r11, [r0, #(CONTEXT_R11)]
32-
ldr sp, [r0, #(CONTEXT_Sp)]
33-
ldr lr, [r0, #(CONTEXT_Pc)]
24+
ldr r4, [r0, #(CONTEXT_R4)]
25+
ldr r5, [r0, #(CONTEXT_R5)]
26+
ldr r6, [r0, #(CONTEXT_R6)]
27+
ldr r7, [r0, #(CONTEXT_R7)]
28+
ldr r8, [r0, #(CONTEXT_R8)]
29+
ldr r9, [r0, #(CONTEXT_R9)]
30+
ldr r10, [r0, #(CONTEXT_R10)]
31+
ldr r11, [r0, #(CONTEXT_R11)]
32+
ldr sp, [r0, #(CONTEXT_Sp)]
33+
ldr lr, [r0, #(CONTEXT_Pc)]
34+
35+
vldr d8, [r0, #(CONTEXT_D8)]
36+
vldr d9, [r0, #(CONTEXT_D9)]
37+
vldr d10, [r0, #(CONTEXT_D10)]
38+
vldr d11, [r0, #(CONTEXT_D11)]
39+
vldr d12, [r0, #(CONTEXT_D12)]
40+
vldr d13, [r0, #(CONTEXT_D13)]
41+
vldr d14, [r0, #(CONTEXT_D14)]
42+
vldr d15, [r0, #(CONTEXT_D15)]
3443

3544
// The PAL_SEHException pointer
36-
mov r0, r1
37-
b EXTERNAL_C_FUNC(ThrowExceptionHelper)
45+
mov r0, r1
46+
b EXTERNAL_C_FUNC(ThrowExceptionHelper)
3847
LEAF_END ThrowExceptionFromContextInternal, _TEXT

0 commit comments

Comments
 (0)