nds32: add new emulations for floating point instruction

The existing floating point emulations is only available for floating
instruction that possibly issue denormalized input and underflow
exceptions. These existing FPU emulations are not sufficient when IEx
Trap is enabled because some floating point instructions only issue inexact
exception. This patch adds the emulations of such floating point
instructions.

Signed-off-by: Vincent Chen <vincentc@andestech.com>
Acked-by: Greentime Hu <greentime@andestech.com>
Signed-off-by: Greentime Hu <greentime@andestech.com>

diff --git a/arch/nds32/include/asm/fpuemu.h b/arch/nds32/include/asm/fpuemu.h
index c4bd0c7faa75facfdb5002b90292e1514cedc1b6..63e7ef5f7969ba543c75366bcabd6e70951b63c5 100644 (file)
--- a/arch/nds32/include/asm/fpuemu.h
+++ b/arch/nds32/include/asm/fpuemu.h
@@ -13,6 +13,12 @@ void fsubs(void *ft, void *fa, void *fb);
 void fmuls(void *ft, void *fa, void *fb);
 void fdivs(void *ft, void *fa, void *fb);
 void fs2d(void *ft, void *fa);
+void fs2si(void *ft, void *fa);
+void fs2si_z(void *ft, void *fa);
+void fs2ui(void *ft, void *fa);
+void fs2ui_z(void *ft, void *fa);
+void fsi2s(void *ft, void *fa);
+void fui2s(void *ft, void *fa);
 void fsqrts(void *ft, void *fa);
 void fnegs(void *ft, void *fa);
 int fcmps(void *ft, void *fa, void *fb, int cop);
@@ -26,6 +32,12 @@ void fmuld(void *ft, void *fa, void *fb);
 void fdivd(void *ft, void *fa, void *fb);
 void fsqrtd(void *ft, void *fa);
 void fd2s(void *ft, void *fa);
+void fd2si(void *ft, void *fa);
+void fd2si_z(void *ft, void *fa);
+void fd2ui(void *ft, void *fa);
+void fd2ui_z(void *ft, void *fa);
+void fsi2d(void *ft, void *fa);
+void fui2d(void *ft, void *fa);
 void fnegd(void *ft, void *fa);
 int fcmpd(void *ft, void *fa, void *fb, int cop);
 

diff --git a/arch/nds32/math-emu/Makefile b/arch/nds32/math-emu/Makefile
index 947fe0c3d52f0dbf2d5b0d228503bab183120ead..80932ac7ed533396ff60571e25aee5cc51a86015 100644 (file)
--- a/arch/nds32/math-emu/Makefile
+++ b/arch/nds32/math-emu/Makefile
@@ -4,4 +4,6 @@
 
 obj-y  := fpuemu.o \
           fdivd.o fmuld.o fsubd.o faddd.o fs2d.o fsqrtd.o fcmpd.o fnegs.o \
-          fdivs.o fmuls.o fsubs.o fadds.o fd2s.o fsqrts.o fcmps.o fnegd.o
+          fd2si.o fd2ui.o fd2siz.o fd2uiz.o fsi2d.o fui2d.o \
+          fdivs.o fmuls.o fsubs.o fadds.o fd2s.o fsqrts.o fcmps.o fnegd.o \
+          fs2si.o fs2ui.o fs2siz.o fs2uiz.o fsi2s.o fui2s.o

diff --git a/arch/nds32/math-emu/fd2si.c b/arch/nds32/math-emu/fd2si.c
new file mode 100644 (file)
index 0000000..fae3e16
--- /dev/null
+++ b/arch/nds32/math-emu/fd2si.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fd2si(void *ft, void *fa)
+{
+       int r;
+
+       FP_DECL_D(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_DP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(int *)ft = (A_s == 0) ? 0x7fffffff : 0x80000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_ROUND_D(r, A, 32, 1);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(int *)ft = r;
+       }
+
+}

diff --git a/arch/nds32/math-emu/fd2siz.c b/arch/nds32/math-emu/fd2siz.c
new file mode 100644 (file)
index 0000000..92fe677
--- /dev/null
+++ b/arch/nds32/math-emu/fd2siz.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fd2si_z(void *ft, void *fa)
+{
+       int r;
+
+       FP_DECL_D(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_DP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(int *)ft = (A_s == 0) ? 0x7fffffff : 0x80000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_D(r, A, 32, 1);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(int *)ft = r;
+       }
+
+}

