Re: [RFC PATCH 08/23] hurd: Drop x86-specific assembly from init-first.c

2024-01-04 Thread Samuel Thibault
Applied, thanks!

Sergey Bugaev, le mer. 03 janv. 2024 20:14:41 +0300, a ecrit:
> We already have the RETURN_TO macro for this exact use case, and it's already
> used in the non-static code path. Use it here too.
> 
> Signed-off-by: Sergey Bugaev 
> ---
> 
> This was the last piece of x86 specifics in init-first.c!
> (Remember, it started as sysdeps/mach/hurd/i386/init-first.c, with lots of
> i386-specific assumptions about how arguments are passed and so on.)
> 
>  sysdeps/mach/hurd/x86/init-first.c | 10 +-
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/sysdeps/mach/hurd/x86/init-first.c 
> b/sysdeps/mach/hurd/x86/init-first.c
> index 6f71d71b..211b2096 100644
> --- a/sysdeps/mach/hurd/x86/init-first.c
> +++ b/sysdeps/mach/hurd/x86/init-first.c
> @@ -218,15 +218,7 @@ _hurd_stack_setup (void **argptr)
>void doinit (intptr_t *data)
>  {
>init ((void **) data);
> -# ifdef __x86_64__
> -  asm volatile ("movq %0, %%rsp\n" /* Switch to new outermost stack.  */
> -"xorq %%rbp, %%rbp\n" /* Clear outermost frame pointer.  
> */
> -"jmp *%1" : : "r" (data), "r" (caller));
> -# else
> -  asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack.  */
> - "xorl %%ebp, %%ebp\n" /* Clear outermost frame pointer.  */
> - "jmp *%1" : : "r" (data), "r" (caller));
> -# endif
> +  RETURN_TO (data, caller, 0);
>__builtin_unreachable ();
>  }
>  
> -- 
> 2.43.0
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.



[RFC PATCH 08/23] hurd: Drop x86-specific assembly from init-first.c

2024-01-03 Thread Sergey Bugaev
We already have the RETURN_TO macro for this exact use case, and it's already
used in the non-static code path. Use it here too.

Signed-off-by: Sergey Bugaev 
---

This was the last piece of x86 specifics in init-first.c!
(Remember, it started as sysdeps/mach/hurd/i386/init-first.c, with lots of
i386-specific assumptions about how arguments are passed and so on.)

 sysdeps/mach/hurd/x86/init-first.c | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/sysdeps/mach/hurd/x86/init-first.c 
b/sysdeps/mach/hurd/x86/init-first.c
index 6f71d71b..211b2096 100644
--- a/sysdeps/mach/hurd/x86/init-first.c
+++ b/sysdeps/mach/hurd/x86/init-first.c
@@ -218,15 +218,7 @@ _hurd_stack_setup (void **argptr)
   void doinit (intptr_t *data)
 {
   init ((void **) data);
-# ifdef __x86_64__
-  asm volatile ("movq %0, %%rsp\n" /* Switch to new outermost stack.  */
-"xorq %%rbp, %%rbp\n" /* Clear outermost frame pointer.  */
-"jmp *%1" : : "r" (data), "r" (caller));
-# else
-  asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack.  */
-   "xorl %%ebp, %%ebp\n" /* Clear outermost frame pointer.  */
-   "jmp *%1" : : "r" (data), "r" (caller));
-# endif
+  RETURN_TO (data, caller, 0);
   __builtin_unreachable ();
 }
 
-- 
2.43.0