Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fix RhpCallFilterFunclet stack alignment on ARM #7744

Merged
merged 1 commit into from
Aug 28, 2019
Merged

Fix RhpCallFilterFunclet stack alignment on ARM #7744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Native/Runtime/arm/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ NESTED_END RhpCallFinallyFunclet, _TEXT
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpCallFilterFunclet, _TEXT, NoHandler

PROLOG_PUSH "{r4-r11,lr}"
PROLOG_PUSH "{r2,r4-r11,lr}"
PROLOG_VPUSH {d8-d15}

ldr r12, [r2, #OFFSETOF__REGDISPLAY__pR11]
Expand All @@ -496,6 +496,6 @@ NESTED_ENTRY RhpCallFilterFunclet, _TEXT, NoHandler
// R0 contains the result of the filter execution

EPILOG_VPOP {d8-d15}
EPILOG_POP "{r4-r11,pc}"
EPILOG_POP "{r2,r4-r11,pc}"

NESTED_END RhpCallFilterFunclet, _TEXT
4 changes: 2 additions & 2 deletions src/Native/Runtime/arm/ExceptionHandling.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ SetSuccess
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
NESTED_ENTRY RhpCallFilterFunclet

PROLOG_PUSH {r4-r11,lr}
PROLOG_PUSH {r2,r4-r11,lr}
PROLOG_VPUSH {d8-d15}

ldr r12, [r2, #OFFSETOF__REGDISPLAY__pR7]
Expand All @@ -549,7 +549,7 @@ SetSuccess
EXPORT_POINTER_TO_ADDRESS PointerToRhpCallFilterFunclet2

EPILOG_VPOP {d8-d15}
EPILOG_POP {r4-r11,pc}
EPILOG_POP {r2,r4-r11,pc}

NESTED_END RhpCallFilterFunclet

Expand Down