From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50863)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Maciej_Rozycki@mentor.com>) 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 <Maciej_Rozycki@mentor.com>) 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 <Maciej_Rozycki@mentor.com>) id 1Xm2cw-0005HY-9m
	for qemu-devel@nongnu.org; Wed, 05 Nov 2014 10:36:06 -0500
Date: Wed, 5 Nov 2014 15:35:59 +0000
From: "Maciej W. Rozycki" <macro@codesourcery.com>
Message-ID: <alpine.DEB.1.10.1411051431330.2881@tp.orcam.me.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Subject: [Qemu-devel] [PATCH] mips: Make `helper_float_cvtw_s' consistent
 with the remaining helpers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Leon Alrae <leon.alrae@imgtec.com>, Aurelien Jarno <aurelien@aurel32.net>

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 <macro@codesourcery.com>
---
 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;
 }