From nobody Sun Feb 8 22:34:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646072420991950.1356874469811; Mon, 28 Feb 2022 10:20:20 -0800 (PST) Received: from localhost ([::1]:42530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOkd9-0007Fp-Nc for importer@patchew.org; Mon, 28 Feb 2022 13:20:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOkUw-00089X-4O for qemu-devel@nongnu.org; Mon, 28 Feb 2022 13:11:50 -0500 Received: from [2607:f8b0:4864:20::d2c] (port=46020 helo=mail-io1-xd2c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOkUt-0006Y7-OP for qemu-devel@nongnu.org; Mon, 28 Feb 2022 13:11:49 -0500 Received: by mail-io1-xd2c.google.com with SMTP id c14so15629927ioa.12 for ; Mon, 28 Feb 2022 10:11:47 -0800 (PST) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id s13-20020a6bdc0d000000b006408888551dsm6015396ioc.8.2022.02.28.10.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 10:11:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/0Ungf5BAlJNkh7LvFfAMnGaakju4aH7gQ1ep4PqQIo=; b=bE579lmLgWyOAyxWY9Z2WcHCtkrjPvgcIVRNRdlYJx4s3COyPsjtnWJ8CIKmmHKFWw vibQ47U+PO/vHlf1iMH2o1EUbqI//FpNg+sO6/9SaDXeG32p8PUE7EGsbv++067wMzVu ZziXmUphTG1JSGqIHqBWZXV2sbGuhiJ/cTdVxP0Is10+zICESMsJD4E0192L0cwpNymb k6oyP05crgI97a7NU/Ju6V84FbUNco/4WjrvAHJiFtk7r3PH9EogsWpGeNAxqTHz3UDj kp81zhmL3dcnqamzXL0ZOWnscPxxZOJqUt0dcqaGYol4oyMi4QtfG7fIcXdAay2r1r3n 49kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/0Ungf5BAlJNkh7LvFfAMnGaakju4aH7gQ1ep4PqQIo=; b=rYA/WZzEPfLD3DjADNL3ocezEuQIAY219ziPoutWCPQy36V70NGjs9iHRCkjFmNvCP cLCD/zmNK4RvDW0gD/hA3x4jSabBEuwEdRBvztbW/0V3/ADGwsob3xgzW2OvPAFWxCzf 5QJJ5E/qCzrbRAhmcxMT2IwJ2qSb8Q4Anw1yJRo1c8Fgws72zPgazldEdIo2/4VvvK5n k9AKajParwY2Fm8iZUaRJtpObcs2scgLMzE6FOAoDq0xfeOOujLh0aSm1aM646LReDhI V4zzsADmN1uI68GexxNm7cZv7aerpFSskJ42f9aft4SUvk7NcNVgd0iHkBamXKm9H1y5 RmJw== X-Gm-Message-State: AOAM533KqmD8Eqvo8ZbwB0iHFaFfeU2hVDnRw1XP01ezzqRJKB8InsIf 8EdYWCD2NCU1GsJjKVd8kEeEhRrKYMehbw== X-Google-Smtp-Source: ABdhPJwMslT+ZSVEwGk21XsApocEg1bws0CuXEGxvk7txE1XiLbKNRKfpJQyhvzxJNBk5eBcIaB9Tg== X-Received: by 2002:a05:6602:14cd:b0:644:dde8:394 with SMTP id b13-20020a05660214cd00b00644dde80394mr5725979iow.181.1646071906420; Mon, 28 Feb 2022 10:11:46 -0800 (PST) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 05/16] bsd-user/arm/target_arch_cpu.h: Only support FreeBSD sys calls Date: Mon, 28 Feb 2022 11:12:03 -0700 Message-Id: <20220228181214.2602-6-imp@bsdimp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220228181214.2602-1-imp@bsdimp.com> References: <20220228181214.2602-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::d2c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d2c; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , arrowd@FreeBSD.org, Kyle Evans , Richard Henderson , def@FreeBSD.org, jrtc27@FreeBSD.org, Warner Losh , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646072422343100001 Content-Type: text/plain; charset="utf-8" Since we don't build on OpenBSD, only do FreeBSD system calls here. In the future, we'll need to move this to some place like bsd-user/freebsd/arm/mumble.h, but until then just leave this inline. This reflects changes to the upstream. Signed-off-by: Warner Losh Reviewed-by: Kyle Evans Reviewed-by: Richard Henderson --- bsd-user/arm/target_arch_cpu.h | 139 ++++++++++++++++----------------- 1 file changed, 66 insertions(+), 73 deletions(-) diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h index b087db48fa4..afb7814a8d1 100644 --- a/bsd-user/arm/target_arch_cpu.h +++ b/bsd-user/arm/target_arch_cpu.h @@ -40,7 +40,6 @@ static inline void target_cpu_init(CPUARMState *env, static inline void target_cpu_loop(CPUARMState *env) { int trapnr, si_signo, si_code; - unsigned int n; CPUState *cs =3D env_cpu(env); =20 for (;;) { @@ -66,82 +65,76 @@ static inline void target_cpu_loop(CPUARMState *env) break; case EXCP_SWI: { - n =3D env->regs[7]; - if (bsd_type =3D=3D target_freebsd) { - int ret; - abi_ulong params =3D get_sp_from_cpustate(env); - int32_t syscall_nr =3D n; - int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; + int ret; + abi_ulong params =3D get_sp_from_cpustate(env); + int32_t syscall_nr =3D env->regs[7]; + int32_t arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8; =20 - /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ - if (syscall_nr =3D=3D TARGET_FREEBSD_NR_syscall) { - syscall_nr =3D env->regs[0]; - arg1 =3D env->regs[1]; - arg2 =3D env->regs[2]; - arg3 =3D env->regs[3]; - get_user_s32(arg4, params); - params +=3D sizeof(int32_t); - get_user_s32(arg5, params); - params +=3D sizeof(int32_t); - get_user_s32(arg6, params); - params +=3D sizeof(int32_t); - get_user_s32(arg7, params); - arg8 =3D 0; - } else if (syscall_nr =3D=3D TARGET_FREEBSD_NR___sysca= ll) { - syscall_nr =3D env->regs[0]; - arg1 =3D env->regs[2]; - arg2 =3D env->regs[3]; - get_user_s32(arg3, params); - params +=3D sizeof(int32_t); - get_user_s32(arg4, params); - params +=3D sizeof(int32_t); - get_user_s32(arg5, params); - params +=3D sizeof(int32_t); - get_user_s32(arg6, params); - arg7 =3D 0; - arg8 =3D 0; - } else { - arg1 =3D env->regs[0]; - arg2 =3D env->regs[1]; - arg3 =3D env->regs[2]; - arg4 =3D env->regs[3]; - get_user_s32(arg5, params); - params +=3D sizeof(int32_t); - get_user_s32(arg6, params); - params +=3D sizeof(int32_t); - get_user_s32(arg7, params); - params +=3D sizeof(int32_t); - get_user_s32(arg8, params); - } - ret =3D do_freebsd_syscall(env, syscall_nr, arg1, arg2= , arg3, - arg4, arg5, arg6, arg7, arg8); + /* See arm/arm/syscall.c cpu_fetch_syscall_args() */ + if (syscall_nr =3D=3D TARGET_FREEBSD_NR_syscall) { + syscall_nr =3D env->regs[0]; + arg1 =3D env->regs[1]; + arg2 =3D env->regs[2]; + arg3 =3D env->regs[3]; + get_user_s32(arg4, params); + params +=3D sizeof(int32_t); + get_user_s32(arg5, params); + params +=3D sizeof(int32_t); + get_user_s32(arg6, params); + params +=3D sizeof(int32_t); + get_user_s32(arg7, params); + arg8 =3D 0; + } else if (syscall_nr =3D=3D TARGET_FREEBSD_NR___syscall) { + syscall_nr =3D env->regs[0]; + arg1 =3D env->regs[2]; + arg2 =3D env->regs[3]; + get_user_s32(arg3, params); + params +=3D sizeof(int32_t); + get_user_s32(arg4, params); + params +=3D sizeof(int32_t); + get_user_s32(arg5, params); + params +=3D sizeof(int32_t); + get_user_s32(arg6, params); + arg7 =3D 0; + arg8 =3D 0; + } else { + arg1 =3D env->regs[0]; + arg2 =3D env->regs[1]; + arg3 =3D env->regs[2]; + arg4 =3D env->regs[3]; + get_user_s32(arg5, params); + params +=3D sizeof(int32_t); + get_user_s32(arg6, params); + params +=3D sizeof(int32_t); + get_user_s32(arg7, params); + params +=3D sizeof(int32_t); + get_user_s32(arg8, params); + } + ret =3D do_freebsd_syscall(env, syscall_nr, arg1, arg2, ar= g3, + arg4, arg5, arg6, arg7, arg8); + /* + * Compare to arm/arm/vm_machdep.c + * cpu_set_syscall_retval() + */ + if (-TARGET_EJUSTRETURN =3D=3D ret) { /* - * Compare to arm/arm/vm_machdep.c - * cpu_set_syscall_retval() + * Returning from a successful sigreturn syscall. + * Avoid clobbering register state. */ - if (-TARGET_EJUSTRETURN =3D=3D ret) { - /* - * Returning from a successful sigreturn syscall. - * Avoid clobbering register state. - */ - break; - } - if (-TARGET_ERESTART =3D=3D ret) { - env->regs[15] -=3D env->thumb ? 2 : 4; - break; - } - if ((unsigned int)ret >=3D (unsigned int)(-515)) { - ret =3D -ret; - cpsr_write(env, CPSR_C, CPSR_C, CPSRWriteByInstr); - env->regs[0] =3D ret; - } else { - cpsr_write(env, 0, CPSR_C, CPSRWriteByInstr); - env->regs[0] =3D ret; /* XXX need to handle lseek(= )? */ - /* env->regs[1] =3D 0; */ - } + break; + } + if (-TARGET_ERESTART =3D=3D ret) { + env->regs[15] -=3D env->thumb ? 2 : 4; + break; + } + if ((unsigned int)ret >=3D (unsigned int)(-515)) { + ret =3D -ret; + cpsr_write(env, CPSR_C, CPSR_C, CPSRWriteByInstr); + env->regs[0] =3D ret; } else { - fprintf(stderr, "qemu: bsd_type (=3D %d) syscall " - "not supported\n", bsd_type); + cpsr_write(env, 0, CPSR_C, CPSRWriteByInstr); + env->regs[0] =3D ret; /* XXX need to handle lseek()? */ + /* env->regs[1] =3D 0; */ } } break; --=20 2.33.1