| Message ID | 20220201111455.52511-3-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user: Start upstreaming the system calls. | expand |
On 2/1/22 22:14, Warner Losh wrote: > Although initial versions of NetBSD did use int $80, it was replaced by > syscall before any releases. OpenBSD and FreeBSD always did syscall. > > Signed-off-by: Warner Losh<imp@bsdimp.com> > --- > bsd-user/x86_64/target_arch_cpu.h | 58 ------------------------------- > 1 file changed, 58 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Tue, Feb 1, 2022 at 5:14 AM Warner Losh <imp@bsdimp.com> wrote: > > Although initial versions of NetBSD did use int $80, it was replaced by > syscall before any releases. OpenBSD and FreeBSD always did syscall. > > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/x86_64/target_arch_cpu.h | 58 ------------------------------- > 1 file changed, 58 deletions(-) > Reviewed-by: Kyle Evans <kevans@FreeBSD.org> > diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h > index 0a9c0f08946..9dc52d5afc4 100644 > --- a/bsd-user/x86_64/target_arch_cpu.h > +++ b/bsd-user/x86_64/target_arch_cpu.h > @@ -124,64 +124,6 @@ static inline void target_cpu_loop(CPUX86State *env) > process_queued_cpu_work(cs); > > switch (trapnr) { > - case 0x80: > - /* syscall from int $0x80 */ > - if (bsd_type == target_freebsd) { > - abi_ulong params = (abi_ulong) env->regs[R_ESP] + > - sizeof(int32_t); > - int32_t syscall_nr = env->regs[R_EAX]; > - int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; > - > - if (syscall_nr == TARGET_FREEBSD_NR_syscall) { > - get_user_s32(syscall_nr, params); > - params += sizeof(int32_t); > - } else if (syscall_nr == TARGET_FREEBSD_NR___syscall) { > - get_user_s32(syscall_nr, params); > - params += sizeof(int64_t); > - } > - get_user_s32(arg1, params); > - params += sizeof(int32_t); > - get_user_s32(arg2, params); > - params += sizeof(int32_t); > - get_user_s32(arg3, params); > - params += sizeof(int32_t); > - get_user_s32(arg4, params); > - params += sizeof(int32_t); > - get_user_s32(arg5, params); > - params += sizeof(int32_t); > - get_user_s32(arg6, params); > - params += sizeof(int32_t); > - get_user_s32(arg7, params); > - params += sizeof(int32_t); > - get_user_s32(arg8, params); > - env->regs[R_EAX] = do_freebsd_syscall(env, > - syscall_nr, > - arg1, > - arg2, > - arg3, > - arg4, > - arg5, > - arg6, > - arg7, > - arg8); > - } else { /* if (bsd_type == target_openbsd) */ > - env->regs[R_EAX] = do_openbsd_syscall(env, > - env->regs[R_EAX], > - env->regs[R_EBX], > - env->regs[R_ECX], > - env->regs[R_EDX], > - env->regs[R_ESI], > - env->regs[R_EDI], > - env->regs[R_EBP]); > - } > - if (((abi_ulong)env->regs[R_EAX]) >= (abi_ulong)(-515)) { > - env->regs[R_EAX] = -env->regs[R_EAX]; > - env->eflags |= CC_C; > - } else { > - env->eflags &= ~CC_C; > - } > - break; > - > case EXCP_SYSCALL: > /* syscall from syscall instruction */ > if (bsd_type == target_freebsd) { > -- > 2.33.1 >
diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h index 0a9c0f08946..9dc52d5afc4 100644 --- a/bsd-user/x86_64/target_arch_cpu.h +++ b/bsd-user/x86_64/target_arch_cpu.h @@ -124,64 +124,6 @@ static inline void target_cpu_loop(CPUX86State *env) process_queued_cpu_work(cs); switch (trapnr) { - case 0x80: - /* syscall from int $0x80 */ - if (bsd_type == target_freebsd) { - abi_ulong params = (abi_ulong) env->regs[R_ESP] + - sizeof(int32_t); - int32_t syscall_nr = env->regs[R_EAX]; - int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; - - if (syscall_nr == TARGET_FREEBSD_NR_syscall) { - get_user_s32(syscall_nr, params); - params += sizeof(int32_t); - } else if (syscall_nr == TARGET_FREEBSD_NR___syscall) { - get_user_s32(syscall_nr, params); - params += sizeof(int64_t); - } - get_user_s32(arg1, params); - params += sizeof(int32_t); - get_user_s32(arg2, params); - params += sizeof(int32_t); - get_user_s32(arg3, params); - params += sizeof(int32_t); - get_user_s32(arg4, params); - params += sizeof(int32_t); - get_user_s32(arg5, params); - params += sizeof(int32_t); - get_user_s32(arg6, params); - params += sizeof(int32_t); - get_user_s32(arg7, params); - params += sizeof(int32_t); - get_user_s32(arg8, params); - env->regs[R_EAX] = do_freebsd_syscall(env, - syscall_nr, - arg1, - arg2, - arg3, - arg4, - arg5, - arg6, - arg7, - arg8); - } else { /* if (bsd_type == target_openbsd) */ - env->regs[R_EAX] = do_openbsd_syscall(env, - env->regs[R_EAX], - env->regs[R_EBX], - env->regs[R_ECX], - env->regs[R_EDX], - env->regs[R_ESI], - env->regs[R_EDI], - env->regs[R_EBP]); - } - if (((abi_ulong)env->regs[R_EAX]) >= (abi_ulong)(-515)) { - env->regs[R_EAX] = -env->regs[R_EAX]; - env->eflags |= CC_C; - } else { - env->eflags &= ~CC_C; - } - break; - case EXCP_SYSCALL: /* syscall from syscall instruction */ if (bsd_type == target_freebsd) {
Although initial versions of NetBSD did use int $80, it was replaced by syscall before any releases. OpenBSD and FreeBSD always did syscall. Signed-off-by: Warner Losh <imp@bsdimp.com> --- bsd-user/x86_64/target_arch_cpu.h | 58 ------------------------------- 1 file changed, 58 deletions(-)