powerpc/math-emu: Use kernel generic math-emu code

The math emulation code is centered around a set of generic macros that
provide the core of the emulation that are shared by the various
architectures and other projects (like glibc).  Each arch implements its
own sfp-machine.h to specific various arch specific details.

For historic reasons that are now lost the powerpc math-emu code had
its own version of the common headers.  This moves us to using the
kernel generic version and thus getting fixes when those are updated.

Also cleaned up exception/error reporting from the FP emulation functions.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 11 insertions, 7 deletions

diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c
index f1c4f0f0d807..ee9d71e0b376 100644
--- a/arch/powerpc/math-emu/fnmadds.c
+++ b/arch/powerpc/math-emu/fnmadds.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fnmadds(void *frD, void *frA, void *frB, void *frC)
@@ -14,15 +15,16 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -48,5 +50,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }