Skip to contentSkip to conversation

MIPS: add support for cvt.s.d and cvt.d.s

PATCH In review Aurelien Jarno 2 participants 3 messages Sep 28, 2006 – Oct 23, 2006 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: add support for cvt.s.d and cvt.d.s

Hi,

The patch below implements the cvt.s.d and cvt.d.s instructions for the mips target. They are need to be able to execute the cp and the find programs.

Bye,
Aurelien

Index: target-mips/op.c
===================================================================
RCS file: /sources/qemu/qemu/target-mips/op.c,v
retrieving revision 1.9

op.c +12 -0
diff -u -r1.9 op.c
@@ -785,12 +785,24 @@
 
 #define FLOAT_OP(name, p) void OPPROTO op_float_##name##_##p(void)
 
+FLOAT_OP(cvtd, s)
+{
+    FDT2 = float32_to_float64(WT0, &env->fp_status);
+    DEBUG_FPU_STATE();
+    RETURN();
+}
 FLOAT_OP(cvtd, w)
 {
     FDT2 = int32_to_float64(WT0, &env->fp_status);
     DEBUG_FPU_STATE();
     RETURN();
 }
+FLOAT_OP(cvts, d)
+{
+    FST2 = float64_to_float32(WT0, &env->fp_status);
+    DEBUG_FPU_STATE();
+    RETURN();
+}
 FLOAT_OP(cvts, w)
 {
     FST2 = int32_to_float32(WT0, &env->fp_status);

Index: target-mips/translate.c
===================================================================
RCS file: /sources/qemu/qemu/target-mips/translate.c,v retrieving revision 1.15

translate.c +14 -0
diff -u -r1.15 translate.c
@@ -1675,6 +1675,13 @@
         GEN_STORE_FTN_FREG(fd, WT2);
         opn = "ceil.w.d";
         break;
+    case FOP(33, 16): /* cvt.d.s */
+        CHECK_FR(ctx, fs | fd);
+        GEN_LOAD_FREG_FTN(WT0, fs);
+        gen_op_float_cvtd_s();
+        GEN_STORE_FTN_FREG(fd, DT2);
+        opn = "cvt.d.s";
+        break;
     case FOP(33, 20): /* cvt.d.w */
         CHECK_FR(ctx, fs | fd);
         GEN_LOAD_FREG_FTN(WT0, fs);
@@ -1782,6 +1789,13 @@
         GEN_STORE_FTN_FREG(fd, WT2);
         opn = "trunc.w.s";
         break;
+    case FOP(32, 17): /* cvt.s.d */
+        CHECK_FR(ctx, fs | fd);
+        GEN_LOAD_FREG_FTN(WT0, fs);
+        gen_op_float_cvts_d();
+        GEN_STORE_FTN_FREG(fd, WT2);
+        opn = "cvt.s.d";
+        break;
     case FOP(32, 20): /* cvt.s.w */
         CHECK_FR(ctx, fs | fd);
         GEN_LOAD_FREG_FTN(WT0, fs);
Signature · 4 lines
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   [email protected]         | [email protected]
   `-    people.debian.org/~aurel32 | www.aurel32.net
#1 lore raw

Hi all,

The patch below has been posted 3 weeks ago, but I haven't received any comment yet. If you need to be convinced that the patch is needed, you can download a test case from http://temp.aurel32.net/test_cvt.tar.gz made using files from Debian unstable:

[bode:/tmp]$ tar xvfz test_cvt.tar.gz
test_cvt/
test_cvt/bin/
test_cvt/bin/find
test_cvt/etc/
test_cvt/etc/ld.so.cache
test_cvt/lib/
test_cvt/lib/ld.so.1
test_cvt/lib/libc.so.6
[bode:/tmp]$ cd test_cvt/
[bode:/tmp/test_cvt]$ qemu-mips.orig -L $PWD bin/find
qemu: uncaught target signal 4 (Illegal instruction) - exiting
[bode:/tmp/test_cvt]$ qemu-mips -L $PWD bin/find
.
./lib
./lib/libc.so.6
./lib/ld.so.1
./etc
./etc/ld.so.cache
./bin
./bin/find

qemu-mips.orig is the qemu binary without the patch, qemu-mips is the qemu binary with the patch.

Could somebody please have a look to the patch (or even merge it)?

Thanks,
Aurelien

Quoted 77 lines · Aurelien Jarno

Hi,

The patch below implements the cvt.s.d and cvt.d.s instructions for the mips target. They are need to be able to execute the cp and the find programs.

Bye,
Aurelien

Index: target-mips/op.c
===================================================================
RCS file: /sources/qemu/qemu/target-mips/op.c,v
retrieving revision 1.9
diff -u -r1.9 op.c

op.c +12 -0
@@ -785,12 +785,24 @@
 
 #define FLOAT_OP(name, p) void OPPROTO op_float_##name##_##p(void)
 
+FLOAT_OP(cvtd, s)
+{
+    FDT2 = float32_to_float64(WT0, &env->fp_status);
+    DEBUG_FPU_STATE();
+    RETURN();
+}
 FLOAT_OP(cvtd, w)
 {
     FDT2 = int32_to_float64(WT0, &env->fp_status);
     DEBUG_FPU_STATE();
     RETURN();
 }
+FLOAT_OP(cvts, d)
+{
+    FST2 = float64_to_float32(WT0, &env->fp_status);
+    DEBUG_FPU_STATE();
+    RETURN();
+}
 FLOAT_OP(cvts, w)
 {
     FST2 = int32_to_float32(WT0, &env->fp_status);

Index: target-mips/translate.c
===================================================================
RCS file: /sources/qemu/qemu/target-mips/translate.c,v retrieving revision 1.15
diff -u -r1.15 translate.c

translate.c +14 -0
@@ -1675,6 +1675,13 @@
         GEN_STORE_FTN_FREG(fd, WT2);
         opn = "ceil.w.d";
         break;
+    case FOP(33, 16): /* cvt.d.s */
+        CHECK_FR(ctx, fs | fd);
+        GEN_LOAD_FREG_FTN(WT0, fs);
+        gen_op_float_cvtd_s();
+        GEN_STORE_FTN_FREG(fd, DT2);
+        opn = "cvt.d.s";
+        break;
     case FOP(33, 20): /* cvt.d.w */
         CHECK_FR(ctx, fs | fd);
         GEN_LOAD_FREG_FTN(WT0, fs);
@@ -1782,6 +1789,13 @@
         GEN_STORE_FTN_FREG(fd, WT2);
         opn = "trunc.w.s";
         break;
+    case FOP(32, 17): /* cvt.s.d */
+        CHECK_FR(ctx, fs | fd);
+        GEN_LOAD_FREG_FTN(WT0, fs);
+        gen_op_float_cvts_d();
+        GEN_STORE_FTN_FREG(fd, WT2);
+        opn = "cvt.s.d";
+        break;
     case FOP(32, 20): /* cvt.s.w */
         CHECK_FR(ctx, fs | fd);
         GEN_LOAD_FREG_FTN(WT0, fs);
Signature · 4 lines
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   [email protected]         | [email protected]
   `-    people.debian.org/~aurel32 | www.aurel32.net
#2 lore raw
Quoted 1 line · Aurelien Jarno

Could somebody please have a look to the patch (or even merge it)?

Looks ok to me.

Regards,
Marius

Signature · 4 lines
Marius Groeger <[email protected]>
SYSGO AG                      Embedded and Real-Time Software
Voice: +49 6136 9948 0                  FAX: +49 6136 9948 10
www.sysgo.com | www.elinos.com | www.osek.de | www.pikeos.com