diff --git a/arch/nds32/math-emu/fd2ui.c b/arch/nds32/math-emu/fd2ui.c
new file mode 100644 (file)
index 0000000..a0423b6
--- /dev/null
+++ b/arch/nds32/math-emu/fd2ui.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fd2ui(void *ft, void *fa)
+{
+       unsigned int r;
+
+       FP_DECL_D(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_DP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(unsigned int *)ft = (A_s == 0) ? 0xffffffff : 0x00000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(unsigned int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_ROUND_D(r, A, 32, 0);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(unsigned int *)ft = r;
+       }
+
+}

diff --git a/arch/nds32/math-emu/fd2uiz.c b/arch/nds32/math-emu/fd2uiz.c
new file mode 100644 (file)
index 0000000..8ae17cf
--- /dev/null
+++ b/arch/nds32/math-emu/fd2uiz.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fd2ui_z(void *ft, void *fa)
+{
+       unsigned int r;
+
+       FP_DECL_D(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_DP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(unsigned int *)ft = (A_s == 0) ? 0xffffffff : 0x00000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(unsigned int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_D(r, A, 32, 0);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(unsigned int *)ft = r;
+       }
+
+}

diff --git a/arch/nds32/math-emu/fpuemu.c b/arch/nds32/math-emu/fpuemu.c
index 75cf1643fa78e6ede16924169cdddb49187e05ce..46558a15c0dce5cbec114af536d1aedfc79ef35c 100644 (file)
--- a/arch/nds32/math-emu/fpuemu.c
+++ b/arch/nds32/math-emu/fpuemu.c
@@ -113,6 +113,30 @@ static int fpu_emu(struct fpu_struct *fpu_reg, unsigned long insn)
                                        func.b = fs2d;
                                        ftype = S1D;
                                        break;
+                               case fs2si_op:
+                                       func.b = fs2si;
+                                       ftype = S1S;
+                                       break;
+                               case fs2si_z_op:
+                                       func.b = fs2si_z;
+                                       ftype = S1S;
+                                       break;
+                               case fs2ui_op:
+                                       func.b = fs2ui;
+                                       ftype = S1S;
+                                       break;
+                               case fs2ui_z_op:
+                                       func.b = fs2ui_z;
+                                       ftype = S1S;
+                                       break;
+                               case fsi2s_op:
+                                       func.b = fsi2s;
+                                       ftype = S1S;
+                                       break;
+                               case fui2s_op:
+                                       func.b = fui2s;
+                                       ftype = S1S;
+                                       break;
                                case fsqrts_op:
                                        func.b = fsqrts;
                                        ftype = S1S;
@@ -182,6 +206,30 @@ static int fpu_emu(struct fpu_struct *fpu_reg, unsigned long insn)
                                        func.b = fd2s;
                                        ftype = D1S;
                                        break;
+                               case fd2si_op:
+                                       func.b = fd2si;
+                                       ftype = D1S;
+                                       break;
+                               case fd2si_z_op:
+                                       func.b = fd2si_z;
+                                       ftype = D1S;
+                                       break;
+                               case fd2ui_op:
+                                       func.b = fd2ui;
+                                       ftype = D1S;
+                                       break;
+                               case fd2ui_z_op:
+                                       func.b = fd2ui_z;
+                                       ftype = D1S;
+                                       break;
+                               case fsi2d_op:
+                                       func.b = fsi2d;
+                                       ftype = D1S;
+                                       break;
+                               case fui2d_op:
+                                       func.b = fui2d;
+                                       ftype = D1S;
+                                       break;
                                case fsqrtd_op:
                                        func.b = fsqrtd;
                                        ftype = D1D;
@@ -305,16 +353,16 @@ static int fpu_emu(struct fpu_struct *fpu_reg, unsigned long insn)
         * If an exception is required, generate a tidy SIGFPE exception.
         */
 #if IS_ENABLED(CONFIG_SUPPORT_DENORMAL_ARITHMETIC)
-       if (((fpu_reg->fpcsr << 5) & fpu_reg->fpcsr & FPCSR_mskALLE_NO_UDFE) ||
-           ((fpu_reg->fpcsr & FPCSR_mskUDF) && (fpu_reg->UDF_trap)))
+       if (((fpu_reg->fpcsr << 5) & fpu_reg->fpcsr & FPCSR_mskALLE_NO_UDF_IEXE)
+           || ((fpu_reg->fpcsr << 5) & (fpu_reg->UDF_IEX_trap))) {
 #else
-       if ((fpu_reg->fpcsr << 5) & fpu_reg->fpcsr & FPCSR_mskALLE)
+       if ((fpu_reg->fpcsr << 5) & fpu_reg->fpcsr & FPCSR_mskALLE) {
 #endif
                return SIGFPE;
+       }
        return 0;
 }
 
-
 int do_fpuemu(struct pt_regs *regs, struct fpu_struct *fpu)
 {
        unsigned long insn = 0, addr = regs->ipc;
@@ -336,6 +384,7 @@ int do_fpuemu(struct pt_regs *regs, struct fpu_struct *fpu)
 
        if (NDS32Insn_OPCODE(insn) != cop0_op)
                return SIGILL;
+
        switch (NDS32Insn_OPCODE_COP0(insn)) {
        case fs1_op:
        case fs2_op:

diff --git a/arch/nds32/math-emu/fs2si.c b/arch/nds32/math-emu/fs2si.c
new file mode 100644 (file)
index 0000000..b4931d6
--- /dev/null
+++ b/arch/nds32/math-emu/fs2si.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fs2si(void *ft, void *fa)
+{
+       int r;
+
+       FP_DECL_S(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_SP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(int *)ft = (A_s == 0) ? 0x7fffffff : 0x80000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_ROUND_S(r, A, 32, 1);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(int *)ft = r;
+       }
+}

diff --git a/arch/nds32/math-emu/fs2siz.c b/arch/nds32/math-emu/fs2siz.c
new file mode 100644 (file)
index 0000000..1c2b99c
--- /dev/null
+++ b/arch/nds32/math-emu/fs2siz.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fs2si_z(void *ft, void *fa)
+{
+       int r;
+
+       FP_DECL_S(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_SP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(int *)ft = (A_s == 0) ? 0x7fffffff : 0x80000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_S(r, A, 32, 1);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(int *)ft = r;
+       }
+}

diff --git a/arch/nds32/math-emu/fs2ui.c b/arch/nds32/math-emu/fs2ui.c
new file mode 100644 (file)
index 0000000..c337f03
--- /dev/null
+++ b/arch/nds32/math-emu/fs2ui.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fs2ui(void *ft, void *fa)
+{
+       unsigned int r;
+
+       FP_DECL_S(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_SP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(unsigned int *)ft = (A_s == 0) ? 0xffffffff : 0x00000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(unsigned int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_ROUND_S(r, A, 32, 0);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(unsigned int *)ft = r;
+       }
+}

diff --git a/arch/nds32/math-emu/fs2uiz.c b/arch/nds32/math-emu/fs2uiz.c
new file mode 100644 (file)
index 0000000..22c5e47
--- /dev/null
+++ b/arch/nds32/math-emu/fs2uiz.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fs2ui_z(void *ft, void *fa)
+{
+       unsigned int r;
+
+       FP_DECL_S(A);
+       FP_DECL_EX;
+
+       FP_UNPACK_SP(A, fa);
+
+       if (A_c == FP_CLS_INF) {
+               *(unsigned int *)ft = (A_s == 0) ? 0xffffffff : 0x00000000;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else if (A_c == FP_CLS_NAN) {
+               *(unsigned int *)ft = 0xffffffff;
+               __FPU_FPCSR |= FP_EX_INVALID;
+       } else {
+               FP_TO_INT_S(r, A, 32, 0);
+               __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+               *(unsigned int *)ft = r;
+       }
+
+}

diff --git a/arch/nds32/math-emu/fsi2d.c b/arch/nds32/math-emu/fsi2d.c
new file mode 100644 (file)
index 0000000..6b04cec
--- /dev/null
+++ b/arch/nds32/math-emu/fsi2d.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fsi2d(void *ft, void *fa)
+{
+       int a = *(int *)fa;
+
+       FP_DECL_D(R);
+       FP_DECL_EX;
+
+       FP_FROM_INT_D(R, a, 32, int);
+
+       FP_PACK_DP(ft, R);
+
+       __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+
+}

diff --git a/arch/nds32/math-emu/fsi2s.c b/arch/nds32/math-emu/fsi2s.c
new file mode 100644 (file)
index 0000000..689864a
--- /dev/null
+++ b/arch/nds32/math-emu/fsi2s.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fsi2s(void *ft, void *fa)
+{
+       int a = *(int *)fa;
+
+       FP_DECL_S(R);
+       FP_DECL_EX;
+
+       FP_FROM_INT_S(R, a, 32, int);
+
+       FP_PACK_SP(ft, R);
+
+       __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+
+}

diff --git a/arch/nds32/math-emu/fui2d.c b/arch/nds32/math-emu/fui2d.c
new file mode 100644 (file)
index 0000000..9689d33
--- /dev/null
+++ b/arch/nds32/math-emu/fui2d.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+
+void fui2d(void *ft, void *fa)
+{
+       unsigned int a = *(unsigned int *)fa;
+
+       FP_DECL_D(R);
+       FP_DECL_EX;
+
+       FP_FROM_INT_D(R, a, 32, int);
+
+       FP_PACK_DP(ft, R);
+
+       __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+
+}

diff --git a/arch/nds32/math-emu/fui2s.c b/arch/nds32/math-emu/fui2s.c
new file mode 100644 (file)
index 0000000..f70f076
--- /dev/null
+++ b/arch/nds32/math-emu/fui2s.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2005-2019 Andes Technology Corporation
+#include <linux/uaccess.h>
+
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/single.h>
+
+void fui2s(void *ft, void *fa)
+{
+       unsigned int a = *(unsigned int *)fa;
+
+       FP_DECL_S(R);
+       FP_DECL_EX;
+
+       FP_FROM_INT_S(R, a, 32, int);
+
+       FP_PACK_SP(ft, R);
+
+       __FPU_FPCSR |= FP_CUR_EXCEPTIONS;
+
+}