Skip to content

L
linux
Commit 3f7cac41 authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

MIPS: math-emu: Cleanup coding style. 

 o Only define variables in the outermost block
 o One empty line at most
 o Format comments as per CodingStyle
 o Update FSF address in licensing term comment
 o Spell FPU and MIPS in all capitals.
 o Remove ####-type of lines in comments.
 o Try to make things a bit most consistent between sp_*.c / dp_*.c files.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 49548b09
Hide whitespace changes
Inline Side-by-side
Showing with 497 additions and 641 deletions
arch/mips/math-emu/cp1emu.c
View file @ 3f7cac41
/* /*
* cp1emu.c: a MIPS coprocessor 1 (fpu) instruction emulator * cp1emu.c: a MIPS coprocessor 1 (FPU) instruction emulator
* *
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
...@@ -18,19 +18,19 @@ ...@@ -18,19 +18,19 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* A complete emulator for MIPS coprocessor 1 instructions. This is * A complete emulator for MIPS coprocessor 1 instructions. This is
* required for #float(switch) or #float(trap), where it catches all * required for #float(switch) or #float(trap), where it catches all
* COP1 instructions via the "CoProcessor Unusable" exception. * COP1 instructions via the "CoProcessor Unusable" exception.
* *
* More surprisingly it is also required for #float(ieee), to help out * More surprisingly it is also required for #float(ieee), to help out
* the hardware fpu at the boundaries of the IEEE-754 representation * the hardware FPU at the boundaries of the IEEE-754 representation
* (denormalised values, infinities, underflow, etc). It is made * (denormalised values, infinities, underflow, etc). It is made
* quite nasty because emulation of some non-COP1 instructions is * quite nasty because emulation of some non-COP1 instructions is
* required, e.g. in branch delay slots. * required, e.g. in branch delay slots.
* *
* Note if you know that you won't have an fpu, then you'll get much * Note if you know that you won't have an FPU, then you'll get much
* better performance by compiling with -msoft-float! * better performance by compiling with -msoft-float!
*/ */
#include <linux/sched.h> #include <linux/sched.h>
...@@ -72,14 +72,14 @@ static int fpux_emu(struct pt_regs *, ...@@ -72,14 +72,14 @@ static int fpux_emu(struct pt_regs *,
#define MM_POOL32A_MINOR_SHIFT 0x6 #define MM_POOL32A_MINOR_SHIFT 0x6
#define MM_MIPS32_COND_FC 0x30 #define MM_MIPS32_COND_FC 0x30
/* Convert Mips rounding mode (0..3) to IEEE library modes. */ /* Convert MIPS rounding mode (0..3) to IEEE library modes. */
static const unsigned char ieee_rm[4] = { static const unsigned char ieee_rm[4] = {
[FPU_CSR_RN] = IEEE754_RN, [FPU_CSR_RN] = IEEE754_RN,
[FPU_CSR_RZ] = IEEE754_RZ, [FPU_CSR_RZ] = IEEE754_RZ,
[FPU_CSR_RU] = IEEE754_RU, [FPU_CSR_RU] = IEEE754_RU,
[FPU_CSR_RD] = IEEE754_RD, [FPU_CSR_RD] = IEEE754_RD,
}; };
/* Convert IEEE library modes to Mips rounding mode (0..3). */ /* Convert IEEE library modes to MIPS rounding mode (0..3). */
static const unsigned char mips_rm[4] = { static const unsigned char mips_rm[4] = {
[IEEE754_RN] = FPU_CSR_RN, [IEEE754_RN] = FPU_CSR_RN,
[IEEE754_RZ] = FPU_CSR_RZ, [IEEE754_RZ] = FPU_CSR_RZ,
...@@ -914,10 +914,16 @@ do { \ ...@@ -914,10 +914,16 @@ do { \
static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
struct mm_decoded_insn dec_insn, void *__user *fault_addr) struct mm_decoded_insn dec_insn, void *__user *fault_addr)
{ {
mips_instruction ir;
unsigned long contpc = xcp->cp0_epc + dec_insn.pc_inc; unsigned long contpc = xcp->cp0_epc + dec_insn.pc_inc;
unsigned int cond; unsigned int cond, cbit;
int pc_inc; mips_instruction ir;
int likely, pc_inc;
u32 __user *wva;
u64 __user *dva;
u32 value;
u32 wval;
u64 dval;
int sig;
/* XXX NEC Vr54xx bug workaround */ /* XXX NEC Vr54xx bug workaround */
if (delay_slot(xcp)) { if (delay_slot(xcp)) {
...@@ -972,94 +978,81 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -972,94 +978,81 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return SIGILL; return SIGILL;
} }
emul: emul:
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, xcp, 0); perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, xcp, 0);
MIPS_FPU_EMU_INC_STATS(emulated); MIPS_FPU_EMU_INC_STATS(emulated);
switch (MIPSInst_OPCODE(ir)) { switch (MIPSInst_OPCODE(ir)) {
case ldc1_op:{ case ldc1_op:
u64 __user *va = (u64 __user *) (xcp->regs[MIPSInst_RS(ir)] + dva = (u64 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir)); MIPSInst_SIMM(ir));
u64 val;
MIPS_FPU_EMU_INC_STATS(loads); MIPS_FPU_EMU_INC_STATS(loads);
if (!access_ok(VERIFY_READ, va, sizeof(u64))) { if (!access_ok(VERIFY_READ, dva, sizeof(u64))) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = dva;
return SIGBUS; return SIGBUS;
} }
if (__get_user(val, va)) { if (__get_user(dval, dva)) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = dva;
return SIGSEGV; return SIGSEGV;
} }
DITOREG(val, MIPSInst_RT(ir)); DITOREG(dval, MIPSInst_RT(ir));
break; break;
}
case sdc1_op:{
u64 __user *va = (u64 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
u64 val;
case sdc1_op:
dva = (u64 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
MIPS_FPU_EMU_INC_STATS(stores); MIPS_FPU_EMU_INC_STATS(stores);
DIFROMREG(val, MIPSInst_RT(ir)); DIFROMREG(dval, MIPSInst_RT(ir));
if (!access_ok(VERIFY_WRITE, va, sizeof(u64))) { if (!access_ok(VERIFY_WRITE, dva, sizeof(u64))) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = dva;
return SIGBUS; return SIGBUS;
} }
if (__put_user(val, va)) { if (__put_user(dval, dva)) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = dva;
return SIGSEGV; return SIGSEGV;
} }
break; break;
}
case lwc1_op:{
u32 __user *va = (u32 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
u32 val;
case lwc1_op:
wva = (u32 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
MIPS_FPU_EMU_INC_STATS(loads); MIPS_FPU_EMU_INC_STATS(loads);
if (!access_ok(VERIFY_READ, va, sizeof(u32))) { if (!access_ok(VERIFY_READ, wva, sizeof(u32))) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = wva;
return SIGBUS; return SIGBUS;
} }
if (__get_user(val, va)) { if (__get_user(wval, wva)) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = wva;
return SIGSEGV; return SIGSEGV;
} }
SITOREG(val, MIPSInst_RT(ir)); SITOREG(wval, MIPSInst_RT(ir));
break; break;
}
case swc1_op:{
u32 __user *va = (u32 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
u32 val;
case swc1_op:
wva = (u32 __user *) (xcp->regs[MIPSInst_RS(ir)] +
MIPSInst_SIMM(ir));
MIPS_FPU_EMU_INC_STATS(stores); MIPS_FPU_EMU_INC_STATS(stores);
SIFROMREG(val, MIPSInst_RT(ir)); SIFROMREG(wval, MIPSInst_RT(ir));
if (!access_ok(VERIFY_WRITE, va, sizeof(u32))) { if (!access_ok(VERIFY_WRITE, wva, sizeof(u32))) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = wva;
return SIGBUS; return SIGBUS;
} }
if (__put_user(val, va)) { if (__put_user(wval, wva)) {
MIPS_FPU_EMU_INC_STATS(errors); MIPS_FPU_EMU_INC_STATS(errors);
*fault_addr = va; *fault_addr = wva;
return SIGSEGV; return SIGSEGV;
} }
break; break;
}
case cop1_op: case cop1_op:
switch (MIPSInst_RS(ir)) { switch (MIPSInst_RS(ir)) {
case dmfc_op: case dmfc_op:
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
...@@ -1111,10 +1104,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1111,10 +1104,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
SITOREG(xcp->regs[MIPSInst_RT(ir)], MIPSInst_RD(ir)); SITOREG(xcp->regs[MIPSInst_RT(ir)], MIPSInst_RD(ir));
break; break;
case cfc_op:{ case cfc_op:
/* cop control register rd -> gpr[rt] */ /* cop control register rd -> gpr[rt] */
u32 value;
if (MIPSInst_RD(ir) == FPCREG_CSR) { if (MIPSInst_RD(ir) == FPCREG_CSR) {
value = ctx->fcr31; value = ctx->fcr31;
value = (value & ~FPU_CSR_RM) | value = (value & ~FPU_CSR_RM) |
...@@ -1130,12 +1121,9 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1130,12 +1121,9 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
if (MIPSInst_RT(ir)) if (MIPSInst_RT(ir))
xcp->regs[MIPSInst_RT(ir)] = value; xcp->regs[MIPSInst_RT(ir)] = value;
break; break;
}
case ctc_op:{ case ctc_op:
/* copregister rd <- rt */ /* copregister rd <- rt */
u32 value;
if (MIPSInst_RT(ir) == 0) if (MIPSInst_RT(ir) == 0)
value = 0; value = 0;
else else
...@@ -1160,12 +1148,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1160,12 +1148,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return SIGFPE; return SIGFPE;
} }
break; break;
}
case bc_op:{
unsigned int cbit;
int likely = 0;
case bc_op:
if (delay_slot(xcp)) if (delay_slot(xcp))
return SIGILL; return SIGILL;
...@@ -1175,6 +1159,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1175,6 +1159,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
cbit = FPU_CSR_COND; cbit = FPU_CSR_COND;
cond = ctx->fcr31 & cbit; cond = ctx->fcr31 & cbit;
likely = 0;
switch (MIPSInst_RT(ir) & 3) { switch (MIPSInst_RT(ir) & 3) {
case bcfl_op: case bcfl_op:
likely = 1; likely = 1;
...@@ -1192,8 +1177,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1192,8 +1177,8 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
set_delay_slot(xcp); set_delay_slot(xcp);
if (cond) { if (cond) {
/* branch taken: emulate dslot /*
* instruction * Branch taken: emulate dslot instruction
*/ */
xcp->cp0_epc += dec_insn.pc_inc; xcp->cp0_epc += dec_insn.pc_inc;
...@@ -1228,8 +1213,10 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1228,8 +1213,10 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
switch (MIPSInst_OPCODE(ir)) { switch (MIPSInst_OPCODE(ir)) {
case lwc1_op: case lwc1_op:
goto emul; goto emul;
case swc1_op: case swc1_op:
goto emul; goto emul;
case ldc1_op: case ldc1_op:
case sdc1_op: case sdc1_op:
if (cpu_has_mips_2_3_4_5 || if (cpu_has_mips_2_3_4_5 ||
...@@ -1238,14 +1225,17 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1238,14 +1225,17 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return SIGILL; return SIGILL;
goto emul; goto emul;
case cop1_op: case cop1_op:
goto emul; goto emul;
case cop1x_op: case cop1x_op:
if (cpu_has_mips_4_5 || cpu_has_mips64) if (cpu_has_mips_4_5 || cpu_has_mips64)
/* its one of ours */ /* its one of ours */
goto emul; goto emul;
return SIGILL; return SIGILL;
case spec_op: case spec_op:
if (!cpu_has_mips_4_5_r) if (!cpu_has_mips_4_5_r)
return SIGILL; return SIGILL;
...@@ -1260,10 +1250,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1260,10 +1250,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
* instruction in the dslot * instruction in the dslot
*/ */
return mips_dsemul(xcp, ir, contpc); return mips_dsemul(xcp, ir, contpc);
} } else if (likely) { /* branch not taken */
else {
/* branch not taken */
if (likely) {
/* /*
* branch likely nullifies * branch likely nullifies
* dslot if not taken * dslot if not taken
...@@ -1275,26 +1262,19 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1275,26 +1262,19 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
* dslot as normal insn * dslot as normal insn
*/ */
} }
}
break; break;
}
default: default:
if (!(MIPSInst_RS(ir) & 0x10)) if (!(MIPSInst_RS(ir) & 0x10))
return SIGILL; return SIGILL;
{
int sig;
/* a real fpu computation instruction */ /* a real fpu computation instruction */
if ((sig = fpu_emu(xcp, ctx, ir))) if ((sig = fpu_emu(xcp, ctx, ir)))
return sig; return sig;
}
} }
break; break;
case cop1x_op:{ case cop1x_op:
int sig;
if (!cpu_has_mips_4_5 && !cpu_has_mips64) if (!cpu_has_mips_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
...@@ -1302,7 +1282,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1302,7 +1282,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
if (sig) if (sig)
return sig; return sig;
break; break;
}
case spec_op: case spec_op:
if (!cpu_has_mips_4_5_r) if (!cpu_has_mips_4_5_r)
...@@ -1477,7 +1456,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1477,7 +1456,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr; ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr;
if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) { if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
/*printk ("SIGFPE: fpu csr = %08x\n", /*printk ("SIGFPE: FPU csr = %08x\n",
ctx->fcr31); */ ctx->fcr31); */
return SIGFPE; return SIGFPE;
} }
...@@ -1584,6 +1563,8 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1584,6 +1563,8 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
{ {
int rfmt; /* resulting format */ int rfmt; /* resulting format */
unsigned rcsr = 0; /* resulting csr */ unsigned rcsr = 0; /* resulting csr */
unsigned int oldrm;
unsigned int cbit;
unsigned cond; unsigned cond;
union { union {
union ieee754dp d; union ieee754dp d;
...@@ -1591,14 +1572,16 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1591,14 +1572,16 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
int w; int w;
s64 l; s64 l;
} rv; /* resulting value */ } rv; /* resulting value */
u64 bits;
MIPS_FPU_EMU_INC_STATS(cp1ops); MIPS_FPU_EMU_INC_STATS(cp1ops);
switch (rfmt = (MIPSInst_FFMT(ir) & 0xf)) { switch (rfmt = (MIPSInst_FFMT(ir) & 0xf)) {
case s_fmt:{ /* 0 */ case s_fmt: { /* 0 */
union { union {
union ieee754sp(*b) (union ieee754sp, union ieee754sp); union ieee754sp(*b) (union ieee754sp, union ieee754sp);
union ieee754sp(*u) (union ieee754sp); union ieee754sp(*u) (union ieee754sp);
} handler; } handler;
union ieee754sp fs, ft;
switch (MIPSInst_FUNC(ir)) { switch (MIPSInst_FUNC(ir)) {
/* binary ops */ /* binary ops */
...@@ -1622,6 +1605,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1622,6 +1605,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
handler.u = ieee754sp_sqrt; handler.u = ieee754sp_sqrt;
goto scopuop; goto scopuop;
/* /*
* Note that on some MIPS IV implementations such as the * Note that on some MIPS IV implementations such as the
* R5000 and R8000 the FSQRT and FRECIP instructions do not * R5000 and R8000 the FSQRT and FRECIP instructions do not
...@@ -1633,6 +1617,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1633,6 +1617,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
handler.u = fpemu_sp_rsqrt; handler.u = fpemu_sp_rsqrt;
goto scopuop; goto scopuop;
case frecip_op: case frecip_op:
if (!cpu_has_mips_4_5_r2) if (!cpu_has_mips_4_5_r2)
return SIGILL; return SIGILL;
...@@ -1650,6 +1635,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1650,6 +1635,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return 0; return 0;
SPFROMREG(rv.s, MIPSInst_FS(ir)); SPFROMREG(rv.s, MIPSInst_FS(ir));
break; break;
case fmovz_op: case fmovz_op:
if (!cpu_has_mips_4_5_r) if (!cpu_has_mips_4_5_r)
return SIGILL; return SIGILL;
...@@ -1658,6 +1644,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1658,6 +1644,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return 0; return 0;
SPFROMREG(rv.s, MIPSInst_FS(ir)); SPFROMREG(rv.s, MIPSInst_FS(ir));
break; break;
case fmovn_op: case fmovn_op:
if (!cpu_has_mips_4_5_r) if (!cpu_has_mips_4_5_r)
return SIGILL; return SIGILL;
...@@ -1666,37 +1653,32 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1666,37 +1653,32 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return 0; return 0;
SPFROMREG(rv.s, MIPSInst_FS(ir)); SPFROMREG(rv.s, MIPSInst_FS(ir));
break; break;
case fabs_op: case fabs_op:
handler.u = ieee754sp_abs; handler.u = ieee754sp_abs;
goto scopuop; goto scopuop;
case fneg_op: case fneg_op:
handler.u = ieee754sp_neg; handler.u = ieee754sp_neg;
goto scopuop; goto scopuop;
case fmov_op: case fmov_op:
/* an easy one */ /* an easy one */
SPFROMREG(rv.s, MIPSInst_FS(ir)); SPFROMREG(rv.s, MIPSInst_FS(ir));
goto copcsr; goto copcsr;
/* binary op on handler */ /* binary op on handler */
scopbop: scopbop:
{ SPFROMREG(fs, MIPSInst_FS(ir));
union ieee754sp fs, ft; SPFROMREG(ft, MIPSInst_FT(ir));
SPFROMREG(fs, MIPSInst_FS(ir));
SPFROMREG(ft, MIPSInst_FT(ir));
rv.s = (*handler.b) (fs, ft);
goto copcsr;
}
scopuop:
{
union ieee754sp fs;
SPFROMREG(fs, MIPSInst_FS(ir)); rv.s = (*handler.b) (fs, ft);
rv.s = (*handler.u) (fs); goto copcsr;
goto copcsr; scopuop:
} SPFROMREG(fs, MIPSInst_FS(ir));
copcsr: rv.s = (*handler.u) (fs);
goto copcsr;
copcsr:
if (ieee754_cxtest(IEEE754_INEXACT)) if (ieee754_cxtest(IEEE754_INEXACT))
rcsr |= FPU_CSR_INE_X | FPU_CSR_INE_S; rcsr |= FPU_CSR_INE_X | FPU_CSR_INE_S;
if (ieee754_cxtest(IEEE754_UNDERFLOW)) if (ieee754_cxtest(IEEE754_UNDERFLOW))
...@@ -1712,44 +1694,35 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1712,44 +1694,35 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
/* unary conv ops */ /* unary conv ops */
case fcvts_op: case fcvts_op:
return SIGILL; /* not defined */ return SIGILL; /* not defined */
case fcvtd_op:{
union ieee754sp fs;
case fcvtd_op:
SPFROMREG(fs, MIPSInst_FS(ir)); SPFROMREG(fs, MIPSInst_FS(ir));
rv.d = ieee754dp_fsp(fs); rv.d = ieee754dp_fsp(fs);
rfmt = d_fmt; rfmt = d_fmt;
goto copcsr; goto copcsr;
}
case fcvtw_op:{
union ieee754sp fs;
case fcvtw_op:
SPFROMREG(fs, MIPSInst_FS(ir)); SPFROMREG(fs, MIPSInst_FS(ir));
rv.w = ieee754sp_tint(fs); rv.w = ieee754sp_tint(fs);
rfmt = w_fmt; rfmt = w_fmt;
goto copcsr; goto copcsr;
}
case fround_op: case fround_op:
case ftrunc_op: case ftrunc_op:
case fceil_op: case fceil_op:
case ffloor_op:{ case ffloor_op:
unsigned int oldrm = ieee754_csr.rm;
union ieee754sp fs;
if (!cpu_has_mips_2_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_2_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
oldrm = ieee754_csr.rm;
SPFROMREG(fs, MIPSInst_FS(ir)); SPFROMREG(fs, MIPSInst_FS(ir));
ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))]; ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))];
rv.w = ieee754sp_tint(fs); rv.w = ieee754sp_tint(fs);
ieee754_csr.rm = oldrm; ieee754_csr.rm = oldrm;
rfmt = w_fmt; rfmt = w_fmt;
goto copcsr; goto copcsr;
}
case fcvtl_op:{
union ieee754sp fs;
case fcvtl_op:
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
...@@ -1757,25 +1730,21 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1757,25 +1730,21 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
rv.l = ieee754sp_tlong(fs); rv.l = ieee754sp_tlong(fs);
rfmt = l_fmt; rfmt = l_fmt;
goto copcsr; goto copcsr;
}
case froundl_op: case froundl_op:
case ftruncl_op: case ftruncl_op:
case fceill_op: case fceill_op:
case ffloorl_op:{ case ffloorl_op:
unsigned int oldrm = ieee754_csr.rm;
union ieee754sp fs;
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
oldrm = ieee754_csr.rm;
SPFROMREG(fs, MIPSInst_FS(ir)); SPFROMREG(fs, MIPSInst_FS(ir));
ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))]; ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))];
rv.l = ieee754sp_tlong(fs); rv.l = ieee754sp_tlong(fs);
ieee754_csr.rm = oldrm; ieee754_csr.rm = oldrm;
rfmt = l_fmt; rfmt = l_fmt;
goto copcsr; goto copcsr;
}
default: default:
if (MIPSInst_FUNC(ir) >= fcmp_op) { if (MIPSInst_FUNC(ir) >= fcmp_op) {
...@@ -1793,16 +1762,15 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1793,16 +1762,15 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
else else
goto copcsr; goto copcsr;
} } else
else {
return SIGILL; return SIGILL;
}
break; break;
} }
break; break;
} }
case d_fmt:{ case d_fmt: {
union ieee754dp fs, ft;
union { union {
union ieee754dp(*b) (union ieee754dp, union ieee754dp); union ieee754dp(*b) (union ieee754dp, union ieee754dp);
union ieee754dp(*u) (union ieee754dp); union ieee754dp(*u) (union ieee754dp);
...@@ -1887,65 +1855,51 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1887,65 +1855,51 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
goto copcsr; goto copcsr;
/* binary op on handler */ /* binary op on handler */
dcopbop:{ dcopbop:
union ieee754dp fs, ft; DPFROMREG(fs, MIPSInst_FS(ir));
DPFROMREG(ft, MIPSInst_FT(ir));
DPFROMREG(fs, MIPSInst_FS(ir));
DPFROMREG(ft, MIPSInst_FT(ir));
rv.d = (*handler.b) (fs, ft);
goto copcsr;
}
dcopuop:{
union ieee754dp fs;
DPFROMREG(fs, MIPSInst_FS(ir));
rv.d = (*handler.u) (fs);
goto copcsr;
}
/* unary conv ops */ rv.d = (*handler.b) (fs, ft);
case fcvts_op:{ goto copcsr;
union ieee754dp fs; dcopuop:
DPFROMREG(fs, MIPSInst_FS(ir));
rv.d = (*handler.u) (fs);
goto copcsr;
/*
* unary conv ops
*/
case fcvts_op:
DPFROMREG(fs, MIPSInst_FS(ir)); DPFROMREG(fs, MIPSInst_FS(ir));
rv.s = ieee754sp_fdp(fs); rv.s = ieee754sp_fdp(fs);
rfmt = s_fmt; rfmt = s_fmt;
goto copcsr; goto copcsr;
}
case fcvtd_op: case fcvtd_op:
return SIGILL; /* not defined */ return SIGILL; /* not defined */
case fcvtw_op:{ case fcvtw_op:
union ieee754dp fs;
DPFROMREG(fs, MIPSInst_FS(ir)); DPFROMREG(fs, MIPSInst_FS(ir));
rv.w = ieee754dp_tint(fs); /* wrong */ rv.w = ieee754dp_tint(fs); /* wrong */
rfmt = w_fmt; rfmt = w_fmt;
goto copcsr; goto copcsr;
}
case fround_op: case fround_op:
case ftrunc_op: case ftrunc_op:
case fceil_op: case fceil_op:
case ffloor_op:{ case ffloor_op:
unsigned int oldrm = ieee754_csr.rm;
union ieee754dp fs;
if (!cpu_has_mips_2_3_4_5_r) if (!cpu_has_mips_2_3_4_5_r)
return SIGILL; return SIGILL;
oldrm = ieee754_csr.rm;
DPFROMREG(fs, MIPSInst_FS(ir)); DPFROMREG(fs, MIPSInst_FS(ir));
ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))]; ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))];
rv.w = ieee754dp_tint(fs); rv.w = ieee754dp_tint(fs);
ieee754_csr.rm = oldrm; ieee754_csr.rm = oldrm;
rfmt = w_fmt; rfmt = w_fmt;
goto copcsr; goto copcsr;
}
case fcvtl_op:{
union ieee754dp fs;
case fcvtl_op:
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
...@@ -1953,25 +1907,21 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1953,25 +1907,21 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
rv.l = ieee754dp_tlong(fs); rv.l = ieee754dp_tlong(fs);
rfmt = l_fmt; rfmt = l_fmt;
goto copcsr; goto copcsr;
}
case froundl_op: case froundl_op:
case ftruncl_op: case ftruncl_op:
case fceill_op: case fceill_op:
case ffloorl_op:{ case ffloorl_op:
unsigned int oldrm = ieee754_csr.rm;
union ieee754dp fs;
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
oldrm = ieee754_csr.rm;
DPFROMREG(fs, MIPSInst_FS(ir)); DPFROMREG(fs, MIPSInst_FS(ir));
ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))]; ieee754_csr.rm = ieee_rm[modeindex(MIPSInst_FUNC(ir))];
rv.l = ieee754dp_tlong(fs); rv.l = ieee754dp_tlong(fs);
ieee754_csr.rm = oldrm; ieee754_csr.rm = oldrm;
rfmt = l_fmt; rfmt = l_fmt;
goto copcsr; goto copcsr;
}
default: default:
if (MIPSInst_FUNC(ir) >= fcmp_op) { if (MIPSInst_FUNC(ir) >= fcmp_op) {
...@@ -1998,11 +1948,8 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -1998,11 +1948,8 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
break; break;
} }
break; break;
}
case w_fmt:{
union ieee754sp fs;
case w_fmt:
switch (MIPSInst_FUNC(ir)) { switch (MIPSInst_FUNC(ir)) {
case fcvts_op: case fcvts_op:
/* convert word to single precision real */ /* convert word to single precision real */
...@@ -2022,8 +1969,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2022,8 +1969,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
break; break;
} }
case l_fmt:{ case l_fmt:
u64 bits;
if (!cpu_has_mips_3_4_5 && !cpu_has_mips64) if (!cpu_has_mips_3_4_5 && !cpu_has_mips64)
return SIGILL; return SIGILL;
...@@ -2045,7 +1991,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2045,7 +1991,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return SIGILL; return SIGILL;
} }
break; break;
}
default: default:
return SIGILL; return SIGILL;
...@@ -2060,7 +2005,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2060,7 +2005,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
*/ */
ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr; ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr;
if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) { if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
/*printk ("SIGFPE: fpu csr = %08x\n",ctx->fcr31); */ /*printk ("SIGFPE: FPU csr = %08x\n",ctx->fcr31); */
return SIGFPE; return SIGFPE;
} }
...@@ -2068,7 +2013,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2068,7 +2013,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
* Now we can safely write the result back to the register file. * Now we can safely write the result back to the register file.
*/ */
switch (rfmt) { switch (rfmt) {
unsigned int cbit;
case -1: case -1:
if (cpu_has_mips_4_5_r) if (cpu_has_mips_4_5_r)
...@@ -2200,7 +2144,7 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx, ...@@ -2200,7 +2144,7 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
/* SIGILL indicates a non-fpu instruction */ /* SIGILL indicates a non-fpu instruction */
if (sig == SIGILL && xcp->cp0_epc != oldepc) if (sig == SIGILL && xcp->cp0_epc != oldepc)
/* but if epc has advanced, then ignore it */ /* but if EPC has advanced, then ignore it */
sig = 0; sig = 0;
return sig; return sig;
......
arch/mips/math-emu/dp_add.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,17 +16,15 @@ ...@@ -18,17 +16,15 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
{ {
int s;
COMPXDP; COMPXDP;
COMPYDP; COMPYDP;
...@@ -69,9 +65,9 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) ...@@ -69,9 +65,9 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
if (xs == ys) if (xs == ys)
return x; return x;
...@@ -88,15 +84,14 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) ...@@ -88,15 +84,14 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return x; return x;
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
if (xs == ys) if (xs == ys)
return x; return x;
else else
return ieee754dp_zero(ieee754_csr.rm == return ieee754dp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
...@@ -125,20 +120,24 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) ...@@ -125,20 +120,24 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
assert(xm & DP_HIDDEN_BIT); assert(xm & DP_HIDDEN_BIT);
assert(ym & DP_HIDDEN_BIT); assert(ym & DP_HIDDEN_BIT);
/* provide guard,round and stick bit space */ /*
* Provide guard,round and stick bit space.
*/
xm <<= 3; xm <<= 3;
ym <<= 3; ym <<= 3;
if (xe > ye) { if (xe > ye) {
/* have to shift y fraction right to align /*
* Have to shift y fraction right to align.
*/ */
int s = xe - ye; s = xe - ye;
ym = XDPSRS(ym, s); ym = XDPSRS(ym, s);
ye += s; ye += s;
} else if (ye > xe) { } else if (ye > xe) {
/* have to shift x fraction right to align /*
* Have to shift x fraction right to align.
*/ */
int s = ye - xe; s = ye - xe;
xm = XDPSRS(xm, s); xm = XDPSRS(xm, s);
xe += s; xe += s;
} }
...@@ -146,8 +145,9 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) ...@@ -146,8 +145,9 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
assert(xe <= DP_EMAX); assert(xe <= DP_EMAX);
if (xs == ys) { if (xs == ys) {
/* generate 28 bit result of adding two 27 bit numbers /*
* leaving result in xm,xs,xe * Generate 28 bit result of adding two 27 bit numbers
* leaving result in xm, xs and xe.
*/ */
xm = xm + ym; xm = xm + ym;
xe = xe; xe = xe;
...@@ -168,15 +168,15 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) ...@@ -168,15 +168,15 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y)
xs = ys; xs = ys;
} }
if (xm == 0) if (xm == 0)
return ieee754dp_zero(ieee754_csr.rm == return ieee754dp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
/* normalize to rounding precision */ /*
* Normalize to rounding precision.
*/
while ((xm >> (DP_FBITS + 3)) == 0) { while ((xm >> (DP_FBITS + 3)) == 0) {
xm <<= 1; xm <<= 1;
xe--; xe--;
} }
} }
return ieee754dp_format(xs, xe, xm); return ieee754dp_format(xs, xe, xm);
......
arch/mips/math-emu/dp_cmp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,16 @@ ...@@ -18,16 +16,16 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig) int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig)
{ {
s64 vx;
s64 vy;
COMPXDP; COMPXDP;
COMPYDP; COMPYDP;
...@@ -48,8 +46,8 @@ int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig) ...@@ -48,8 +46,8 @@ int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig)
} }
return 0; return 0;
} else { } else {
s64 vx = x.bits; vx = x.bits;
s64 vy = y.bits; vy = y.bits;
if (vx < 0) if (vx < 0)
vx = -vx ^ DP_SIGN_BIT; vx = -vx ^ DP_SIGN_BIT;
......
arch/mips/math-emu/dp_div.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,17 @@ ...@@ -18,16 +16,17 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y)
{ {
u64 rm;
int re;
u64 bm;
COMPXDP; COMPXDP;
COMPYDP; COMPYDP;
...@@ -68,9 +67,9 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) ...@@ -68,9 +67,9 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754dp_indef(); return ieee754dp_indef();
...@@ -85,9 +84,9 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) ...@@ -85,9 +84,9 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return ieee754dp_inf(xs ^ ys); return ieee754dp_inf(xs ^ ys);
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754dp_indef(); return ieee754dp_indef();
...@@ -122,35 +121,34 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) ...@@ -122,35 +121,34 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y)
xm <<= 3; xm <<= 3;
ym <<= 3; ym <<= 3;
{ /* now the dirty work */
/* now the dirty work */
u64 rm = 0;
int re = xe - ye;
u64 bm;
for (bm = DP_MBIT(DP_FBITS + 2); bm; bm >>= 1) {
if (xm >= ym) {
xm -= ym;
rm |= bm;
if (xm == 0)
break;
}
xm <<= 1;
}
rm <<= 1;
if (xm)
rm |= 1; /* have remainder, set sticky */
assert(rm); rm = 0;
re = xe - ye;
/* normalise rm to rounding precision ? for (bm = DP_MBIT(DP_FBITS + 2); bm; bm >>= 1) {
*/ if (xm >= ym) {
while ((rm >> (DP_FBITS + 3)) == 0) { xm -= ym;
rm <<= 1; rm |= bm;
re--; if (xm == 0)
break;
} }
xm <<= 1;
}
rm <<= 1;
if (xm)
rm |= 1; /* have remainder, set sticky */
return ieee754dp_format(xs == ys ? 0 : 1, re, rm); assert(rm);
/*
* Normalise rm to rounding precision ?
*/
while ((rm >> (DP_FBITS + 3)) == 0) {
rm <<= 1;
re--;
} }
return ieee754dp_format(xs == ys ? 0 : 1, re, rm);
} }
arch/mips/math-emu/dp_fint.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_fint(int x) union ieee754dp ieee754dp_fint(int x)
......
arch/mips/math-emu/dp_flong.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_flong(s64 x) union ieee754dp ieee754dp_flong(s64 x)
......
arch/mips/math-emu/dp_fsp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
#include "ieee754dp.h" #include "ieee754dp.h"
...@@ -41,6 +36,7 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x) ...@@ -41,6 +36,7 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x)
case IEEE754_CLASS_SNAN: case IEEE754_CLASS_SNAN:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754dp_nanxcpt(ieee754dp_indef()); return ieee754dp_nanxcpt(ieee754dp_indef());
case IEEE754_CLASS_QNAN: case IEEE754_CLASS_QNAN:
return ieee754dp_nanxcpt(builddp(xs, return ieee754dp_nanxcpt(builddp(xs,
DP_EMAX + 1 + DP_EBIAS, DP_EMAX + 1 + DP_EBIAS,
...@@ -49,8 +45,10 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x) ...@@ -49,8 +45,10 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x)
SP_FBITS)))); SP_FBITS))));
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
return ieee754dp_inf(xs); return ieee754dp_inf(xs);
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return ieee754dp_zero(xs); return ieee754dp_zero(xs);
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
/* normalize */ /* normalize */
while ((xm >> SP_FBITS) == 0) { while ((xm >> SP_FBITS) == 0) {
...@@ -58,11 +56,13 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x) ...@@ -58,11 +56,13 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x)
xe--; xe--;
} }
break; break;
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
} }
/* CAN'T possibly overflow,underflow, or need rounding /*
* Can't possibly overflow,underflow, or need rounding
*/ */
/* drop the hidden bit */ /* drop the hidden bit */
......
arch/mips/math-emu/dp_mul.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,25 @@ ...@@ -18,16 +16,25 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y) union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y)
{ {
int re;
int rs;
u64 rm;
unsigned lxm;
unsigned hxm;
unsigned lym;
unsigned hym;
u64 lrm;
u64 hrm;
u64 t;
u64 at;
COMPXDP; COMPXDP;
COMPYDP; COMPYDP;
...@@ -68,8 +75,9 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y) ...@@ -68,8 +75,9 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y)
return x; return x;
/* Infinity handling */ /*
* Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
...@@ -107,71 +115,59 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y) ...@@ -107,71 +115,59 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y)
/* rm = xm * ym, re = xe+ye basically */ /* rm = xm * ym, re = xe+ye basically */
assert(xm & DP_HIDDEN_BIT); assert(xm & DP_HIDDEN_BIT);
assert(ym & DP_HIDDEN_BIT); assert(ym & DP_HIDDEN_BIT);
{
int re = xe + ye;
int rs = xs ^ ys;
u64 rm;
/* shunt to top of word */ re = xe + ye;
xm <<= 64 - (DP_FBITS + 1); rs = xs ^ ys;
ym <<= 64 - (DP_FBITS + 1);
/* shunt to top of word */
xm <<= 64 - (DP_FBITS + 1);
ym <<= 64 - (DP_FBITS + 1);
/* multiply 32bits xm,ym to give high 32bits rm with stickness /*
*/ * Multiply 32 bits xm, ym to give high 32 bits rm with stickness.
*/
/* 32 * 32 => 64 */ /* 32 * 32 => 64 */
#define DPXMULT(x, y) ((u64)(x) * (u64)y) #define DPXMULT(x, y) ((u64)(x) * (u64)y)
{ lxm = xm;
unsigned lxm = xm; hxm = xm >> 32;
unsigned hxm = xm >> 32; lym = ym;
unsigned lym = ym; hym = ym >> 32;
unsigned hym = ym >> 32;
u64 lrm; lrm = DPXMULT(lxm, lym);
u64 hrm; hrm = DPXMULT(hxm, hym);
lrm = DPXMULT(lxm, lym); t = DPXMULT(lxm, hym);
hrm = DPXMULT(hxm, hym);
at = lrm + (t << 32);
{ hrm += at < lrm;
u64 t = DPXMULT(lxm, hym); lrm = at;
{
u64 at = hrm = hrm + (t >> 32);
lrm + (t << 32);
hrm += at < lrm; t = DPXMULT(hxm, lym);
lrm = at;
} at = lrm + (t << 32);
hrm = hrm + (t >> 32); hrm += at < lrm;
} lrm = at;
{ hrm = hrm + (t >> 32);
u64 t = DPXMULT(hxm, lym);
{ rm = hrm | (lrm != 0);
u64 at =
lrm + (t << 32); /*
hrm += at < lrm; * Sticky shift down to normal rounding precision.
lrm = at; */
} if ((s64) rm < 0) {
hrm = hrm + (t >> 32); rm = (rm >> (64 - (DP_FBITS + 1 + 3))) |
} ((rm << (DP_FBITS + 1 + 3)) != 0);
rm = hrm | (lrm != 0);
}
/*
* sticky shift down to normal rounding precision
*/
if ((s64) rm < 0) {
rm =
(rm >> (64 - (DP_FBITS + 1 + 3))) |
((rm << (DP_FBITS + 1 + 3)) != 0);
re++; re++;
} else { } else {
rm = rm = (rm >> (64 - (DP_FBITS + 1 + 3 + 1))) |
(rm >> (64 - (DP_FBITS + 1 + 3 + 1))) | ((rm << (DP_FBITS + 1 + 3 + 1)) != 0);
((rm << (DP_FBITS + 1 + 3 + 1)) != 0);
}
assert(rm & (DP_HIDDEN_BIT << 3));
return ieee754dp_format(rs, re, rm);
} }
assert(rm & (DP_HIDDEN_BIT << 3));
return ieee754dp_format(rs, re, rm);
} }
arch/mips/math-emu/dp_simple.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_neg(union ieee754dp x) union ieee754dp ieee754dp_neg(union ieee754dp x)
...@@ -51,7 +46,6 @@ union ieee754dp ieee754dp_neg(union ieee754dp x) ...@@ -51,7 +46,6 @@ union ieee754dp ieee754dp_neg(union ieee754dp x)
return x; return x;
} }
union ieee754dp ieee754dp_abs(union ieee754dp x) union ieee754dp ieee754dp_abs(union ieee754dp x)
{ {
COMPXDP; COMPXDP;
......
arch/mips/math-emu/dp_sqrt.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
static const unsigned table[] = { static const unsigned table[] = {
...@@ -50,12 +45,15 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x) ...@@ -50,12 +45,15 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
case IEEE754_CLASS_QNAN: case IEEE754_CLASS_QNAN:
/* sqrt(Nan) = Nan */ /* sqrt(Nan) = Nan */
return ieee754dp_nanxcpt(x); return ieee754dp_nanxcpt(x);
case IEEE754_CLASS_SNAN: case IEEE754_CLASS_SNAN:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754dp_nanxcpt(ieee754dp_indef()); return ieee754dp_nanxcpt(ieee754dp_indef());
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
/* sqrt(0) = 0 */ /* sqrt(0) = 0 */
return x; return x;
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
if (xs) { if (xs) {
/* sqrt(-Inf) = Nan */ /* sqrt(-Inf) = Nan */
...@@ -64,9 +62,11 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x) ...@@ -64,9 +62,11 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
} }
/* sqrt(+Inf) = Inf */ /* sqrt(+Inf) = Inf */
return x; return x;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
DPDNORMX; DPDNORMX;
/* fall through */ /* fall through */
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
if (xs) { if (xs) {
/* sqrt(-x) = Nan */ /* sqrt(-x) = Nan */
......
arch/mips/math-emu/dp_sub.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,15 @@ ...@@ -18,16 +16,15 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y) union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
{ {
int s;
COMPXDP; COMPXDP;
COMPYDP; COMPYDP;
...@@ -68,9 +65,9 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y) ...@@ -68,9 +65,9 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
if (xs != ys) if (xs != ys)
return x; return x;
...@@ -87,15 +84,14 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y) ...@@ -87,15 +84,14 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return x; return x;
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
if (xs != ys) if (xs != ys)
return x; return x;
else else
return ieee754dp_zero(ieee754_csr.rm == return ieee754dp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
...@@ -136,15 +132,17 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y) ...@@ -136,15 +132,17 @@ union ieee754dp ieee754dp_sub(union ieee754dp x, union ieee754dp y)
ym <<= 3; ym <<= 3;
if (xe > ye) { if (xe > ye) {
/* have to shift y fraction right to align /*
* Have to shift y fraction right to align
*/ */
int s = xe - ye; s = xe - ye;
ym = XDPSRS(ym, s); ym = XDPSRS(ym, s);
ye += s; ye += s;
} else if (ye > xe) { } else if (ye > xe) {
/* have to shift x fraction right to align /*
* Have to shift x fraction right to align
*/ */
int s = ye - xe; s = ye - xe;
xm = XDPSRS(xm, s); xm = XDPSRS(xm, s);
xe += s; xe += s;
} }
......
arch/mips/math-emu/dp_tint.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,18 @@ ...@@ -18,16 +16,18 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
int ieee754dp_tint(union ieee754dp x) int ieee754dp_tint(union ieee754dp x)
{ {
u64 residue;
int round;
int sticky;
int odd;
COMPXDP; COMPXDP;
ieee754_clearcx(); ieee754_clearcx();
...@@ -41,8 +41,10 @@ int ieee754dp_tint(union ieee754dp x) ...@@ -41,8 +41,10 @@ int ieee754dp_tint(union ieee754dp x)
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754si_indef(); return ieee754si_indef();
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return 0; return 0;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
...@@ -57,11 +59,6 @@ int ieee754dp_tint(union ieee754dp x) ...@@ -57,11 +59,6 @@ int ieee754dp_tint(union ieee754dp x)
if (xe > DP_FBITS) { if (xe > DP_FBITS) {
xm <<= xe - DP_FBITS; xm <<= xe - DP_FBITS;
} else if (xe < DP_FBITS) { } else if (xe < DP_FBITS) {
u64 residue;
int round;
int sticky;
int odd;
if (xe < -1) { if (xe < -1) {
residue = xm; residue = xm;
round = 0; round = 0;
......
arch/mips/math-emu/dp_tlong.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,18 @@ ...@@ -18,16 +16,18 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754dp.h" #include "ieee754dp.h"
s64 ieee754dp_tlong(union ieee754dp x) s64 ieee754dp_tlong(union ieee754dp x)
{ {
u64 residue;
int round;
int sticky;
int odd;
COMPXDP; COMPXDP;
ieee754_clearcx(); ieee754_clearcx();
...@@ -41,8 +41,10 @@ s64 ieee754dp_tlong(union ieee754dp x) ...@@ -41,8 +41,10 @@ s64 ieee754dp_tlong(union ieee754dp x)
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754di_indef(); return ieee754di_indef();
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return 0; return 0;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
...@@ -60,11 +62,6 @@ s64 ieee754dp_tlong(union ieee754dp x) ...@@ -60,11 +62,6 @@ s64 ieee754dp_tlong(union ieee754dp x)
if (xe > DP_FBITS) { if (xe > DP_FBITS) {
xm <<= xe - DP_FBITS; xm <<= xe - DP_FBITS;
} else if (xe < DP_FBITS) { } else if (xe < DP_FBITS) {
u64 residue;
int round;
int sticky;
int odd;
if (xe < -1) { if (xe < -1) {
residue = xm; residue = xm;
round = 0; round = 0;
......
arch/mips/math-emu/ieee754.c
View file @ 3f7cac41
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -23,9 +21,7 @@ ...@@ -23,9 +21,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -34,8 +30,9 @@ ...@@ -34,8 +30,9 @@
#include "ieee754sp.h" #include "ieee754sp.h"
#include "ieee754dp.h" #include "ieee754dp.h"
/* special constants /*
*/ * Special constants
*/
#define DPCNST(s, b, m) \ #define DPCNST(s, b, m) \
{ \ { \
......
arch/mips/math-emu/ieee754.h
View file @ 3f7cac41
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Nov 7, 2000 * Nov 7, 2000
* Modification to allow integration with Linux kernel * Modification to allow integration with Linux kernel
......
arch/mips/math-emu/ieee754d.c
View file @ 3f7cac41
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Nov 7, 2000 * Nov 7, 2000
* Modified to build and operate in Linux kernel environment. * Modified to build and operate in Linux kernel environment.
......
arch/mips/math-emu/ieee754dp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,9 +16,7 @@ ...@@ -18,9 +16,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
......
arch/mips/math-emu/ieee754dp.h
View file @ 3f7cac41
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -19,9 +17,7 @@ ...@@ -19,9 +17,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
......
arch/mips/math-emu/ieee754int.h
View file @ 3f7cac41
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -19,9 +17,7 @@ ...@@ -19,9 +17,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#ifndef __IEEE754INT_H #ifndef __IEEE754INT_H
#define __IEEE754INT_H #define __IEEE754INT_H
......
arch/mips/math-emu/ieee754sp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,9 +16,7 @@ ...@@ -18,9 +16,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
......
arch/mips/math-emu/ieee754sp.h
View file @ 3f7cac41
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -19,9 +17,7 @@ ...@@ -19,9 +17,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
......
arch/mips/math-emu/kernel_linkage.c
View file @ 3f7cac41
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Routines corresponding to Linux kernel FP context * Routines corresponding to Linux kernel FP context
* manipulation primitives for the Algorithmics MIPS * manipulation primitives for the Algorithmics MIPS
......
arch/mips/math-emu/sp_add.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,15 @@ ...@@ -18,16 +16,15 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
{ {
int s;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;
...@@ -68,9 +65,9 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) ...@@ -68,9 +65,9 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
if (xs == ys) if (xs == ys)
return x; return x;
...@@ -87,15 +84,14 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) ...@@ -87,15 +84,14 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return x; return x;
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
if (xs == ys) if (xs == ys)
return x; return x;
else else
return ieee754sp_zero(ieee754_csr.rm == return ieee754sp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
...@@ -108,6 +104,8 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) ...@@ -108,6 +104,8 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):
SPDNORMX; SPDNORMX;
/* FALL THROUGH */
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM):
SPDNORMY; SPDNORMY;
break; break;
...@@ -122,27 +120,32 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) ...@@ -122,27 +120,32 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
assert(xm & SP_HIDDEN_BIT); assert(xm & SP_HIDDEN_BIT);
assert(ym & SP_HIDDEN_BIT); assert(ym & SP_HIDDEN_BIT);
/* provide guard,round and stick bit space */ /*
* Provide guard, round and stick bit space.
*/
xm <<= 3; xm <<= 3;
ym <<= 3; ym <<= 3;
if (xe > ye) { if (xe > ye) {
/* have to shift y fraction right to align /*
* Have to shift y fraction right to align.
*/ */
int s = xe - ye; s = xe - ye;
SPXSRSYn(s); SPXSRSYn(s);
} else if (ye > xe) { } else if (ye > xe) {
/* have to shift x fraction right to align /*
* Have to shift x fraction right to align.
*/ */
int s = ye - xe; s = ye - xe;
SPXSRSXn(s); SPXSRSXn(s);
} }
assert(xe == ye); assert(xe == ye);
assert(xe <= SP_EMAX); assert(xe <= SP_EMAX);
if (xs == ys) { if (xs == ys) {
/* generate 28 bit result of adding two 27 bit numbers /*
* leaving result in xm,xs,xe * Generate 28 bit result of adding two 27 bit numbers
* leaving result in xm, xs and xe.
*/ */
xm = xm + ym; xm = xm + ym;
xe = xe; xe = xe;
...@@ -162,15 +165,15 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y) ...@@ -162,15 +165,15 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
xs = ys; xs = ys;
} }
if (xm == 0) if (xm == 0)
return ieee754sp_zero(ieee754_csr.rm == return ieee754sp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
/* normalize in extended single precision */ /*
* Normalize in extended single precision
*/
while ((xm >> (SP_FBITS + 3)) == 0) { while ((xm >> (SP_FBITS + 3)) == 0) {
xm <<= 1; xm <<= 1;
xe--; xe--;
} }
} }
return ieee754sp_format(xs, xe, xm); return ieee754sp_format(xs, xe, xm);
......
arch/mips/math-emu/sp_cmp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,16 @@ ...@@ -18,16 +16,16 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
int ieee754sp_cmp(union ieee754sp x, union ieee754sp y, int cmp, int sig) int ieee754sp_cmp(union ieee754sp x, union ieee754sp y, int cmp, int sig)
{ {
int vx;
int vy;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;
...@@ -48,8 +46,8 @@ int ieee754sp_cmp(union ieee754sp x, union ieee754sp y, int cmp, int sig) ...@@ -48,8 +46,8 @@ int ieee754sp_cmp(union ieee754sp x, union ieee754sp y, int cmp, int sig)
} }
return 0; return 0;
} else { } else {
int vx = x.bits; vx = x.bits;
int vy = y.bits; vy = y.bits;
if (vx < 0) if (vx < 0)
vx = -vx ^ SP_SIGN_BIT; vx = -vx ^ SP_SIGN_BIT;
......
arch/mips/math-emu/sp_div.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,17 @@ ...@@ -18,16 +16,17 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y) union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
{ {
unsigned rm;
int re;
unsigned bm;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;
...@@ -68,9 +67,9 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y) ...@@ -68,9 +67,9 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754sp_indef(); return ieee754sp_indef();
...@@ -85,9 +84,9 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y) ...@@ -85,9 +84,9 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return ieee754sp_inf(xs ^ ys); return ieee754sp_inf(xs ^ ys);
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754sp_indef(); return ieee754sp_indef();
...@@ -122,35 +121,33 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y) ...@@ -122,35 +121,33 @@ union ieee754sp ieee754sp_div(union ieee754sp x, union ieee754sp y)
xm <<= 3; xm <<= 3;
ym <<= 3; ym <<= 3;
{ /* now the dirty work */
/* now the dirty work */
unsigned rm = 0;
int re = xe - ye;
unsigned bm;
for (bm = SP_MBIT(SP_FBITS + 2); bm; bm >>= 1) {
if (xm >= ym) {
xm -= ym;
rm |= bm;
if (xm == 0)
break;
}
xm <<= 1;
}
rm <<= 1;
if (xm)
rm |= 1; /* have remainder, set sticky */
assert(rm); rm = 0;
re = xe - ye;
/* normalise rm to rounding precision ? for (bm = SP_MBIT(SP_FBITS + 2); bm; bm >>= 1) {
*/ if (xm >= ym) {
while ((rm >> (SP_FBITS + 3)) == 0) { xm -= ym;
rm <<= 1; rm |= bm;
re--; if (xm == 0)
break;
} }
xm <<= 1;
}
rm <<= 1;
if (xm)
rm |= 1; /* have remainder, set sticky */
return ieee754sp_format(xs == ys ? 0 : 1, re, rm); assert(rm);
/* normalise rm to rounding precision ?
*/
while ((rm >> (SP_FBITS + 3)) == 0) {
rm <<= 1;
re--;
} }
return ieee754sp_format(xs == ys ? 0 : 1, re, rm);
} }
arch/mips/math-emu/sp_fdp.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,17 +16,16 @@ ...@@ -18,17 +16,16 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
#include "ieee754dp.h" #include "ieee754dp.h"
union ieee754sp ieee754sp_fdp(union ieee754dp x) union ieee754sp ieee754sp_fdp(union ieee754dp x)
{ {
u32 rm;
COMPXDP; COMPXDP;
union ieee754sp nan; union ieee754sp nan;
...@@ -42,16 +39,20 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x) ...@@ -42,16 +39,20 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x)
case IEEE754_CLASS_SNAN: case IEEE754_CLASS_SNAN:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754sp_nanxcpt(ieee754sp_indef()); return ieee754sp_nanxcpt(ieee754sp_indef());
case IEEE754_CLASS_QNAN: case IEEE754_CLASS_QNAN:
nan = buildsp(xs, SP_EMAX + 1 + SP_EBIAS, (u32) nan = buildsp(xs, SP_EMAX + 1 + SP_EBIAS, (u32)
(xm >> (DP_FBITS - SP_FBITS))); (xm >> (DP_FBITS - SP_FBITS)));
if (!ieee754sp_isnan(nan)) if (!ieee754sp_isnan(nan))
nan = ieee754sp_indef(); nan = ieee754sp_indef();
return ieee754sp_nanxcpt(nan); return ieee754sp_nanxcpt(nan);
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
return ieee754sp_inf(xs); return ieee754sp_inf(xs);
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return ieee754sp_zero(xs); return ieee754sp_zero(xs);
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
/* can't possibly be sp representable */ /* can't possibly be sp representable */
ieee754_setcx(IEEE754_UNDERFLOW); ieee754_setcx(IEEE754_UNDERFLOW);
...@@ -60,18 +61,16 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x) ...@@ -60,18 +61,16 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x)
(ieee754_csr.rm == IEEE754_RD && xs)) (ieee754_csr.rm == IEEE754_RD && xs))
return ieee754sp_mind(xs); return ieee754sp_mind(xs);
return ieee754sp_zero(xs); return ieee754sp_zero(xs);
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
} }
{ /*
u32 rm; * Convert from DP_FBITS to SP_FBITS+3 with sticky right shift.
*/
rm = (xm >> (DP_FBITS - (SP_FBITS + 3))) |
((xm << (64 - (DP_FBITS - (SP_FBITS + 3)))) != 0);
/* convert from DP_FBITS to SP_FBITS+3 with sticky right shift return ieee754sp_format(xs, xe, rm);
*/
rm = (xm >> (DP_FBITS - (SP_FBITS + 3))) |
((xm << (64 - (DP_FBITS - (SP_FBITS + 3)))) != 0);
return ieee754sp_format(xs, xe, rm);
}
} }
arch/mips/math-emu/sp_fint.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_fint(int x) union ieee754sp ieee754sp_fint(int x)
......
arch/mips/math-emu/sp_flong.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_flong(s64 x) union ieee754sp ieee754sp_flong(s64 x)
......
arch/mips/math-emu/sp_mul.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,25 @@ ...@@ -18,16 +16,25 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y) union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y)
{ {
int re;
int rs;
unsigned rm;
unsigned short lxm;
unsigned short hxm;
unsigned short lym;
unsigned short hym;
unsigned lrm;
unsigned hrm;
unsigned t;
unsigned at;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;
...@@ -68,8 +75,9 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y) ...@@ -68,8 +75,9 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y)
return x; return x;
/* Infinity handling */ /*
* Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
...@@ -108,63 +116,50 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y) ...@@ -108,63 +116,50 @@ union ieee754sp ieee754sp_mul(union ieee754sp x, union ieee754sp y)
assert(xm & SP_HIDDEN_BIT); assert(xm & SP_HIDDEN_BIT);
assert(ym & SP_HIDDEN_BIT); assert(ym & SP_HIDDEN_BIT);
{ re = xe + ye;
int re = xe + ye; rs = xs ^ ys;
int rs = xs ^ ys;
unsigned rm; /* shunt to top of word */
xm <<= 32 - (SP_FBITS + 1);
/* shunt to top of word */ ym <<= 32 - (SP_FBITS + 1);
xm <<= 32 - (SP_FBITS + 1);
ym <<= 32 - (SP_FBITS + 1); /*
* Multiply 32 bits xm, ym to give high 32 bits rm with stickness.
/* multiply 32bits xm,ym to give high 32bits rm with stickness */
*/ lxm = xm & 0xffff;
{ hxm = xm >> 16;
unsigned short lxm = xm & 0xffff; lym = ym & 0xffff;
unsigned short hxm = xm >> 16; hym = ym >> 16;
unsigned short lym = ym & 0xffff;
unsigned short hym = ym >> 16; lrm = lxm * lym; /* 16 * 16 => 32 */
unsigned lrm; hrm = hxm * hym; /* 16 * 16 => 32 */
unsigned hrm;
t = lxm * hym; /* 16 * 16 => 32 */
lrm = lxm * lym; /* 16 * 16 => 32 */ at = lrm + (t << 16);
hrm = hxm * hym; /* 16 * 16 => 32 */ hrm += at < lrm;
lrm = at;
{ hrm = hrm + (t >> 16);
unsigned t = lxm * hym; /* 16 * 16 => 32 */
{ t = hxm * lym; /* 16 * 16 => 32 */
unsigned at = lrm + (t << 16); at = lrm + (t << 16);
hrm += at < lrm; hrm += at < lrm;
lrm = at; lrm = at;
} hrm = hrm + (t >> 16);
hrm = hrm + (t >> 16);
} rm = hrm | (lrm != 0);
{ /*
unsigned t = hxm * lym; /* 16 * 16 => 32 */ * Sticky shift down to normal rounding precision.
{ */
unsigned at = lrm + (t << 16); if ((int) rm < 0) {
hrm += at < lrm; rm = (rm >> (32 - (SP_FBITS + 1 + 3))) |
lrm = at; ((rm << (SP_FBITS + 1 + 3)) != 0);
} re++;
hrm = hrm + (t >> 16); } else {
} rm = (rm >> (32 - (SP_FBITS + 1 + 3 + 1))) |
rm = hrm | (lrm != 0); ((rm << (SP_FBITS + 1 + 3 + 1)) != 0);
}
/*
* sticky shift down to normal rounding precision
*/
if ((int) rm < 0) {
rm = (rm >> (32 - (SP_FBITS + 1 + 3))) |
((rm << (SP_FBITS + 1 + 3)) != 0);
re++;
} else {
rm = (rm >> (32 - (SP_FBITS + 1 + 3 + 1))) |
((rm << (SP_FBITS + 1 + 3 + 1)) != 0);
}
assert(rm & (SP_HIDDEN_BIT << 3));
return ieee754sp_format(rs, re, rm);
} }
assert(rm & (SP_HIDDEN_BIT << 3));
return ieee754sp_format(rs, re, rm);
} }
arch/mips/math-emu/sp_simple.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_neg(union ieee754sp x) union ieee754sp ieee754sp_neg(union ieee754sp x)
...@@ -51,7 +46,6 @@ union ieee754sp ieee754sp_neg(union ieee754sp x) ...@@ -51,7 +46,6 @@ union ieee754sp ieee754sp_neg(union ieee754sp x)
return x; return x;
} }
union ieee754sp ieee754sp_abs(union ieee754sp x) union ieee754sp ieee754sp_abs(union ieee754sp x)
{ {
COMPXSP; COMPXSP;
......
arch/mips/math-emu/sp_sqrt.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,12 +16,9 @@ ...@@ -18,12 +16,9 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_sqrt(union ieee754sp x) union ieee754sp ieee754sp_sqrt(union ieee754sp x)
...@@ -43,12 +38,15 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x) ...@@ -43,12 +38,15 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
case IEEE754_CLASS_QNAN: case IEEE754_CLASS_QNAN:
/* sqrt(Nan) = Nan */ /* sqrt(Nan) = Nan */
return ieee754sp_nanxcpt(x); return ieee754sp_nanxcpt(x);
case IEEE754_CLASS_SNAN: case IEEE754_CLASS_SNAN:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754sp_nanxcpt(ieee754sp_indef()); return ieee754sp_nanxcpt(ieee754sp_indef());
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
/* sqrt(0) = 0 */ /* sqrt(0) = 0 */
return x; return x;
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
if (xs) { if (xs) {
/* sqrt(-Inf) = Nan */ /* sqrt(-Inf) = Nan */
...@@ -57,6 +55,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x) ...@@ -57,6 +55,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
} }
/* sqrt(+Inf) = Inf */ /* sqrt(+Inf) = Inf */
return x; return x;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
if (xs) { if (xs) {
......
arch/mips/math-emu/sp_sub.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,15 @@ ...@@ -18,16 +16,15 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y) union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
{ {
int s;
COMPXSP; COMPXSP;
COMPYSP; COMPYSP;
...@@ -68,9 +65,9 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y) ...@@ -68,9 +65,9 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
return x; return x;
/* Infinity handling /*
*/ * Infinity handling
*/
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
if (xs != ys) if (xs != ys)
return x; return x;
...@@ -87,15 +84,14 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y) ...@@ -87,15 +84,14 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM): case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
return x; return x;
/* Zero handling /*
*/ * Zero handling
*/
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
if (xs != ys) if (xs != ys)
return x; return x;
else else
return ieee754sp_zero(ieee754_csr.rm == return ieee754sp_zero(ieee754_csr.rm == IEEE754_RD);
IEEE754_RD);
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO): case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
...@@ -133,14 +129,16 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y) ...@@ -133,14 +129,16 @@ union ieee754sp ieee754sp_sub(union ieee754sp x, union ieee754sp y)
ym <<= 3; ym <<= 3;
if (xe > ye) { if (xe > ye) {
/* have to shift y fraction right to align /*
* have to shift y fraction right to align
*/ */
int s = xe - ye; s = xe - ye;
SPXSRSYn(s); SPXSRSYn(s);
} else if (ye > xe) { } else if (ye > xe) {
/* have to shift x fraction right to align /*
* have to shift x fraction right to align
*/ */
int s = ye - xe; s = ye - xe;
SPXSRSXn(s); SPXSRSXn(s);
} }
assert(xe == ye); assert(xe == ye);
......
arch/mips/math-emu/sp_tint.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,16 +16,18 @@ ...@@ -18,16 +16,18 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
int ieee754sp_tint(union ieee754sp x) int ieee754sp_tint(union ieee754sp x)
{ {
u32 residue;
int round;
int sticky;
int odd;
COMPXSP; COMPXSP;
ieee754_clearcx(); ieee754_clearcx();
...@@ -41,8 +41,10 @@ int ieee754sp_tint(union ieee754sp x) ...@@ -41,8 +41,10 @@ int ieee754sp_tint(union ieee754sp x)
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754si_indef(); return ieee754si_indef();
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return 0; return 0;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
...@@ -60,11 +62,6 @@ int ieee754sp_tint(union ieee754sp x) ...@@ -60,11 +62,6 @@ int ieee754sp_tint(union ieee754sp x)
if (xe > SP_FBITS) { if (xe > SP_FBITS) {
xm <<= xe - SP_FBITS; xm <<= xe - SP_FBITS;
} else { } else {
u32 residue;
int round;
int sticky;
int odd;
if (xe < -1) { if (xe < -1) {
residue = xm; residue = xm;
round = 0; round = 0;
......
arch/mips/math-emu/sp_tlong.c
View file @ 3f7cac41
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* MIPS floating point support * MIPS floating point support
* Copyright (C) 1994-2000 Algorithmics Ltd. * Copyright (C) 1994-2000 Algorithmics Ltd.
* *
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it * This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as * under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation. * published by the Free Software Foundation.
...@@ -18,17 +16,19 @@ ...@@ -18,17 +16,19 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* ########################################################################
*/ */
#include "ieee754sp.h" #include "ieee754sp.h"
#include "ieee754dp.h" #include "ieee754dp.h"
s64 ieee754sp_tlong(union ieee754sp x) s64 ieee754sp_tlong(union ieee754sp x)
{ {
u32 residue;
int round;
int sticky;
int odd;
COMPXDP; /* <-- need 64-bit mantissa tmp */ COMPXDP; /* <-- need 64-bit mantissa tmp */
ieee754_clearcx(); ieee754_clearcx();
...@@ -42,8 +42,10 @@ s64 ieee754sp_tlong(union ieee754sp x) ...@@ -42,8 +42,10 @@ s64 ieee754sp_tlong(union ieee754sp x)
case IEEE754_CLASS_INF: case IEEE754_CLASS_INF:
ieee754_setcx(IEEE754_INVALID_OPERATION); ieee754_setcx(IEEE754_INVALID_OPERATION);
return ieee754di_indef(); return ieee754di_indef();
case IEEE754_CLASS_ZERO: case IEEE754_CLASS_ZERO:
return 0; return 0;
case IEEE754_CLASS_DNORM: case IEEE754_CLASS_DNORM:
case IEEE754_CLASS_NORM: case IEEE754_CLASS_NORM:
break; break;
...@@ -61,11 +63,6 @@ s64 ieee754sp_tlong(union ieee754sp x) ...@@ -61,11 +63,6 @@ s64 ieee754sp_tlong(union ieee754sp x)
if (xe > SP_FBITS) { if (xe > SP_FBITS) {
xm <<= xe - SP_FBITS; xm <<= xe - SP_FBITS;
} else if (xe < SP_FBITS) { } else if (xe < SP_FBITS) {
u32 residue;
int round;
int sticky;
int odd;
if (xe < -1) { if (xe < -1) {
residue = xm; residue = xm;
round = 0; round = 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7