ariadne
/
libucontext
1
1
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #31 from rlcamp/master 

Added saving/restoring of bottom 64 bits of d8-d15 per AAPCS64
pull/32/head
Ariadne Conill 2021-07-29 20:49:13 -05:00 committed by GitHub
parent ae058b1f38 06303df1cd
commit 14d9859c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/aarch64/defs.h
View File

@ -9,6 +9,7 @@
#define SP_OFFSET 432 #define SP_OFFSET 432
#define PC_OFFSET 440 #define PC_OFFSET 440
#define PSTATE_OFFSET 448 #define PSTATE_OFFSET 448
#define D8_OFFSET 456
#ifndef FPSIMD_MAGIC #ifndef FPSIMD_MAGIC
# define FPSIMD_MAGIC 0x46508001 # define FPSIMD_MAGIC 0x46508001

5
arch/aarch64/getcontext.S
View File

@ -50,7 +50,10 @@ PROC_NAME(libucontext_getcontext):
/* save pstate */ /* save pstate */
str xzr, [x0, #PSTATE_OFFSET] str xzr, [x0, #PSTATE_OFFSET]
/* TODO: SIMD / FPRs */ stp d8, d9, [x0, #D8_OFFSET + 0]
stp d10, d11, [x0, #D8_OFFSET + 16]
stp d12, d13, [x0, #D8_OFFSET + 32]
stp d14, d15, [x0, #D8_OFFSET + 48]
mov x0, #0 mov x0, #0
ret ret

3
arch/aarch64/include/libucontext/bits.h
View File

@ -14,7 +14,8 @@ typedef struct sigcontext {
unsigned long fault_address; unsigned long fault_address;
unsigned long regs[31]; unsigned long regs[31];
unsigned long sp, pc, pstate; unsigned long sp, pc, pstate;
long double __reserved[256]; unsigned long d8_through_d15[8];
long double __reserved[252];
} libucontext_mcontext_t; } libucontext_mcontext_t;
typedef struct { typedef struct {

5
arch/aarch64/setcontext.S
View File

@ -33,7 +33,10 @@ PROC_NAME(libucontext_setcontext):
ldr x2, [x0, #SP_OFFSET] ldr x2, [x0, #SP_OFFSET]
mov sp, x2 mov sp, x2
/* TODO: SIMD / FPRs */ ldp d8, d9, [x0, #D8_OFFSET + 0]
ldp d10, d11, [x0, #D8_OFFSET + 16]
ldp d12, d13, [x0, #D8_OFFSET + 32]
ldp d14, d15, [x0, #D8_OFFSET + 48]
/* save current program counter in link register */ /* save current program counter in link register */
ldr x16, [x0, #PC_OFFSET] ldr x16, [x0, #PC_OFFSET]

5
arch/aarch64/swapcontext.S
View File

@ -49,6 +49,11 @@ PROC_NAME(libucontext_swapcontext):
/* save pstate */ /* save pstate */
str xzr, [x0, #PSTATE_OFFSET] str xzr, [x0, #PSTATE_OFFSET]
stp d8, d9, [x0, #D8_OFFSET + 0]
stp d10, d11, [x0, #D8_OFFSET + 16]
stp d12, d13, [x0, #D8_OFFSET + 32]
stp d14, d15, [x0, #D8_OFFSET + 48]
/* context to swap to is in x1 so... we move to x0 and call setcontext */ /* context to swap to is in x1 so... we move to x0 and call setcontext */
/* store our link register in x28 */ /* store our link register in x28 */
mov x28, x30 mov x28, x30