git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
powerpc
/
math-emu
/
fdiv.c
diff --git
a/arch/powerpc/math-emu/fdiv.c
b/arch/powerpc/math-emu/fdiv.c
index
18a20fe
..
a29239c
100644
(file)
--- a/
arch/powerpc/math-emu/fdiv.c
+++ b/
arch/powerpc/math-emu/fdiv.c
@@
-2,8
+2,9
@@
#include <linux/errno.h>
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <asm/uaccess.h>
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
int
fdiv(void *frD, void *frA, void *frB)
int
fdiv(void *frD, void *frA, void *frB)
@@
-11,14
+12,14
@@
fdiv(void *frD, void *frA, void *frB)
FP_DECL_D(A);
FP_DECL_D(B);
FP_DECL_D(R);
FP_DECL_D(A);
FP_DECL_D(B);
FP_DECL_D(R);
-
int ret = 0
;
+
FP_DECL_EX
;
#ifdef DEBUG
printk("%s: %p %p %p\n", __func__, frD, frA, frB);
#endif
#ifdef DEBUG
printk("%s: %p %p %p\n", __func__, frD, frA, frB);
#endif
-
__FP_UNPACK_D
(A, frA);
-
__FP_UNPACK_D
(B, frB);
+
FP_UNPACK_DP
(A, frA);
+
FP_UNPACK_DP
(B, frB);
#ifdef DEBUG
printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
#ifdef DEBUG
printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@
-26,22
+27,22
@@
fdiv(void *frD, void *frA, void *frB)
#endif
if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
#endif
if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-
ret |= EFLAG_VXZDZ
;
+
FP_SET_EXCEPTION(EFLAG_VXZDZ)
;
#ifdef DEBUG
printk("%s: FPSCR_VXZDZ raised\n", __func__);
#endif
}
if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
#ifdef DEBUG
printk("%s: FPSCR_VXZDZ raised\n", __func__);
#endif
}
if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-
ret |= EFLAG_VXIDI
;
+
FP_SET_EXCEPTION(EFLAG_VXIDI)
;
#ifdef DEBUG
printk("%s: FPSCR_VXIDI raised\n", __func__);
#endif
}
if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
#ifdef DEBUG
printk("%s: FPSCR_VXIDI raised\n", __func__);
#endif
}
if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-
ret |= EFLAG_DIVZERO
;
+
FP_SET_EXCEPTION(EFLAG_DIVZERO)
;
if (__FPU_TRAP_P(EFLAG_DIVZERO))
if (__FPU_TRAP_P(EFLAG_DIVZERO))
- return
ret
;
+ return
FP_CUR_EXCEPTIONS
;
}
FP_DIV_D(R, A, B);
}
FP_DIV_D(R, A, B);
@@
-49,5
+50,7
@@
fdiv(void *frD, void *frA, void *frB)
printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
#endif
printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
#endif
- return (ret | __FP_PACK_D(frD, R));
+ __FP_PACK_D(frD, R);
+
+ return FP_CUR_EXCEPTIONS;
}
}