From nobody Tue Feb 10 04:17:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1616420008; cv=none; d=zohomail.com; s=zohoarc; b=Crv+ZN8TBvHz3D2P/T4nQaH8con0sMDTcucBxujW87f+BMIsk9LR33UoDeEyZJK6NXY+1LCqOew4fVpkxXQwT/yWCkdIp/vOZEz47gP9/ClkuIgEeiPBKB4kyeUXpSG7JjDkd8JwjZ6ZYHYucsaamTNS6wQTiL3hNfM00Pvg3/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616420008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Cp5RCTIsznWoWsNmzfAchzNJIUbX9vX8jH5Qk2Qy0zE=; b=jPDFYW2mzQD1hqEpO9QztTSBECUs5+5rpj7Hmuiw6GdXEMfFHC3gN49RBr9ZTWN1tDtq1jF2er/W3clXpSo60QqjCWocecqoecmhSw0rtqwOXfzf8p2chyURLL8kYS7mj5hJ8CzbCk/SguRNfkc+kFapukrQXDVWfR+N8yM3dd4= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1616420008838203.85850383238778; Mon, 22 Mar 2021 06:33:28 -0700 (PDT) Received: from localhost ([::1]:39948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOKgR-0006F4-5E for importer@patchew.org; Mon, 22 Mar 2021 09:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOKbI-0000jw-O6 for qemu-devel@nongnu.org; Mon, 22 Mar 2021 09:28:08 -0400 Received: from mx2.suse.de ([195.135.220.15]:45040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOKbE-0001gG-Pa for qemu-devel@nongnu.org; Mon, 22 Mar 2021 09:28:08 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 98C9CAD79; Mon, 22 Mar 2021 13:28:03 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v28 02/23] target/i386: Split out do_fsave, do_frstor, do_fxsave, do_fxrstor Date: Mon, 22 Mar 2021 14:27:39 +0100 Message-Id: <20210322132800.7470-4-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210322132800.7470-1-cfontana@suse.de> References: <20210322132800.7470-1-cfontana@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Roman Bolshakov , Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The helper_* functions must use GETPC() to unwind from TCG. The cpu_x86_* functions cannot, and directly calling the helper_* functions is a bug. Split out new functions that perform the work and can be used by both. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana Tested-by: Claudio Fontana Reviewed-by: Alex Benn=C3=A9e --- target/i386/tcg/fpu_helper.c | 66 +++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/target/i386/tcg/fpu_helper.c b/target/i386/tcg/fpu_helper.c index 3d9b192901..20e4d2e715 100644 --- a/target/i386/tcg/fpu_helper.c +++ b/target/i386/tcg/fpu_helper.c @@ -2457,17 +2457,18 @@ void helper_fldenv(CPUX86State *env, target_ulong p= tr, int data32) do_fldenv(env, ptr, data32, GETPC()); } =20 -void helper_fsave(CPUX86State *env, target_ulong ptr, int data32) +static void do_fsave(CPUX86State *env, target_ulong ptr, int data32, + uintptr_t retaddr) { floatx80 tmp; int i; =20 - do_fstenv(env, ptr, data32, GETPC()); + do_fstenv(env, ptr, data32, retaddr); =20 ptr +=3D (14 << data32); for (i =3D 0; i < 8; i++) { tmp =3D ST(i); - do_fstt(env, tmp, ptr, GETPC()); + do_fstt(env, tmp, ptr, retaddr); ptr +=3D 10; } =20 @@ -2485,30 +2486,41 @@ void helper_fsave(CPUX86State *env, target_ulong pt= r, int data32) env->fptags[7] =3D 1; } =20 +void helper_fsave(CPUX86State *env, target_ulong ptr, int data32) +{ + do_fsave(env, ptr, data32, GETPC()); +} + +static void do_frstor(CPUX86State *env, target_ulong ptr, int data32, + uintptr_t retaddr) +{ + floatx80 tmp; + int i; + + do_fldenv(env, ptr, data32, retaddr); + ptr +=3D (14 << data32); + + for (i =3D 0; i < 8; i++) { + tmp =3D do_fldt(env, ptr, retaddr); + ST(i) =3D tmp; + ptr +=3D 10; + } +} + void helper_frstor(CPUX86State *env, target_ulong ptr, int data32) { - floatx80 tmp; - int i; - - do_fldenv(env, ptr, data32, GETPC()); - ptr +=3D (14 << data32); - - for (i =3D 0; i < 8; i++) { - tmp =3D do_fldt(env, ptr, GETPC()); - ST(i) =3D tmp; - ptr +=3D 10; - } + do_frstor(env, ptr, data32, GETPC()); } =20 #if defined(CONFIG_USER_ONLY) void cpu_x86_fsave(CPUX86State *env, target_ulong ptr, int data32) { - helper_fsave(env, ptr, data32); + do_fsave(env, ptr, data32, 0); } =20 void cpu_x86_frstor(CPUX86State *env, target_ulong ptr, int data32) { - helper_frstor(env, ptr, data32); + do_frstor(env, ptr, data32, 0); } #endif =20 @@ -2593,10 +2605,8 @@ static void do_xsave_pkru(CPUX86State *env, target_u= long ptr, uintptr_t ra) cpu_stq_data_ra(env, ptr, env->pkru, ra); } =20 -void helper_fxsave(CPUX86State *env, target_ulong ptr) +static void do_fxsave(CPUX86State *env, target_ulong ptr, uintptr_t ra) { - uintptr_t ra =3D GETPC(); - /* The operand must be 16 byte aligned */ if (ptr & 0xf) { raise_exception_ra(env, EXCP0D_GPF, ra); @@ -2615,6 +2625,11 @@ void helper_fxsave(CPUX86State *env, target_ulong pt= r) } } =20 +void helper_fxsave(CPUX86State *env, target_ulong ptr) +{ + do_fxsave(env, ptr, GETPC()); +} + static uint64_t get_xinuse(CPUX86State *env) { uint64_t inuse =3D -1; @@ -2757,10 +2772,8 @@ static void do_xrstor_pkru(CPUX86State *env, target_= ulong ptr, uintptr_t ra) env->pkru =3D cpu_ldq_data_ra(env, ptr, ra); } =20 -void helper_fxrstor(CPUX86State *env, target_ulong ptr) +static void do_fxrstor(CPUX86State *env, target_ulong ptr, uintptr_t ra) { - uintptr_t ra =3D GETPC(); - /* The operand must be 16 byte aligned */ if (ptr & 0xf) { raise_exception_ra(env, EXCP0D_GPF, ra); @@ -2779,15 +2792,20 @@ void helper_fxrstor(CPUX86State *env, target_ulong = ptr) } } =20 +void helper_fxrstor(CPUX86State *env, target_ulong ptr) +{ + do_fxrstor(env, ptr, GETPC()); +} + #if defined(CONFIG_USER_ONLY) void cpu_x86_fxsave(CPUX86State *env, target_ulong ptr) { - helper_fxsave(env, ptr); + do_fxsave(env, ptr, 0); } =20 void cpu_x86_fxrstor(CPUX86State *env, target_ulong ptr) { - helper_fxrstor(env, ptr); + do_fxrstor(env, ptr, 0); } #endif =20 --=20 2.26.2