Re: [PATCH 06/23] mach: Drop SNARF_ARGS macro

[Samuel Thibault]

Applied, thanks!

Sergey Bugaev, le mer. 03 janv. 2024 20:14:39 +0300, a ecrit:
> We're obtaining arguments from the stack differently, see init-first.c.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  sysdeps/mach/sysdep.h     |  7 -------
>  sysdeps/mach/x86/sysdep.h | 14 --------------
>  2 files changed, 21 deletions(-)
> 
> diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
> index 8eeac45b..3e0553d8 100644
> --- a/sysdeps/mach/sysdep.h
> +++ b/sysdeps/mach/sysdep.h
> @@ -56,13 +56,6 @@
>  /* This is not used on all machines.  */
>  #endif
>  
> -/* Set variables ARGC, ARGV, and ENVP for the arguments
> -   left on the stack by the microkernel.  */
> -#ifndef SNARF_ARGS
> -#define SNARF_ARGS(argc, argv, envp)
> -#error SNARF_ARGS not defined by sysdeps/mach/MACHINE/sysdep.h
> -#endif
> -
>  /* LOSE can be defined as the `halt' instruction or something
>     similar which will cause the process to die in a characteristic
>     way suggesting a bug.  */
> diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h
> index ed9f7f46..63be5638 100644
> --- a/sysdeps/mach/x86/sysdep.h
> +++ b/sysdeps/mach/x86/sysdep.h
> @@ -25,20 +25,6 @@
>  
>  #define LOSE asm volatile ("hlt")
>  
> -#define SNARF_ARGS(entry_sp, argc, argv, envp)                               
>       \
> -  do                                                                       \
> -    {                                                                        
>       \
> -      char **p;                                                              
>       \
> -      argc = (int) *entry_sp;                                                
>       \
> -      argv = (char **) (entry_sp + 1);                                       
>       \
> -      p = argv;                                                              
>       \
> -      while (*p++ != NULL)                                                 \
> -     ;                                                                     \
> -      if (p >= (char **) argv[0])                                          \
> -     --p;                                                                  \
> -      envp = p;                                                            \
> -    } while (0)
> -
>  #define STACK_GROWTH_DOWN
>  
>  /* Get the machine-independent Mach definitions.  */
> -- 
> 2.43.0
> 
> 

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