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
2db1509
..
a29239c
100644
(file)
--- a/
arch/powerpc/math-emu/fdiv.c
+++ b/
arch/powerpc/math-emu/fdiv.c
@@
-13,7
+13,6
@@
fdiv(void *frD, void *frA, void *frB)
FP_DECL_D(B);
FP_DECL_D(R);
FP_DECL_EX;
FP_DECL_D(B);
FP_DECL_D(R);
FP_DECL_EX;
- int ret = 0;
#ifdef DEBUG
printk("%s: %p %p %p\n", __func__, frD, frA, frB);
#ifdef DEBUG
printk("%s: %p %p %p\n", __func__, frD, frA, frB);
@@
-28,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);