From: Julian Seward Date: Sun, 23 Nov 2014 12:01:33 +0000 (+0000) Subject: Merge, from trunk, r14545 X-Git-Tag: svn/VALGRIND_3_10_1~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec2f3f908bd2ff09d168b24232527d844ce2efeb;p=thirdparty%2Fvalgrind.git Merge, from trunk, r14545 339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14745 --- diff --git a/memcheck/tests/ppc32/power_ISA2_05.c b/memcheck/tests/ppc32/power_ISA2_05.c index 3736c274ad..e57b9293b0 100644 --- a/memcheck/tests/ppc32/power_ISA2_05.c +++ b/memcheck/tests/ppc32/power_ISA2_05.c @@ -92,18 +92,18 @@ void test_double_pair_instrs() } __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 @@ void test_double_pair_instrs() __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 @@ void test_double_pair_instrs() 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 e4975fb4e1..75ac3ebe8f 100644 --- a/memcheck/tests/ppc32/power_ISA2_05.stdout.exp +++ b/memcheck/tests/ppc32/power_ISA2_05.stdout.exp @@ -18,7 +18,7 @@ fcpsgn sign=-10.101010, base=-11.111111 => -11.111111 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 5583d35d55..edd2a558f4 100644 --- a/memcheck/tests/ppc64/power_ISA2_05.c +++ b/memcheck/tests/ppc64/power_ISA2_05.c @@ -97,18 +97,18 @@ void test_double_pair_instrs() } __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 @@ void test_double_pair_instrs() __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 @@ void test_double_pair_instrs() 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 a87e75b8b0..7a851dbf20 100644 --- a/memcheck/tests/ppc64/power_ISA2_05.stdout.exp +++ b/memcheck/tests/ppc64/power_ISA2_05.stdout.exp @@ -19,7 +19,7 @@ fcpsgn sign=-10.101010, base=-11.111111 => -11.111111 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