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
/
fmadds.c
diff --git
a/arch/powerpc/math-emu/fmadds.c
b/arch/powerpc/math-emu/fmadds.c
index
aea80ef
..
794fb31
100644
(file)
--- a/
arch/powerpc/math-emu/fmadds.c
+++ b/
arch/powerpc/math-emu/fmadds.c
@@
-16,7
+16,6
@@
fmadds(void *frD, void *frA, void *frB, void *frC)
FP_DECL_D(C);
FP_DECL_D(T);
FP_DECL_EX;
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);
#ifdef DEBUG
printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
@@
-34,12
+33,12
@@
fmadds(void *frD, void *frA, void *frB, void *frC)
if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
(A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
(A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-
ret |= EFLAG_VXIMZ
;
+
FP_SET_EXCEPTION(EFLAG_VXIMZ)
;
FP_MUL_D(T, A, C);
if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
FP_MUL_D(T, A, C);
if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-
ret |= EFLAG_VXISI
;
+
FP_SET_EXCEPTION(EFLAG_VXISI)
;
FP_ADD_D(R, T, B);
FP_ADD_D(R, T, B);