Valgrind regression test fix for stfdpx instruction.
There is a bug in the stfdpx instruction test for ppc32 and ppc64.
The inline assembly to move the arguments into the registers before
the store instruction were moving from the register not to the
register. The error has been fixed. This results in a change in
the expected output.
Additionally, it was noted that the inline assembly was using "f" rather
then "d" for the double arguments. Similarly, the prints should have
been %lf not %f for doubles. These changes were made but they did not
change the output of the tests.
This patch fixes Vagrind bugzilla 339020.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14545 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/ppc32/power_ISA2_05.c b/memcheck/tests/ppc32/power_ISA2_05.c
index 3736c27..e57b929 100644
--- a/memcheck/tests/ppc32/power_ISA2_05.c
+++ b/memcheck/tests/ppc32/power_ISA2_05.c
@@ -92,18 +92,18 @@
}
__asm__ volatile ("lfdp 10, %0"::"m" (dbl_pair[0]));
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
- printf("lfdp (%f, %f) => F_hi=%f, F_lo=%f\n",
+ __asm__ volatile ("fmr %0, 10":"=d" (FRT1));
+ __asm__ volatile ("fmr %0, 11":"=d" (FRT2));
+ printf("lfdp (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
dbl_pair[0].hi, dbl_pair[0].lo, FRT1, FRT2);
FRT1 = 2.2048;
FRT2 = -4.1024;
- __asm__ volatile ("fmr 10, %0"::"f" (FRT1));
- __asm__ volatile ("fmr 11, %0"::"f" (FRT2));
+ __asm__ volatile ("fmr 10, %0"::"d" (FRT1));
+ __asm__ volatile ("fmr 11, %0"::"d" (FRT2));
__asm__ volatile ("stfdp 10, %0"::"m" (dbl_pair[1]));
- printf("stfdp (%f, %f) => F_hi=%f, F_lo=%f\n",
+ printf("stfdp (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
FRT1, FRT2, dbl_pair[1].hi, dbl_pair[1].lo);
FRT1 = 0.0;
@@ -113,9 +113,9 @@
__asm__ volatile ("ori 20, %0, 0"::"r" (base));
__asm__ volatile ("ori 21, %0, 0"::"r" (offset));
__asm__ volatile ("lfdpx 10, 20, 21");
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
- printf("lfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
+ __asm__ volatile ("fmr %0, 10":"=d" (FRT1));
+ __asm__ volatile ("fmr %0, 11":"=d" (FRT2));
+ printf("lfdpx (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
dbl_pair[1].hi, dbl_pair[1].lo, FRT1, FRT2);
FRT1 = 8.2048;
@@ -124,10 +124,10 @@
offset = (unsigned long) &dbl_pair[2] - base;
__asm__ volatile ("ori 20, %0, 0"::"r" (base));
__asm__ volatile ("ori 21, %0, 0"::"r" (offset));
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
+ __asm__ volatile ("fmr 10, %0 "::"d" (FRT1));
+ __asm__ volatile ("fmr 11, %0 "::"d" (FRT2));
__asm__ volatile ("stfdpx 10, 20, 21");
- printf("stfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
+ printf("stfdpx (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
FRT1, FRT2, dbl_pair[2].hi, dbl_pair[2].lo);
#endif
}
diff --git a/memcheck/tests/ppc32/power_ISA2_05.stdout.exp b/memcheck/tests/ppc32/power_ISA2_05.stdout.exp
index e4975fb..75ac3eb 100644
--- a/memcheck/tests/ppc32/power_ISA2_05.stdout.exp
+++ b/memcheck/tests/ppc32/power_ISA2_05.stdout.exp
@@ -18,7 +18,7 @@
lfdp (-1024.000000, 1025.000000) => F_hi=-1024.000000, F_lo=1025.000000
stfdp (2.204800, -4.102400) => F_hi=2.204800, F_lo=-4.102400
lfdpx (2.204800, -4.102400) => F_hi=2.204800, F_lo=-4.102400
-stfdpx (2.204800, 2.204800) => F_hi=2.204800, F_lo=2.204800
+stfdpx (8.204800, -16.102400) => F_hi=8.204800, F_lo=-16.102400
lfiwax (-1024.000000) => FRT=(ffffffff, c0900000)
prtyw (0) => parity=0
prtyw (1) => parity=1
diff --git a/memcheck/tests/ppc64/power_ISA2_05.c b/memcheck/tests/ppc64/power_ISA2_05.c
index 5583d35..edd2a55 100644
--- a/memcheck/tests/ppc64/power_ISA2_05.c
+++ b/memcheck/tests/ppc64/power_ISA2_05.c
@@ -97,18 +97,18 @@
}
__asm__ volatile ("lfdp 10, %0"::"m" (dbl_pair[0]));
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
- printf("lfdp (%f, %f) => F_hi=%f, F_lo=%f\n",
+ __asm__ volatile ("fmr %0, 10":"=d" (FRT1));
+ __asm__ volatile ("fmr %0, 11":"=d" (FRT2));
+ printf("lfdp (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
dbl_pair[0].hi, dbl_pair[0].lo, FRT1, FRT2);
FRT1 = 2.2048;
FRT2 = -4.1024;
- __asm__ volatile ("fmr 10, %0"::"f" (FRT1));
- __asm__ volatile ("fmr 11, %0"::"f" (FRT2));
+ __asm__ volatile ("fmr 10, %0"::"d" (FRT1));
+ __asm__ volatile ("fmr 11, %0"::"d" (FRT2));
__asm__ volatile ("stfdp 10, %0"::"m" (dbl_pair[1]));
- printf("stfdp (%f, %f) => F_hi=%f, F_lo=%f\n",
+ printf("stfdp (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
FRT1, FRT2, dbl_pair[1].hi, dbl_pair[1].lo);
FRT1 = 0.0;
@@ -118,9 +118,9 @@
__asm__ volatile ("ori 20, %0, 0"::"r" (base));
__asm__ volatile ("ori 21, %0, 0"::"r" (offset));
__asm__ volatile ("lfdpx 10, 20, 21");
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
- printf("lfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
+ __asm__ volatile ("fmr %0, 10":"=d" (FRT1));
+ __asm__ volatile ("fmr %0, 11":"=d" (FRT2));
+ printf("lfdpx (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
dbl_pair[1].hi, dbl_pair[1].lo, FRT1, FRT2);
FRT1 = 8.2048;
@@ -129,10 +129,10 @@
offset = (unsigned long) &dbl_pair[2] - base;
__asm__ volatile ("ori 20, %0, 0"::"r" (base));
__asm__ volatile ("ori 21, %0, 0"::"r" (offset));
- __asm__ volatile ("fmr %0, 10":"=f" (FRT1));
- __asm__ volatile ("fmr %0, 11":"=f" (FRT2));
+ __asm__ volatile ("fmr 10, %0 "::"d" (FRT1));
+ __asm__ volatile ("fmr 11, %0 "::"d" (FRT2));
__asm__ volatile ("stfdpx 10, 20, 21");
- printf("stfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
+ printf("stfdpx (%lf, %lf) => F_hi=%lf, F_lo=%lf\n",
FRT1, FRT2, dbl_pair[2].hi, dbl_pair[2].lo);
#endif
}
diff --git a/memcheck/tests/ppc64/power_ISA2_05.stdout.exp b/memcheck/tests/ppc64/power_ISA2_05.stdout.exp
index a87e75b..7a851db 100644
--- a/memcheck/tests/ppc64/power_ISA2_05.stdout.exp
+++ b/memcheck/tests/ppc64/power_ISA2_05.stdout.exp
@@ -19,7 +19,7 @@
lfdp (-1024.000000, 1025.000000) => F_hi=-1024.000000, F_lo=1025.000000
stfdp (2.204800, -4.102400) => F_hi=2.204800, F_lo=-4.102400
lfdpx (2.204800, -4.102400) => F_hi=2.204800, F_lo=-4.102400
-stfdpx (2.204800, 2.204800) => F_hi=2.204800, F_lo=2.204800
+stfdpx (8.204800, -16.102400) => F_hi=8.204800, F_lo=-16.102400
lfiwax (-1024.000000) => FRT=(ffffffff, c4800000)
prtyd (0) => parity=0
prtyw (0) => parity=0
