From patchwork Mon Mar 1 08:54:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Claudio Fontana X-Patchwork-Id: 388627 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3180728jap; Mon, 1 Mar 2021 00:55:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTrx4mBgR9Mfl9oQ8kks57j9G+KGfbTgfWHWRR860lIZ0fiA0AkNThTI1PtqyV2GpHzugu X-Received: by 2002:a5b:2c8:: with SMTP id h8mr21821728ybp.364.1614588951571; Mon, 01 Mar 2021 00:55:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614588951; cv=none; d=google.com; s=arc-20160816; b=SZs7TaD4zbViL+LvvYGl/l8XpId8SBdyJm6onIlaLFTzzIeoGqtv23JHwzixt2ImFu GEVCcDoI9h8LTUJaur6rztgHfbG0aA5fhgpVL81tnXf6bkxY/wZ9pCgmR6z965Y2TFb4 NuWWv5LXX1PNkH/koW+NmzCBLSeh+6B2LL3iVlUMhNrPrrg9Qt3z4+XvWghsDrPpzV76 QxnWwufMvin0hSLR9l8cgjk2/mA33YqiO9tX6iM4WE344KJhXIKyaM2rmflc+/ewZWKh lngtlFIdAtL7f4f0wVk32Uk+r2TllJdvVZVeYUJXpy03yhmlZY90dTp0/GNbkVh51IP9 NKjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=Cp5RCTIsznWoWsNmzfAchzNJIUbX9vX8jH5Qk2Qy0zE=; b=F7SKJDs5Qet5bnudfFXl/klOyCpRv0+N7GH0VWUmkkAykMe8AoKxwJ2b25CQEWNeif sDAVWSQhLKQpHLIXWXhppzwnqg/ta46pB+lE3EDALZt9v9nLWKOY3n0+GvC1mgW9+Pxv gBAZakO4cyf7OzA3xdfQT9Ia4oKA7DDOJ1SmXbf5lhmriLuakqtCh4JxyM3HhtYAsPam lhiZJn36PjJiii69Byoos2b7hmbDhhUHyIawg/h3dP0nuNtE8pnQTEX1zQKgRGtDELES cYNBLxR7MzG8awjCkUCv0XOj1aVE8i3WnY2uLoRngao0DiXKdHjCA4Zo91eRofJsLY0Q e+vQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x1si16957137ybm.104.2021.03.01.00.55.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Mar 2021 00:55:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:47464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGeLG-0004mt-Vz for patch@linaro.org; Mon, 01 Mar 2021 03:55:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGeKR-0004ly-MY for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:54:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:56432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGeKO-0000Ce-6c for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:54:59 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 11D19AF99; Mon, 1 Mar 2021 08:54:54 +0000 (UTC) From: Claudio Fontana To: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v26 02/20] target/i386: Split out do_fsave, do_frstor, do_fxsave, do_fxrstor Date: Mon, 1 Mar 2021 09:54:32 +0100 Message-Id: <20210301085450.1732-3-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210301085450.1732-1-cfontana@suse.de> References: <20210301085450.1732-1-cfontana@suse.de> MIME-Version: 1.0 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Roman Bolshakov , Claudio Fontana Errors-To: qemu-devel-bounces+patch=linaro.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é Reviewed-by: Claudio Fontana Tested-by: Claudio Fontana --- target/i386/tcg/fpu_helper.c | 66 +++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 24 deletions(-) -- 2.26.2 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 ptr, int data32) do_fldenv(env, ptr, data32, GETPC()); } -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; - do_fstenv(env, ptr, data32, GETPC()); + do_fstenv(env, ptr, data32, retaddr); ptr += (14 << data32); for (i = 0; i < 8; i++) { tmp = ST(i); - do_fstt(env, tmp, ptr, GETPC()); + do_fstt(env, tmp, ptr, retaddr); ptr += 10; } @@ -2485,30 +2486,41 @@ void helper_fsave(CPUX86State *env, target_ulong ptr, int data32) env->fptags[7] = 1; } +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 += (14 << data32); + + for (i = 0; i < 8; i++) { + tmp = do_fldt(env, ptr, retaddr); + ST(i) = tmp; + ptr += 10; + } +} + void helper_frstor(CPUX86State *env, target_ulong ptr, int data32) { - floatx80 tmp; - int i; - - do_fldenv(env, ptr, data32, GETPC()); - ptr += (14 << data32); - - for (i = 0; i < 8; i++) { - tmp = do_fldt(env, ptr, GETPC()); - ST(i) = tmp; - ptr += 10; - } + 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); } void cpu_x86_frstor(CPUX86State *env, target_ulong ptr, int data32) { - helper_frstor(env, ptr, data32); + do_frstor(env, ptr, data32, 0); } #endif @@ -2593,10 +2605,8 @@ static void do_xsave_pkru(CPUX86State *env, target_ulong ptr, uintptr_t ra) cpu_stq_data_ra(env, ptr, env->pkru, ra); } -void helper_fxsave(CPUX86State *env, target_ulong ptr) +static void do_fxsave(CPUX86State *env, target_ulong ptr, uintptr_t ra) { - uintptr_t ra = 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 ptr) } } +void helper_fxsave(CPUX86State *env, target_ulong ptr) +{ + do_fxsave(env, ptr, GETPC()); +} + static uint64_t get_xinuse(CPUX86State *env) { uint64_t inuse = -1; @@ -2757,10 +2772,8 @@ static void do_xrstor_pkru(CPUX86State *env, target_ulong ptr, uintptr_t ra) env->pkru = cpu_ldq_data_ra(env, ptr, ra); } -void helper_fxrstor(CPUX86State *env, target_ulong ptr) +static void do_fxrstor(CPUX86State *env, target_ulong ptr, uintptr_t ra) { - uintptr_t ra = 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) } } +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); } void cpu_x86_fxrstor(CPUX86State *env, target_ulong ptr) { - helper_fxrstor(env, ptr); + do_fxrstor(env, ptr, 0); } #endif