Patchwork aarch64: Fix tst-makecontext3 in ILP32 mode.

login
register
mail settings
Submitter Steve Ellcey
Date Aug. 15, 2017, 6:09 p.m.
Message ID <1502820555.3962.197.camel@cavium.com>
Download mbox | patch
Permalink /patch/22130/
State New
Headers show

Comments

Steve Ellcey - Aug. 15, 2017, 6:09 p.m.
This is an additional patch for ILP32 aarch64 support, it fixes a failure
with the tst-makecontext3 test in ILP32 mode.  That ABI has not
been checked in yet but I wanted to submit this patch in order to share
it and see if there is any feedback.  The basic problem is that makecontext
was using 'long int *' as the sp pointer type and that is 32 bytes in
ILP32 mode instead of 64 bytes.  By using uint64_t instead we get 64
bytes for both ILP32 and LP64 modes and the makecontext test works in both
modes and there are no regressions.

Steve Ellcey
sellcey@cavium.com


2017-08-15  Steve Ellcey  <sellcey@cavium.com>

	* sysdeps/unix/sysv/linux/aarch64/makecontext.c (__makecontext):
	Use pointer to uint64_t instead of long int for sp.
Andreas Schwab - Aug. 16, 2017, 8:01 a.m.
On Aug 15 2017, Steve Ellcey <sellcey@cavium.com> wrote:

> diff --git a/sysdeps/unix/sysv/linux/aarch64/makecontext.c b/sysdeps/unix/sysv/linux/aarch64/makecontext.c
> index f510f48..8e52b5d 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/makecontext.c
> +++ b/sysdeps/unix/sysv/linux/aarch64/makecontext.c
> @@ -42,18 +42,18 @@ void
>  __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
>  {
>    extern void __startcontext (void);
> -  unsigned long int *sp;
> +  uint64_t *sp;
>    va_list ap;
>    int i;
>  
> -  sp = (unsigned long int *)
> +  sp = (uint64_t *)
>      ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
>  
>    /* Allocate stack arguments.  */
>    sp -= argc < 8 ? 0 : argc - 8;
>  
>    /* Keep the stack aligned.  */
> -  sp = (unsigned long int *) (((uintptr_t) sp) & -16L);
> +  sp = (uint64_t *) (((uintptr_t) sp) & -16L);
>  
>    ucp->uc_mcontext.regs[19] = (uintptr_t) ucp->uc_link;
>    ucp->uc_mcontext.sp = (uintptr_t) sp;
> @@ -66,7 +66,7 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
>      if (i < 8)
>        ucp->uc_mcontext.regs[i] = va_arg (ap, unsigned long int);

I think you want to use uint64_t here as well.

Andreas.
Steve Ellcey - Aug. 17, 2017, 3:32 p.m.
On Wed, 2017-08-16 at 10:01 +0200, Andreas Schwab wrote:
> On Aug 15 2017, Steve Ellcey <sellcey@cavium.com> wrote:

> > @@ -66,7 +66,7 @@ __makecontext (ucontext_t *ucp, void (*func)
> > (void), int argc, ...)
> >      if (i < 8)
> >        ucp->uc_mcontext.regs[i] = va_arg (ap, unsigned long int);
> I think you want to use uint64_t here as well.
> 
> Andreas.

I agree, I will make that change.

Steve Ellcey
sellcey@cavium.com

Patch

diff --git a/sysdeps/unix/sysv/linux/aarch64/makecontext.c b/sysdeps/unix/sysv/linux/aarch64/makecontext.c
index f510f48..8e52b5d 100644
--- a/sysdeps/unix/sysv/linux/aarch64/makecontext.c
+++ b/sysdeps/unix/sysv/linux/aarch64/makecontext.c
@@ -42,18 +42,18 @@  void
 __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
 {
   extern void __startcontext (void);
-  unsigned long int *sp;
+  uint64_t *sp;
   va_list ap;
   int i;
 
-  sp = (unsigned long int *)
+  sp = (uint64_t *)
     ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
 
   /* Allocate stack arguments.  */
   sp -= argc < 8 ? 0 : argc - 8;
 
   /* Keep the stack aligned.  */
-  sp = (unsigned long int *) (((uintptr_t) sp) & -16L);
+  sp = (uint64_t *) (((uintptr_t) sp) & -16L);
 
   ucp->uc_mcontext.regs[19] = (uintptr_t) ucp->uc_link;
   ucp->uc_mcontext.sp = (uintptr_t) sp;
@@ -66,7 +66,7 @@  __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
     if (i < 8)
       ucp->uc_mcontext.regs[i] = va_arg (ap, unsigned long int);
     else
-      sp[i - 8] = va_arg (ap, unsigned long int);
+      sp[i - 8] = va_arg (ap, uint64_t);
 
   va_end (ap);
 }