From patchwork Wed Nov 5 15:35:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 407042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2833014003E for ; Thu, 6 Nov 2014 02:36:53 +1100 (AEDT) Received: from localhost ([::1]:47057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm2df-00034O-9q for incoming@patchwork.ozlabs.org; Wed, 05 Nov 2014 10:36:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm2d3-00024c-Lm for qemu-devel@nongnu.org; Wed, 05 Nov 2014 10:36:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xm2cw-0005Hd-Ee for qemu-devel@nongnu.org; Wed, 05 Nov 2014 10:36:13 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:37143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm2cw-0005HY-9m for qemu-devel@nongnu.org; Wed, 05 Nov 2014 10:36:06 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Xm2cv-0004nr-KE from Maciej_Rozycki@mentor.com ; Wed, 05 Nov 2014 07:36:05 -0800 Received: from localhost (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 5 Nov 2014 15:36:04 +0000 Date: Wed, 5 Nov 2014 15:35:59 +0000 From: "Maciej W. Rozycki" To: Message-ID: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Cc: Leon Alrae , Aurelien Jarno Subject: [Qemu-devel] [PATCH] mips: Make `helper_float_cvtw_s' consistent with the remaining helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move the call to `update_fcr31' in `helper_float_cvtw_s' after the exception flag check, for consistency with the remaining helpers that do it last too. Signed-off-by: Maciej W. Rozycki --- I hope there's no question about this, please apply. Maciej qemu-mips-op-helper-cvtw_s-fcr31.diff Index: qemu-git-trunk/target-mips/op_helper.c =================================================================== --- qemu-git-trunk.orig/target-mips/op_helper.c 2014-11-02 19:23:41.548963320 +0000 +++ qemu-git-trunk/target-mips/op_helper.c 2014-11-02 19:23:55.548607403 +0000 @@ -2532,11 +2532,11 @@ uint32_t helper_float_cvtw_s(CPUMIPSStat uint32_t wt2; wt2 = float32_to_int32(fst0, &env->active_fpu.fp_status); - update_fcr31(env, GETPC()); if (get_float_exception_flags(&env->active_fpu.fp_status) & (float_flag_invalid | float_flag_overflow)) { wt2 = FP_TO_INT32_OVERFLOW; } + update_fcr31(env, GETPC()); return wt2; }