From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LCH14-0004kb-8r
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:13:58 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LCH13-0004k7-LQ
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:13:57 -0500
Received: from [199.232.76.173] (port=38778 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LCH13-0004k2-Db
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:13:57 -0500
Received: from savannah.gnu.org ([199.232.41.3]:48403 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LCH13-0004gP-8w
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:13:57 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LCH12-0002pD-KH
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:13:56 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LCH12-0002p9-8Z
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:13:56 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LCH12-0002p9-8Z@cvs.savannah.gnu.org>
Date: Mon, 15 Dec 2008 17:13:56 +0000
Subject: [Qemu-devel] [6047] target-ppc: fix fload_invalid_op_excp()
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6047
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6047
Author:   aurel32
Date:     2008-12-15 17:13:55 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
target-ppc: fix fload_invalid_op_excp()

The argument is a value, not a flag. Update the tests accordingly. Also
set a correct default value for NaN.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/target-ppc/op_helper.c

Modified: trunk/target-ppc/op_helper.c
===================================================================
--- trunk/target-ppc/op_helper.c	2008-12-15 17:13:48 UTC (rev 6046)
+++ trunk/target-ppc/op_helper.c	2008-12-15 17:13:55 UTC (rev 6047)
@@ -671,15 +671,13 @@
     int ve;
 
     ve = fpscr_ve;
-    if (op & POWERPC_EXCP_FP_VXSNAN) {
-        /* Operation on signaling NaN */
+    switch (op) {
+    case POWERPC_EXCP_FP_VXSNAN:
         env->fpscr |= 1 << FPSCR_VXSNAN;
-    }
-    if (op & POWERPC_EXCP_FP_VXSOFT) {
-        /* Software-defined condition */
+	break;
+    case POWERPC_EXCP_FP_VXSOFT:
         env->fpscr |= 1 << FPSCR_VXSOFT;
-    }
-    switch (op & ~(POWERPC_EXCP_FP_VXSOFT | POWERPC_EXCP_FP_VXSNAN)) {
+	break;
     case POWERPC_EXCP_FP_VXISI:
         /* Magnitude subtraction of infinities */
         env->fpscr |= 1 << FPSCR_VXISI;
@@ -718,7 +716,7 @@
         env->fpscr &= ~((1 << FPSCR_FR) | (1 << FPSCR_FI));
         if (ve == 0) {
             /* Set the result to quiet NaN */
-            ret = UINT64_MAX;
+            ret = 0xFFF8000000000000ULL;
             env->fpscr &= ~(0xF << FPSCR_FPCC);
             env->fpscr |= 0x11 << FPSCR_FPCC;
         }
@@ -729,7 +727,7 @@
         env->fpscr &= ~((1 << FPSCR_FR) | (1 << FPSCR_FI));
         if (ve == 0) {
             /* Set the result to quiet NaN */
-            ret = UINT64_MAX;
+            ret = 0xFFF8000000000000ULL;
             env->fpscr &= ~(0xF << FPSCR_FPCC);
             env->fpscr |= 0x11 << FPSCR_FPCC;
         }