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

[Unix|Arm64] Correct transition block for unix arm64 #19822

Merged
merged 5 commits into from
Sep 6, 2018
Merged

[Unix|Arm64] Correct transition block for unix arm64 #19822

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc2cd17
Correct unix transition block macro
Sep 4, 2018
e4fcc2e
Correct restore of the transition block on unix arm64
Sep 4, 2018
62bf7ce
Correct RESTORE_ARGUMENT_REGISTERS
Sep 4, 2018
2520942
Correct restore
Sep 5, 2018
19a4a6a
Account for new padding in transition block
Sep 6, 2018
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
22 changes: 11 additions & 11 deletions src/pal/inc/unixasmmacrosarm64.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ C_FUNC(\Name\()_End):
.endif

__PWTB_StackAlloc = __PWTB_TransitionBlock
__PWTB_ArgumentRegisters = __PWTB_StackAlloc + 96
__PWTB_ArgumentRegisters = __PWTB_StackAlloc + 104
__PWTB_ArgumentRegister_FirstArg = __PWTB_ArgumentRegisters + 8

PROLOG_SAVE_REG_PAIR_INDEXED fp, lr, -176
Expand Down Expand Up @@ -192,11 +192,11 @@ C_FUNC(\Name\()_End):
// Reserve 64 bytes of memory before calling SAVE_ARGUMENT_REGISTERS
.macro SAVE_ARGUMENT_REGISTERS reg, ofs

stp x0, x1, [\reg, #(\ofs)]
stp x2, x3, [\reg, #(\ofs + 16)]
stp x4, x5, [\reg, #(\ofs + 32)]
stp x6, x7, [\reg, #(\ofs + 48)]
str x8, [\reg, #(\ofs + 64)]
str x8, [\reg, #(\ofs)]
stp x0, x1, [\reg, #(\ofs + 8)]
stp x2, x3, [\reg, #(\ofs + 24)]
stp x4, x5, [\reg, #(\ofs + 40)]
stp x6, x7, [\reg, #(\ofs + 56)]

.endm

Expand All @@ -212,11 +212,11 @@ C_FUNC(\Name\()_End):

.macro RESTORE_ARGUMENT_REGISTERS reg, ofs

ldp x0, x1, [\reg, #(\ofs)]
ldp x2, x3, [\reg, #(\ofs + 16)]
ldp x4, x5, [\reg, #(\ofs + 32)]
ldp x6, x7, [\reg, #(\ofs + 48)]
ldr x8, [\reg, #(\ofs + 64)]
ldr x8, [\reg, #(\ofs)]
ldp x0, x1, [\reg, #(\ofs + 8)]
ldp x2, x3, [\reg, #(\ofs + 24)]
ldp x4, x5, [\reg, #(\ofs + 40)]
ldp x6, x7, [\reg, #(\ofs + 56)]

.endm

Expand Down