Message ID | 4f72249e1bd2b5a772973f9faf3b88e62596fdde.1666877952.git.szabolcs.nagy@arm.com |
---|---|
State | New |
Headers | show |
Series | patches from the morello port | expand |
On 27/10/22 12:32, Szabolcs Nagy via Libc-alpha wrote: > The extension header is two 32bit words and in the last header both > should be 0. There is plenty space in the __reserved area, but it's > better not to write more than we mean to. LGTM, thanks. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/unix/sysv/linux/aarch64/getcontext.S | 4 ++-- > sysdeps/unix/sysv/linux/aarch64/swapcontext.S | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/aarch64/getcontext.S b/sysdeps/unix/sysv/linux/aarch64/getcontext.S > index 15fbd2d1a0..3109cbd99a 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/getcontext.S > +++ b/sysdeps/unix/sysv/linux/aarch64/getcontext.S > @@ -86,8 +86,8 @@ ENTRY(__getcontext) > /* Write the termination context extension header. */ > add x2, x2, #FPSIMD_CONTEXT_SIZE > > - str xzr, [x2, #oHEAD + oMAGIC] > - str xzr, [x2, #oHEAD + oSIZE] > + str wzr, [x2, #oHEAD + oMAGIC] > + str wzr, [x2, #oHEAD + oSIZE] > > /* Grab the signal mask */ > /* rt_sigprocmask (SIG_BLOCK, NULL, &ucp->uc_sigmask, _NSIG8) */ > diff --git a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S > index 1ee2e40272..e3ec9da35d 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S > +++ b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S > @@ -75,8 +75,8 @@ ENTRY(__swapcontext) > /* Write the termination context extension header. */ > add x2, x2, #FPSIMD_CONTEXT_SIZE > > - str xzr, [x2, #oHEAD + oMAGIC] > - str xzr, [x2, #oHEAD + oSIZE] > + str wzr, [x2, #oHEAD + oMAGIC] > + str wzr, [x2, #oHEAD + oSIZE] > > /* Preserve ucp. */ > mov x21, x1
diff --git a/sysdeps/unix/sysv/linux/aarch64/getcontext.S b/sysdeps/unix/sysv/linux/aarch64/getcontext.S index 15fbd2d1a0..3109cbd99a 100644 --- a/sysdeps/unix/sysv/linux/aarch64/getcontext.S +++ b/sysdeps/unix/sysv/linux/aarch64/getcontext.S @@ -86,8 +86,8 @@ ENTRY(__getcontext) /* Write the termination context extension header. */ add x2, x2, #FPSIMD_CONTEXT_SIZE - str xzr, [x2, #oHEAD + oMAGIC] - str xzr, [x2, #oHEAD + oSIZE] + str wzr, [x2, #oHEAD + oMAGIC] + str wzr, [x2, #oHEAD + oSIZE] /* Grab the signal mask */ /* rt_sigprocmask (SIG_BLOCK, NULL, &ucp->uc_sigmask, _NSIG8) */ diff --git a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S index 1ee2e40272..e3ec9da35d 100644 --- a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S +++ b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S @@ -75,8 +75,8 @@ ENTRY(__swapcontext) /* Write the termination context extension header. */ add x2, x2, #FPSIMD_CONTEXT_SIZE - str xzr, [x2, #oHEAD + oMAGIC] - str xzr, [x2, #oHEAD + oSIZE] + str wzr, [x2, #oHEAD + oMAGIC] + str wzr, [x2, #oHEAD + oSIZE] /* Preserve ucp. */ mov x21, x1