|
From: <sv...@va...> - 2012-06-28 18:40:56
|
sewardj 2012-06-28 19:40:43 +0100 (Thu, 28 Jun 2012)
New Revision: 12681
Log:
Fix inline assembly for the "lfiwax" insn test. #302536.
(Carl Love, ca...@us...)
Modified files:
trunk/memcheck/tests/ppc32/power_ISA2_05.c
trunk/memcheck/tests/ppc64/power_ISA2_05.c
trunk/memcheck/tests/ppc64/power_ISA2_05.stdout.exp
Modified: trunk/memcheck/tests/ppc32/power_ISA2_05.c (+3 -4)
===================================================================
--- trunk/memcheck/tests/ppc32/power_ISA2_05.c 2012-06-28 10:58:05 +01:00 (rev 12680)
+++ trunk/memcheck/tests/ppc32/power_ISA2_05.c 2012-06-28 19:40:43 +01:00 (rev 12681)
@@ -40,7 +40,7 @@
void test_lfiwax()
{
unsigned long base;
- unsigned long offset;
+ // unsigned long offset;
typedef struct {
unsigned int hi;
@@ -50,9 +50,8 @@
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);
Modified: trunk/memcheck/tests/ppc64/power_ISA2_05.c (+2 -4)
===================================================================
--- trunk/memcheck/tests/ppc64/power_ISA2_05.c 2012-06-28 10:58:05 +01:00 (rev 12680)
+++ trunk/memcheck/tests/ppc64/power_ISA2_05.c 2012-06-28 19:40:43 +01:00 (rev 12681)
@@ -40,7 +40,6 @@
void test_lfiwax()
{
unsigned long base;
- unsigned long offset;
typedef struct {
unsigned int hi;
@@ -50,9 +49,8 @@
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);
Modified: trunk/memcheck/tests/ppc64/power_ISA2_05.stdout.exp (+1 -1)
===================================================================
--- trunk/memcheck/tests/ppc64/power_ISA2_05.stdout.exp 2012-06-28 10:58:05 +01:00 (rev 12680)
+++ trunk/memcheck/tests/ppc64/power_ISA2_05.stdout.exp 2012-06-28 19:40:43 +01:00 (rev 12681)
@@ -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, -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
|