Re: [RFC PATCH glibc 22/34] htl: Implement thread_set_pcsptp for x86_64

[Samuel Thibault]

Applied, thanks!

Sergey Bugaev, le dim. 19 mars 2023 18:10:05 +0300, a ecrit:
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  sysdeps/mach/hurd/x86_64/htl/pt-machdep.c | 73 +++++++++++++++++++++++
>  1 file changed, 73 insertions(+)
>  create mode 100644 sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
> 
> diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c 
> b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
> new file mode 100644
> index 00000000..69094d3b
> --- /dev/null
> +++ b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
> @@ -0,0 +1,73 @@
> +/* Machine dependent pthreads code.  Hurd/x86_64 version.
> +   Copyright (C) 2000-2023 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library;  if not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <errno.h>
> +#include <assert.h>
> +
> +#include <mach.h>
> +#include <mach/machine/thread_status.h>
> +#include <mach/machine/mach_i386.h>
> +#include <mach/mig_errors.h>
> +#include <mach/thread_status.h>
> +
> +int
> +__thread_set_pcsptp (thread_t thread,
> +                     int set_ip, void *ip,
> +                     int set_sp, void *sp,
> +                     int set_tp, void *tp)
> +{
> +  error_t err;
> +  struct i386_thread_state state;
> +  struct i386_fsgs_base_state fsgs_state;
> +  mach_msg_type_number_t state_count;
> +
> +  state_count = i386_THREAD_STATE_COUNT;
> +
> +  err = __thread_get_state (thread, i386_REGS_SEGS_STATE,
> +                            (thread_state_t) &state, &state_count);
> +  if (err)
> +    return err;
> +  assert (state_count == i386_THREAD_STATE_COUNT);
> +
> +  if (set_sp)
> +    state.ursp = (uintptr_t) sp;
> +  if (set_ip)
> +    state.rip = (uintptr_t) ip;
> +
> +  err = __thread_set_state (thread, i386_REGS_SEGS_STATE,
> +                            (thread_state_t) &state, 
> i386_THREAD_STATE_COUNT);
> +  if (err)
> +    return err;
> +
> +  if (set_tp)
> +    {
> +      state_count = i386_FSGS_BASE_STATE_COUNT;
> +      err = __thread_get_state (thread, i386_FSGS_BASE_STATE,
> +                                (thread_state_t) &fsgs_state, &state_count);
> +      if (err)
> +        return err;
> +      assert (state_count == i386_FSGS_BASE_STATE_COUNT);
> +      fsgs_state.fs_base = (uintptr_t) tp;
> +      err = __thread_set_state (thread, i386_FSGS_BASE_STATE,
> +                                (thread_state_t) &fsgs_state, state_count);
> +      if (err)
> +        return err;
> +    }
> +
> +  return 0;
> +}
> -- 
> 2.39.2
> 

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