Commit 2e8ecdc0 authored by David S. Miller's avatar David S. Miller

sparc64: Fix masking and shifting in VIS fpcmp emulation.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a52312b8
...@@ -713,17 +713,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) ...@@ -713,17 +713,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)
s16 b = (rs2 >> (i * 16)) & 0xffff; s16 b = (rs2 >> (i * 16)) & 0xffff;
if (a > b) if (a > b)
rd_val |= 1 << i; rd_val |= 8 >> i;
} }
break; break;
case FCMPGT32_OPF: case FCMPGT32_OPF:
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
s32 a = (rs1 >> (i * 32)) & 0xffff; s32 a = (rs1 >> (i * 32)) & 0xffffffff;
s32 b = (rs2 >> (i * 32)) & 0xffff; s32 b = (rs2 >> (i * 32)) & 0xffffffff;
if (a > b) if (a > b)
rd_val |= 1 << i; rd_val |= 2 >> i;
} }
break; break;
...@@ -733,17 +733,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) ...@@ -733,17 +733,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)
s16 b = (rs2 >> (i * 16)) & 0xffff; s16 b = (rs2 >> (i * 16)) & 0xffff;
if (a <= b) if (a <= b)
rd_val |= 1 << i; rd_val |= 8 >> i;
} }
break; break;
case FCMPLE32_OPF: case FCMPLE32_OPF:
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
s32 a = (rs1 >> (i * 32)) & 0xffff; s32 a = (rs1 >> (i * 32)) & 0xffffffff;
s32 b = (rs2 >> (i * 32)) & 0xffff; s32 b = (rs2 >> (i * 32)) & 0xffffffff;
if (a <= b) if (a <= b)
rd_val |= 1 << i; rd_val |= 2 >> i;
} }
break; break;
...@@ -753,17 +753,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) ...@@ -753,17 +753,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)
s16 b = (rs2 >> (i * 16)) & 0xffff; s16 b = (rs2 >> (i * 16)) & 0xffff;
if (a != b) if (a != b)
rd_val |= 1 << i; rd_val |= 8 >> i;
} }
break; break;
case FCMPNE32_OPF: case FCMPNE32_OPF:
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
s32 a = (rs1 >> (i * 32)) & 0xffff; s32 a = (rs1 >> (i * 32)) & 0xffffffff;
s32 b = (rs2 >> (i * 32)) & 0xffff; s32 b = (rs2 >> (i * 32)) & 0xffffffff;
if (a != b) if (a != b)
rd_val |= 1 << i; rd_val |= 2 >> i;
} }
break; break;
...@@ -773,17 +773,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) ...@@ -773,17 +773,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)
s16 b = (rs2 >> (i * 16)) & 0xffff; s16 b = (rs2 >> (i * 16)) & 0xffff;
if (a == b) if (a == b)
rd_val |= 1 << i; rd_val |= 8 >> i;
} }
break; break;
case FCMPEQ32_OPF: case FCMPEQ32_OPF:
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
s32 a = (rs1 >> (i * 32)) & 0xffff; s32 a = (rs1 >> (i * 32)) & 0xffffffff;
s32 b = (rs2 >> (i * 32)) & 0xffff; s32 b = (rs2 >> (i * 32)) & 0xffffffff;
if (a == b) if (a == b)
rd_val |= 1 << i; rd_val |= 2 >> i;
} }
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment