New FPU stub code was broken

diff --git a/mips/ngen.c b/mips/ngen.c
index 6397315a40290a4b978ec0b1a2335d8d5e93581a..0340f3bbae0dc04357fe43e40568fc4742c01c07 100644 (file)
--- a/mips/ngen.c
+++ b/mips/ngen.c
@@ -10,7 +10,7 @@
 
        Authors: Andreas  Krall      EMAIL: cacao@complang.tuwien.ac.at
 
-       Last Change: $Id: ngen.c 277 2003-05-09 19:36:04Z stefan $
+       Last Change: $Id: ngen.c 280 2003-05-09 20:55:46Z stefan $
 
 *******************************************************************************/
 
@@ -3639,28 +3639,28 @@ u1 *createnativestub (functionptr f, methodinfo *m)
        reg_init();
 
        M_MOV  (argintregs[4], argintregs[5]);
-       M_MFC1 (REG_ITMP1, argfltregs[4]);
+       M_DMFC1 (REG_ITMP1, argfltregs[4]);
 
        M_MOV  (argintregs[3], argintregs[4]);
-       M_MTC1 (REG_ITMP1, argfltregs[5]);
+       M_DMTC1 (REG_ITMP1, argfltregs[5]);
 
        M_MOV  (argintregs[2], argintregs[3]);
-       M_MFC1 (REG_ITMP1, argfltregs[3]);
+       M_DMFC1 (REG_ITMP1, argfltregs[3]);
 
        M_MOV  (argintregs[1], argintregs[2]);
-       M_MTC1 (REG_ITMP1, argfltregs[4]);
+       M_DMTC1 (REG_ITMP1, argfltregs[4]);
 
        M_MOV  (argintregs[0], argintregs[1]);
-       M_MFC1 (REG_ITMP1, argfltregs[2]);
+       M_DMFC1 (REG_ITMP1, argfltregs[2]);
 
        M_ALD  (argintregs[0], REG_PV, 19*8); /* load adress of jni_environement  */
-       M_MTC1 (REG_ITMP1, argfltregs[3]);
+       M_DMTC1 (REG_ITMP1, argfltregs[3]);
 
-       M_MFC1 (REG_ITMP1, argfltregs[1]);
-       M_MFC1 (REG_ITMP2, argfltregs[0]);
+       M_DMFC1 (REG_ITMP1, argfltregs[1]);
+       M_DMFC1 (REG_ITMP2, argfltregs[0]);
 
-       M_MTC1 (REG_ITMP1, argfltregs[2]);
-       M_MTC1 (REG_ITMP2, argfltregs[1]);
+       M_DMTC1 (REG_ITMP1, argfltregs[2]);
+       M_DMTC1 (REG_ITMP2, argfltregs[1]);
 
        M_ALD  (REG_ITMP3, REG_PV, 16*8);   /* load adress of native method       */
        M_LDA  (REG_SP, REG_SP, -8);        /* build up stackframe                */

diff --git a/mips/ngen.h b/mips/ngen.h
index 999f88befb034d513d5065ef0b91800cc4e9739d..9c64230f2747467f6faf96c35cd8cbe7884a6ba7 100644 (file)
--- a/mips/ngen.h
+++ b/mips/ngen.h
@@ -321,8 +321,8 @@ int parentargs_base; /* offset in stackframe for the parameter from the caller*/
 #define M_MOVID(i,d)            M_FP3(0,4,d,i,0)                /* d = i      */
 #define M_MOVLD(l,d)            M_FP3(0,5,d,l,0)                /* d = l      */
 
-#define M_MFC1(l,f)                            M_FP3(0,0,f,l,0)
-#define M_MTC1(l,f)                            M_FP3(0,4,f,l,0)
+#define M_DMFC1(l,f)                           M_FP3(0,1,f,l,0)
+#define M_DMTC1(l,f)                           M_FP3(0,5,f,l,0)
 
 #define M_FCMPFF(a,b)           M_FP3(0x30,FMT_F,a,b,0)         /* c = a == b */
 #define M_FCMPFD(a,b)           M_FP3(0x30,FMT_D,a,b,0)         /* c = a == b */