On Sun, Sep 17, 2023 at 10:39 PM Karim Taha <kariem.taha2.7@gmail.com>
wrote:
> Signed-off-by: Stacey Son <sson@FreeBSD.org>
> Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> bsd-user/freebsd/os-proc.h | 49 +++++++++++++++++++++++++++++++++++
> bsd-user/freebsd/os-syscall.c | 11 +++++++-
> 2 files changed, 59 insertions(+), 1 deletion(-)
> create mode 100644 bsd-user/freebsd/os-proc.h
>
Reviewed-by: Warner Losh <imp@bsdimp.com>
But make sure that the guard variable name is correct, I think with scripts/
clean-header-guards.pl
> diff --git a/bsd-user/freebsd/os-proc.h b/bsd-user/freebsd/os-proc.h
> new file mode 100644
> index 0000000000..75ed39f8dd
> --- /dev/null
> +++ b/bsd-user/freebsd/os-proc.h
> @@ -0,0 +1,49 @@
> +/*
> + * process related system call shims and definitions
> + *
> + * Copyright (c) 2013-14 Stacey D. Son
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program 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 General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#ifndef BSD_USER_FREEBSD_OS_PROC_H
> +#define BSD_USER_FREEBSD_OS_PROC_H
> +
> +#include <sys/param.h>
> +#include <sys/procctl.h>
> +#include <sys/signal.h>
> +#include <sys/types.h>
> +#include <sys/procdesc.h>
> +#include <sys/wait.h>
> +#include <unistd.h>
> +
> +#include "target_arch_cpu.h"
> +
> +/* execve(2) */
> +static inline abi_long do_freebsd_execve(abi_ulong path_or_fd, abi_ulong
> argp,
> + abi_ulong envp)
> +{
> +
> + return freebsd_exec_common(path_or_fd, argp, envp, 0);
> +}
> +
> +/* fexecve(2) */
> +static inline abi_long do_freebsd_fexecve(abi_ulong path_or_fd, abi_ulong
> argp,
> + abi_ulong envp)
> +{
> +
> + return freebsd_exec_common(path_or_fd, argp, envp, 1);
> +}
> +
> +#endif /* BSD_USER_FREEBSD_OS_PROC_H */
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index b7bd0b92a6..515eaaf31f 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -36,8 +36,9 @@
> #include "bsd-file.h"
> #include "bsd-proc.h"
>
> -/* *BSD dependent syscall shims */
> +/* BSD dependent syscall shims */
> #include "os-stat.h"
> +#include "os-proc.h"
>
> /* I/O */
> safe_syscall3(int, open, const char *, path, int, flags, mode_t, mode);
> @@ -219,6 +220,14 @@ static abi_long freebsd_syscall(void *cpu_env, int
> num, abi_long arg1,
> /*
> * process system calls
> */
> + case TARGET_FREEBSD_NR_execve: /* execve(2) */
> + ret = do_freebsd_execve(arg1, arg2, arg3);
> + break;
> +
> + case TARGET_FREEBSD_NR_fexecve: /* fexecve(2) */
> + ret = do_freebsd_fexecve(arg1, arg2, arg3);
> + break;
> +
> case TARGET_FREEBSD_NR_exit: /* exit(2) */
> ret = do_bsd_exit(cpu_env, arg1);
> break;
> --
> 2.42.0
>
>