From patchwork Tue Jan 11 19:52:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 531146 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3787587imp; Tue, 11 Jan 2022 12:04:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbwvYGUE9epwi1Xp9EuAfig87/W3Gqij4TpNJk0rzjq42XqztrWE1EwWRu9L6ccctB/+7h X-Received: by 2002:a5d:9681:: with SMTP id m1mr3136819ion.53.1641931460637; Tue, 11 Jan 2022 12:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641931460; cv=none; d=google.com; s=arc-20160816; b=k6U6a+cFPU3i/oOzWJavF56EWLnU9Eo9oeeDPyR0oBMemGmEc8RUUSs2QJaUZmuQZf 7Ire3U5Y+QSLBNSgr+nq+tmwEcv2BwuoSWY9o4YO3bhAoWdtTOPqYnWBE/LuNcBx3c5I mZXyTx2bGyyE1fpx+U9KtDW8CujRa7GTWV41HfqwtQMWKCxzIHCFVqcFpuTPwF8JlKpp BaLsDoXrwiK7GnDO/Ky+yxlAWWfD8h020eu8LwJ26iZ8299VPR8/4sHhId2S0HjVqbkD IYRIXizRidxqbTy6n3ULLJ7B7TihXb+U2/0U3ybc2+MoPeFiiuZC4PXvL8goC1PB3ui6 wC9g== 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=aXRmK/TKkZseAreGbFK6D2VVQBiZf0tA8zDhJIP+P5U=; b=ZeBURvGrx67XRDGEf2Rv5ejZb345UjLTU+tb4UzyI0gfq99k00DbHnv5q9iYArp4bE EwfiUhCIQ3JL6Q8199SaHnpJEJzLcthk5JkRZXvrUrqdqkHXrBB4d7GTdxs5b2ukfpe/ 0Oko3HF1LJAwTUD0y4TdYeAha/Nz6OyjxWPLvhV7paFP6qXTFKN1NqqPmne3Ax8rDlSF JUDL3hGXyljjw+FP+cc1OiVSr39C1Z5pErXUv0Zr5fc8eauM7ngWw5b8bWTC/piN9GVz Z/vT3StVuT5qdepY5QpmjBq63SA9DTwYvefEC+t/aVjUYTwYOHMKaXchpN34O0cTDh8W 8WNg== 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 j18si3689943iow.83.2022.01.11.12.04.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 12:04:20 -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]:44234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7NNU-0001XM-4Y for patch@linaro.org; Tue, 11 Jan 2022 15:04:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCU-0007pD-AP for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:52:59 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:51337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCS-0008Fd-JE for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:52:58 -0500 Received: from quad ([82.142.23.158]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MtOX2-1mDdW41yes-00usjL; Tue, 11 Jan 2022 20:52:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 13/30] linux-user/microblaze: Fix SIGFPE si_codes Date: Tue, 11 Jan 2022 20:52:30 +0100 Message-Id: <20220111195247.1737641-14-laurent@vivier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220111195247.1737641-1-laurent@vivier.eu> References: <20220111195247.1737641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:aGpXwnUqRvLP5gupcRgBj1eE94Ekx9mEuy9zl3e9R+2JYTcxSDp BWsdezaV0+HZPy0ON6h5ZEB0/5HLqUAiiELg3FR4zK2RXCGFi5P65BhiNo2w4UhglGLHZCx 5WoPPW089yPj502KnpdkTTDSY6C4zttSiYXCjyHMoghGW51/uqKhPFhOQ6HuaFS6g0svGVf mTZ7MEg8FBnCfHcFD9HAw== X-UI-Out-Filterresults: notjunk:1;V03:K0:EdHWT6PYSCo=:Bsnr/ZRmVDDwfTSGQ04otB n52hEhvGfi2cicQY3lMJr1+CygPSRRQ2fEQfdrkMfAKv/wVXSBRECCkTgBUg/D/4iBb9t3cK8 mfgtD3GC7oyXJynKKB34EA8rZ2/tn2D1r19xF6k41MWZWZl4nrv04N4TMSgxxdINYjIpRL/2R Y+iXyz9DUVSyqm3vGuTxbcSn3X7eMMxd2rtxB4E9jQ7n8S3a0SzhmnyUMJ5D1RYrddaHDHOI4 zajUDbNodzRIbMQiec/uz9hv68gTviogb4O/TzYEz5LKfTTlAXqqi6R0yB5fQlEyQaSzraCUz prAmHiysL9+j3vJW8pXThhd/i1PFrBatmj5coXYhJ/mpOtAc1Cdbg1rUnxqmpKjp+V0QFOOig GkbZynzUyhK5x3VoQmqUlaA9mKnETKXiSx0NN+IJ1REhMBt1m2txpvaJYeNz47SFVXXvNAiA+ Glb8tZRhJWSmFMAa2Fm+EwbFznsr3MIkQyX3b07LPmbA0nPrSFTbjzXZzVHhdxmgmo1kXTEYu JcVHqhX/MODvRApHvnK/wjcuHH/DwKfF+1g53f5llUN7beBRZRj3xWOKrtwfK0xg63jDOyVKs Nhy6gcpSiStFi91SwsDvEu9U47F/PYEhb9FExnbQApl/MoVh6yef1jzjkeDn7+Q7O2pL8aFZP XBgUyC+XeFpFuAT56H0TGPs8TZJ/nJXYWYoI+jN/qk9kGOYfqPJUK6HSprhqNhnkmVFI= Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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 , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Fix a typo for ESR_EC_DIVZERO, which is integral not floating-point. Fix the if ladder for decoding floating-point exceptions. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-Id: <20220107213243.212806-14-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/microblaze/cpu_loop.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c index 08620d4e6899..1a2556be2c5f 100644 --- a/linux-user/microblaze/cpu_loop.c +++ b/linux-user/microblaze/cpu_loop.c @@ -77,15 +77,25 @@ void cpu_loop(CPUMBState *env) env->iflags &= ~(IMM_FLAG | D_FLAG); switch (env->esr & 31) { case ESR_EC_DIVZERO: - si_code = TARGET_FPE_FLTDIV; + si_code = TARGET_FPE_INTDIV; break; case ESR_EC_FPU: - si_code = 0; - if (env->fsr & FSR_IO) { + /* + * Note that the kernel passes along fsr as si_code + * if there's no recognized bit set. Possibly this + * implies that si_code is 0, but follow the structure. + */ + si_code = env->fsr; + if (si_code & FSR_IO) { si_code = TARGET_FPE_FLTINV; - } - if (env->fsr & FSR_DZ) { + } else if (si_code & FSR_OF) { + si_code = TARGET_FPE_FLTOVF; + } else if (si_code & FSR_UF) { + si_code = TARGET_FPE_FLTUND; + } else if (si_code & FSR_DZ) { si_code = TARGET_FPE_FLTDIV; + } else if (si_code & FSR_DO) { + si_code = TARGET_FPE_FLTRES; } break; default: