commit 7c58044c0ab79f11604f71aa04b4691baacef886
author j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Oct 27 17:54:30 2007 +0000
committer j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Oct 27 17:54:30 2007 +0000
tree b8a4f5b7e4ab2ada25ced61c0bd05a5d6a49e3f2
parent a32ff1ad95c4f09420c4b5e19dfd86ded0d2bc79

Fix PowerPC FPSCR update and floating-point exception generation
 in most useful cases.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3458 c046a42c-6fe2-441c-8c8c-71466251a162

darwin-user/main.c

diff --git a/darwin-user/main.c b/darwin-user/main.c
index d0de491..70328ec 100644
--- a/darwin-user/main.c
+++ b/darwin-user/main.c
@@ -224,11 +224,6 @@
             case POWERPC_EXCP_FP:
                 EXCP_DUMP(env, "Floating point program exception\n");
                 /* Set FX */
-                env->fpscr[7] |= 0x8;
-                /* Finally, update FEX */
-                if ((((env->fpscr[7] & 0x3) << 3) | (env->fpscr[6] >> 1)) &
-                    ((env->fpscr[1] << 1) | (env->fpscr[0] >> 3)))
-                    env->fpscr[7] |= 0x4;
                 info.si_signo = SIGFPE;
                 info.si_errno = 0;
                 switch (env->error_code & 0xF) {
@@ -248,7 +243,7 @@
                 case POWERPC_EXCP_FP_VXSOFT:
                     info.si_code = FPE_FLTINV;
                     break;
-                case POWERPC_EXCP_FP_VXNAN:
+                case POWERPC_EXCP_FP_VXSNAN:
                 case POWERPC_EXCP_FP_VXISI:
                 case POWERPC_EXCP_FP_VXIDI:
                 case POWERPC_EXCP_FP_VXIMZ: