From: Julian Seward Date: Thu, 28 Jun 2012 18:40:43 +0000 (+0000) Subject: Fix inline assembly for the "lfiwax" insn test. #302536. X-Git-Tag: svn/VALGRIND_3_8_0~187 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=241b6776bab0efa4f4af0570171a12a8a1ed6d7e;p=thirdparty%2Fvalgrind.git Fix inline assembly for the "lfiwax" insn test. #302536. (Carl Love, carll@us.ibm.com) git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12681 --- diff --git a/memcheck/tests/ppc32/power_ISA2_05.c b/memcheck/tests/ppc32/power_ISA2_05.c index d96ef9c576..f85b547f5f 100644 --- a/memcheck/tests/ppc32/power_ISA2_05.c +++ b/memcheck/tests/ppc32/power_ISA2_05.c @@ -40,7 +40,7 @@ void test_parity_instrs() void test_lfiwax() { unsigned long base; - unsigned long offset; + // unsigned long offset; typedef struct { unsigned int hi; @@ -50,9 +50,8 @@ void test_lfiwax() int_pair_t *ip; foo = -1024.0; base = (unsigned long) &foo; - offset = 0; - __asm__ volatile ("lfiwax %0, %1, %2":"=f" (FRT1):"r"(base), - "r"(offset)); + + __asm__ volatile ("lfiwax %0, 0, %1":"=f" (FRT1):"r"(base)); ip = (int_pair_t *) & FRT1; printf("lfiwax (%f) => FRT=(%x, %x)\n", foo, ip->hi, ip->lo); diff --git a/memcheck/tests/ppc64/power_ISA2_05.c b/memcheck/tests/ppc64/power_ISA2_05.c index d96ef9c576..dcf0e7aacb 100644 --- a/memcheck/tests/ppc64/power_ISA2_05.c +++ b/memcheck/tests/ppc64/power_ISA2_05.c @@ -40,7 +40,6 @@ void test_parity_instrs() void test_lfiwax() { unsigned long base; - unsigned long offset; typedef struct { unsigned int hi; @@ -50,9 +49,8 @@ void test_lfiwax() int_pair_t *ip; foo = -1024.0; base = (unsigned long) &foo; - offset = 0; - __asm__ volatile ("lfiwax %0, %1, %2":"=f" (FRT1):"r"(base), - "r"(offset)); + + __asm__ volatile ("lfiwax %0, 0, %1":"=f" (FRT1):"r"(base)); ip = (int_pair_t *) & FRT1; printf("lfiwax (%f) => FRT=(%x, %x)\n", foo, ip->hi, ip->lo); diff --git a/memcheck/tests/ppc64/power_ISA2_05.stdout.exp b/memcheck/tests/ppc64/power_ISA2_05.stdout.exp index b5a7458d2d..32978382e3 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, -4.102400) => F_hi=2.204800, F_lo=-4.102400 +stfdpx (2.204800, 2.204800) => F_hi=2.204800, F_lo=2.204800 lfiwax (-1024.000000) => FRT=(ffffffff, c0900000) prtyd (0) => parity=0 prtyw (0) => parity=0