From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
arrowd@FreeBSD.org, Kyle Evans <kevans@FreeBSD.org>,
Richard Henderson <richard.henderson@linaro.org>,
def@FreeBSD.org, jrtc27@FreeBSD.org, Warner Losh <imp@bsdimp.com>,
Brad Smith <brad@comstyle.com>
Subject: [PATCH v2 03/16] bsd-user/x86_64/target_arch_cpu.h: Remove openbsd syscall
Date: Sat, 26 Feb 2022 10:07:31 -0700 [thread overview]
Message-ID: <20220226170744.76615-4-imp@bsdimp.com> (raw)
In-Reply-To: <20220226170744.76615-1-imp@bsdimp.com>
This doesn't build on openbsd at the moment, and this could
should arguably be in bsd-user/*bsd/x86_64 somewhere. Until
we refactor to support OpenBSD/NetBSD again, drop it here.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
---
bsd-user/x86_64/target_arch_cpu.h | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h
index 9dc52d5afc4..5be2f02416e 100644
--- a/bsd-user/x86_64/target_arch_cpu.h
+++ b/bsd-user/x86_64/target_arch_cpu.h
@@ -126,25 +126,14 @@ static inline void target_cpu_loop(CPUX86State *env)
switch (trapnr) {
case EXCP_SYSCALL:
/* syscall from syscall instruction */
- if (bsd_type == target_freebsd) {
- env->regs[R_EAX] = do_freebsd_syscall(env,
- env->regs[R_EAX],
- env->regs[R_EDI],
- env->regs[R_ESI],
- env->regs[R_EDX],
- env->regs[R_ECX],
- env->regs[8],
- env->regs[9], 0, 0);
- } else { /* if (bsd_type == target_openbsd) */
- env->regs[R_EAX] = do_openbsd_syscall(env,
- env->regs[R_EAX],
- env->regs[R_EDI],
- env->regs[R_ESI],
- env->regs[R_EDX],
- env->regs[10],
- env->regs[8],
- env->regs[9]);
- }
+ env->regs[R_EAX] = do_freebsd_syscall(env,
+ env->regs[R_EAX],
+ env->regs[R_EDI],
+ env->regs[R_ESI],
+ env->regs[R_EDX],
+ env->regs[R_ECX],
+ env->regs[8],
+ env->regs[9], 0, 0);
env->eip = env->exception_next_eip;
if (((abi_ulong)env->regs[R_EAX]) >= (abi_ulong)(-515)) {
env->regs[R_EAX] = -env->regs[R_EAX];
--
2.33.1
next prev parent reply other threads:[~2022-02-26 17:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-26 17:07 [PATCH v2 00/16] bsd-user: Start upstreaming the system calls Warner Losh
2022-02-26 17:07 ` [PATCH v2 01/16] bsd-user/main.c: Drop syscall flavor arg -bsd Warner Losh
2022-02-26 17:07 ` [PATCH v2 02/16] bsd-user/x86_64/target_arch_cpu.h: int $80 never was a BSD system call on amd64 Warner Losh
2022-02-26 17:07 ` Warner Losh [this message]
2022-02-26 17:07 ` [PATCH v2 04/16] bsd-user/i386/target_arch_cpu.h: Remove openbsd syscall Warner Losh
2022-02-26 17:07 ` [PATCH v2 05/16] bsd-user/arm/target_arch_cpu.h: Only support FreeBSD sys calls Warner Losh
2022-02-26 17:07 ` [PATCH v2 06/16] bsd-user/arm/target_arch_thread.h: Assume a FreeBSD target Warner Losh
2022-02-26 17:07 ` [PATCH v2 07/16] bsd-user/x86_64/target_arch_thread.h: " Warner Losh
2022-02-26 17:07 ` [PATCH v2 08/16] bsd-user: Remove bsd_type Warner Losh
2022-02-26 17:07 ` [PATCH v2 09/16] bsd-user/freebsd/os-syscall.c: Move syscall processing here Warner Losh
2022-02-26 17:07 ` [PATCH v2 10/16] bsd-user: Move system call building to os-syscall.c Warner Losh
2022-02-26 17:07 ` [PATCH v2 11/16] bsd-user/sycall.c: Now obsolete, remove Warner Losh
2022-02-26 17:07 ` [PATCH v2 12/16] bsd-user/freebsd/os-syscall.c: Add get_errno and host_to_target_errno Warner Losh
2022-02-26 17:07 ` [PATCH v2 13/16] bsd-user/bsd-file.h: Implementation details for the filesystem calls Warner Losh
2022-02-27 3:20 ` Richard Henderson
2022-02-26 17:07 ` [PATCH v2 14/16] bsd-user: introduce target.h Warner Losh
2022-02-26 17:07 ` [PATCH v2 15/16] bsd-user: Define target_arg64 Warner Losh
2022-02-26 17:07 ` [PATCH v2 16/16] bsd-user: Add safe system call macros Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220226170744.76615-4-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=arrowd@FreeBSD.org \
--cc=brad@comstyle.com \
--cc=def@FreeBSD.org \
--cc=jrtc27@FreeBSD.org \
--cc=kevans@FreeBSD.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).