From nobody Wed Nov 19 03:02:47 2025 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614356549; cv=none; d=zohomail.com; s=zohoarc; b=HBZ/wnTCiWWY45s7EPCOff3l345AGq/Vw6uG9UnB8tzSBqRmD1WrVzmLC1FZwW9xFVyw5nfF2sxr8/2DsH17x7AuQdRMI1bmwyPmaDI930e+UgGi0tOdt9sbN5iLMvNfh9/S1nM4WCO3DIdEA0byxgIHdqDnleEEyL9JRfZxuk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614356549; h=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=51VJfBomUWlzPOgh52KPvkCUMNk32VAdgGf+JIsREJk=; b=hoF2eB8H83t5jzrp+GkbCYv2v5EWtd15o0zutE8LiP/lZFA22zSh44gvHReBgbQzCORjrAR8HbFindg0aF3a7r3Q0MpQscFqkTTHx6eeaWO3LuigWYs66KjmPIOK+OyINfDHSt58Q3L7Qdf9ktCtFeLYY37mzr7XTmKi5/N7Tm8= ARC-Authentication-Results: i=1; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614356549828905.7258128474318; Fri, 26 Feb 2021 08:22:29 -0800 (PST) Received: from localhost ([::1]:51814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFfsq-0005iz-8v for importer@patchew.org; Fri, 26 Feb 2021 11:22:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFfqz-0004PT-Dc for qemu-devel@nongnu.org; Fri, 26 Feb 2021 11:20:33 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:40027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFfqs-0003lt-QF for qemu-devel@nongnu.org; Fri, 26 Feb 2021 11:20:33 -0500 Received: by mail-pg1-x52e.google.com with SMTP id b21so6497131pgk.7 for ; Fri, 26 Feb 2021 08:20:26 -0800 (PST) Received: from localhost.localdomain (174-21-84-25.tukw.qwest.net. [174.21.84.25]) by smtp.gmail.com with ESMTPSA id 6sm9141291pgv.70.2021.02.26.08.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 08:20:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=51VJfBomUWlzPOgh52KPvkCUMNk32VAdgGf+JIsREJk=; b=GXV2I8mC92jRZ6+ZejAijLimHPi5ms9CN8Qc6FZ+zJf+gJFnhdmqhQhU2Cq/A38p3J iqgqkMkX+bLv8326mDejpuP7bvYKbkNYUT5v2RHd0iFlGC6REgCJ5HyGLnh2rFiu5elW 36VRxnQ5StH4yyrKqrNKzWpccc0q78uv5wL5tDzz87HTNN19+L7fw8SGa1NRuNxcWyq8 vfs+5K2NhhrQY96Ihfo64a6vCB1Qrd2EifUvjwUPS7PFLl98msF5S41LEZffD7er+Apf hqc5UthsqBXYcCCs44w4dhNq8l4UUz2aDhYmODSw0ZP47CEzdK8XVFSqGqOwHfFfxGKZ r+iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=51VJfBomUWlzPOgh52KPvkCUMNk32VAdgGf+JIsREJk=; b=GFh8bNxAWgO034Ot31dAAFZQDNEqhmzPkThhuh6oCj07Om4uHvZYbqWvrnc+dGRWDK skUWxJqcwMTLsOJC6XNcfHleIlJpQtKYAVo9FL28pES57OI147xAsvQFo2JUxL7TSP5J J65MC+z7OZNcavpdIyZyqesnxoNrDX7GPohlWteddyBnyzs2SiNMBffGIr+0OxR8QHO1 Nls9HXDnztoDZTG/TLLKC9Dbf1Vig/RPGY5GdgJtfhiGt+hax9si0+skSTWJLGufanpW 0qfmMksudAE6ER2HDLoUKss0w8Ko+O216b4gLOLNP9lPoVWTQH13M1uKYaJ2GY1aAdcG 9lBg== X-Gm-Message-State: AOAM5306HiBzrYZ82YDUvoML4kPdvbbWBiwpH2tp09HzzU/80wehOsy6 5wwoWWzsjxPbX3r8hFmgqCWT+wGUdr6Epw== X-Google-Smtp-Source: ABdhPJyikJysZbJkSEKth01+BGJKHy2+IX0C5B7p1gey7m76/X4JdDBLUZaCfIvVAj8Kb0/Ko0vfXg== X-Received: by 2002:a63:f953:: with SMTP id q19mr3485884pgk.125.1614356425183; Fri, 26 Feb 2021 08:20:25 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/2] target/i386: Rename helper_fldt, helper_fstt Date: Fri, 26 Feb 2021 08:20:21 -0800 Message-Id: <20210226162022.375654-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210226162022.375654-1-richard.henderson@linaro.org> References: <20210226162022.375654-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pbonzini@redhat.com, philmd@redhat.com, cfontana@suse.de, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Change the prefix from "helper" to "do". The former should be reserved for those functions that are called from TCG; the latter is in use within the file already for those functions that are called from the helper functions, adding a "retaddr" argument. Signed-off-by: Richard Henderson Reviewed-by: Claudio Fontana Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Claudio Fontana --- target/i386/tcg/fpu_helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/target/i386/tcg/fpu_helper.c b/target/i386/tcg/fpu_helper.c index 60ed93520a..3d9b192901 100644 --- a/target/i386/tcg/fpu_helper.c +++ b/target/i386/tcg/fpu_helper.c @@ -117,8 +117,7 @@ static inline void fpop(CPUX86State *env) env->fpstt =3D (env->fpstt + 1) & 7; } =20 -static inline floatx80 helper_fldt(CPUX86State *env, target_ulong ptr, - uintptr_t retaddr) +static floatx80 do_fldt(CPUX86State *env, target_ulong ptr, uintptr_t reta= ddr) { CPU_LDoubleU temp; =20 @@ -127,8 +126,8 @@ static inline floatx80 helper_fldt(CPUX86State *env, ta= rget_ulong ptr, return temp.d; } =20 -static inline void helper_fstt(CPUX86State *env, floatx80 f, target_ulong = ptr, - uintptr_t retaddr) +static void do_fstt(CPUX86State *env, floatx80 f, target_ulong ptr, + uintptr_t retaddr) { CPU_LDoubleU temp; =20 @@ -405,14 +404,14 @@ void helper_fldt_ST0(CPUX86State *env, target_ulong p= tr) int new_fpstt; =20 new_fpstt =3D (env->fpstt - 1) & 7; - env->fpregs[new_fpstt].d =3D helper_fldt(env, ptr, GETPC()); + env->fpregs[new_fpstt].d =3D do_fldt(env, ptr, GETPC()); env->fpstt =3D new_fpstt; env->fptags[new_fpstt] =3D 0; /* validate stack entry */ } =20 void helper_fstt_ST0(CPUX86State *env, target_ulong ptr) { - helper_fstt(env, ST0, ptr, GETPC()); + do_fstt(env, ST0, ptr, GETPC()); } =20 void helper_fpush(CPUX86State *env) @@ -2468,7 +2467,7 @@ void helper_fsave(CPUX86State *env, target_ulong ptr,= int data32) ptr +=3D (14 << data32); for (i =3D 0; i < 8; i++) { tmp =3D ST(i); - helper_fstt(env, tmp, ptr, GETPC()); + do_fstt(env, tmp, ptr, GETPC()); ptr +=3D 10; } =20 @@ -2495,7 +2494,7 @@ void helper_frstor(CPUX86State *env, target_ulong ptr= , int data32) ptr +=3D (14 << data32); =20 for (i =3D 0; i < 8; i++) { - tmp =3D helper_fldt(env, ptr, GETPC()); + tmp =3D do_fldt(env, ptr, GETPC()); ST(i) =3D tmp; ptr +=3D 10; } @@ -2539,7 +2538,7 @@ static void do_xsave_fpu(CPUX86State *env, target_ulo= ng ptr, uintptr_t ra) addr =3D ptr + XO(legacy.fpregs); for (i =3D 0; i < 8; i++) { floatx80 tmp =3D ST(i); - helper_fstt(env, tmp, addr, ra); + do_fstt(env, tmp, addr, ra); addr +=3D 16; } } @@ -2703,7 +2702,7 @@ static void do_xrstor_fpu(CPUX86State *env, target_ul= ong ptr, uintptr_t ra) =20 addr =3D ptr + XO(legacy.fpregs); for (i =3D 0; i < 8; i++) { - floatx80 tmp =3D helper_fldt(env, addr, ra); + floatx80 tmp =3D do_fldt(env, addr, ra); ST(i) =3D tmp; addr +=3D 16; } --=20 2.25.1 From nobody Wed Nov 19 03:02:47 2025 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614356556; cv=none; d=zohomail.com; s=zohoarc; b=XXrN0MtK5HrU65MARIJU3MdFqh6YkLgBXPtR42ERiU8GdMUCYMT0UvzIRsgmXeW01hPrGlp32+2lnlCU692We8RxtuoND2E69dvybsbwQq04JWdtcgtDJpucxhfKfHondml5uSiAl6PrjjKG/F5eN2t04tVnzgWFVOrXsBL4ACs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614356556; h=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=DGhlzn2n59puEvgeyeGF9w2ImBEznNy8+7crWJ3wqH4=; b=PK9XGzEdXwjfK6Aw6HPVb3Kc/wDl11VoGcIskgxRxbe02WslaPr47pffOao03NCGOfS9IDqvuVH4lsM0efLznVFV5SUBga+0ZNiQOaGV3ezVxGlpY4Tfdr2dcchRMK7tyDMQQ7ty/rJGS9xM8zyvRaZt6G39los/y4sdPPxvQtw= ARC-Authentication-Results: i=1; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614356556382956.0586104289722; Fri, 26 Feb 2021 08:22:36 -0800 (PST) Received: from localhost ([::1]:52010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFfsx-0005nh-83 for importer@patchew.org; Fri, 26 Feb 2021 11:22:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFfr3-0004Q1-8E for qemu-devel@nongnu.org; Fri, 26 Feb 2021 11:20:37 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:35190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFfqt-0003lz-IN for qemu-devel@nongnu.org; Fri, 26 Feb 2021 11:20:37 -0500 Received: by mail-pf1-x42e.google.com with SMTP id j24so6573299pfi.2 for ; Fri, 26 Feb 2021 08:20:27 -0800 (PST) Received: from localhost.localdomain (174-21-84-25.tukw.qwest.net. [174.21.84.25]) by smtp.gmail.com with ESMTPSA id 6sm9141291pgv.70.2021.02.26.08.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 08:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DGhlzn2n59puEvgeyeGF9w2ImBEznNy8+7crWJ3wqH4=; b=Sy1e67HRvZr93nZclO/iMk92ZM/MK4T6i50288yM64e19m7AUjbfMUOPn6sxzYl6z7 /M1TTkjBVnkllqmSlVl0SRG5Oed1nNr7JEFI2EzujdfF0+F4JPkYcoXQ7zIxTfe7v+jY kZLO2S6fa0WiS8JD0YwZpxmjsy4ugtAPewM3Ui/Tmi25V8Vtv0jkvJAXH3jjvF3n7Ico SILAUvfu/fvOO7DRNlvS67pFaVryiT1dAx6RWLMOc9biFrTeaDstWYhYE5o2rXbje9QX DMA8UuZlZ7ejUiS7XCQasyP2wQwOD7lqd7YFw2PVDviSMPqc2QxPFxo3Z63s8Ryt6dLB EHOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DGhlzn2n59puEvgeyeGF9w2ImBEznNy8+7crWJ3wqH4=; b=rnmfYjMnQxHST33nq/v+WKvwXkbxBugBjdB/FReHdmwtDvI4KRR8Ug6LVvIfALGHIl K0olIqOPl81iLQaiqSVx2bqMTH9DVcdvOscBi+y9CfWdNXAMtSoAKzOwNOlimsC3rRQC DcbAz0+DJhXjEkPXsLMifepNRdoBENhfgMUg6OXzTcvejveRj20+FWfxE63Ux0YK4VaS O+k8LgmzTz4B6YVNJ2dO6w0MdHXqkTAatiDGkiKKqDrT12JDoKCDCz1ATR99k3zB/xs/ POxyCguk90pouSOd3eppEISCFIGGOR2LXMnQ989QX+lS5+Rmr29ICboboLhrnmMIoZVH DZMA== X-Gm-Message-State: AOAM530N5KDLRj9utePZwx1MMjpgbPkKMPRLp4nbWrL5bRna+7jJ1XKl 2MqqSsA35x+0cTV7Xl+uMt6ME0gsFBAskQ== X-Google-Smtp-Source: ABdhPJx4WjG8owt59MOE9Nx7mOd1irDjAWtzY1rQYvcDZ4H5t5cAi0/KlirRdmBpAc04sj1WyatZZw== X-Received: by 2002:a63:4662:: with SMTP id v34mr3644017pgk.197.1614356426028; Fri, 26 Feb 2021 08:20:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/2] target/i386: Split out do_fsave, do_frstor, do_fxsave, do_fxrstor Date: Fri, 26 Feb 2021 08:20:22 -0800 Message-Id: <20210226162022.375654-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210226162022.375654-1-richard.henderson@linaro.org> References: <20210226162022.375654-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: pbonzini@redhat.com, philmd@redhat.com, cfontana@suse.de, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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: Claudio Fontana Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Claudio Fontana --- target/i386/tcg/fpu_helper.c | 50 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 16 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_frstor(CPUX86State *env, target_ulong ptr, int data32) +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; =20 - do_fldenv(env, ptr, data32, GETPC()); + do_fldenv(env, ptr, data32, retaddr); ptr +=3D (14 << data32); =20 for (i =3D 0; i < 8; i++) { - tmp =3D do_fldt(env, ptr, GETPC()); + tmp =3D do_fldt(env, ptr, retaddr); ST(i) =3D tmp; ptr +=3D 10; } } =20 +void helper_frstor(CPUX86State *env, target_ulong ptr, int data32) +{ + do_frstor(env, ptr, data32, GETPC()); +} + #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.25.1