Patchwork Fix SPE float to integer conversion failure

login
register
mail settings
Submitter Shan Hai
Date Nov. 17, 2010, 2:28 a.m.
Message ID <1289960933-5172-2-git-send-email-shan.hai@windriver.com>
Download mbox | patch
Permalink /patch/71509/
State Accepted
Delegated to: Kumar Gala
Headers show

Comments

Shan Hai - Nov. 17, 2010, 2:28 a.m.
Conversion from float to integer should based on both the instruction
encoding and the sign of the operand.

Signed-off-by: Shan Hai <shan.hai@windriver.com>
---
 arch/powerpc/math-emu/math_efp.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
Kumar Gala - March 15, 2011, 3:51 p.m.
On Nov 16, 2010, at 8:28 PM, Shan Hai wrote:

> Conversion from float to integer should based on both the instruction
> encoding and the sign of the operand.
> 
> Signed-off-by: Shan Hai <shan.hai@windriver.com>
> ---
> arch/powerpc/math-emu/math_efp.c |   12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)

applied

- k

Patch

diff --git a/arch/powerpc/math-emu/math_efp.c b/arch/powerpc/math-emu/math_efp.c
index 41f4ef3..64faf10 100644
--- a/arch/powerpc/math-emu/math_efp.c
+++ b/arch/powerpc/math-emu/math_efp.c
@@ -320,7 +320,8 @@  int do_spe_mathemu(struct pt_regs *regs)
 			} else {
 				_FP_ROUND_ZERO(1, SB);
 			}
-			FP_TO_INT_S(vc.wp[1], SB, 32, ((func & 0x3) != 0));
+			FP_TO_INT_S(vc.wp[1], SB, 32,
+					(((func & 0x3) != 0) || SB_s));
 			goto update_regs;
 
 		default:
@@ -458,7 +459,8 @@  cmp_s:
 			} else {
 				_FP_ROUND_ZERO(2, DB);
 			}
-			FP_TO_INT_D(vc.wp[1], DB, 32, ((func & 0x3) != 0));
+			FP_TO_INT_D(vc.wp[1], DB, 32,
+					(((func & 0x3) != 0) || DB_s));
 			goto update_regs;
 
 		default:
@@ -589,8 +591,10 @@  cmp_d:
 				_FP_ROUND_ZERO(1, SB0);
 				_FP_ROUND_ZERO(1, SB1);
 			}
-			FP_TO_INT_S(vc.wp[0], SB0, 32, ((func & 0x3) != 0));
-			FP_TO_INT_S(vc.wp[1], SB1, 32, ((func & 0x3) != 0));
+			FP_TO_INT_S(vc.wp[0], SB0, 32,
+					(((func & 0x3) != 0) || SB0_s));
+			FP_TO_INT_S(vc.wp[1], SB1, 32,
+					(((func & 0x3) != 0) || SB1_s));
 			goto update_regs;
 
 		default: