From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 23 Jun 2012 11:04:01 +0000 (+0000)
Subject: Fix compiler warnings for ppc test cases. Patch from Carl Love (carll@us.ibm.com... 
X-Git-Tag: svn/VALGRIND_3_8_0~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8235b63124da6b0ec7b05fca206a6c26776407d0;p=thirdparty%2Fvalgrind.git

Fix compiler warnings for ppc test cases. Patch from Carl Love (carll@us.ibm.com). See also #302205.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12663
---

diff --git a/memcheck/tests/ppc32/power_ISA2_05.c b/memcheck/tests/ppc32/power_ISA2_05.c
index 82893a2976..d96ef9c576 100644
--- a/memcheck/tests/ppc32/power_ISA2_05.c
+++ b/memcheck/tests/ppc32/power_ISA2_05.c
@@ -66,7 +66,7 @@ void test_lfiwax()
 ** FPp+1= rightmost 64 bits stored at DS(RA)
 ** FPp must be an even float register
 */
-int test_double_pair_instrs()
+void test_double_pair_instrs()
 {
    typedef struct {
       double hi;
@@ -75,14 +75,6 @@ int test_double_pair_instrs()
 
    /* the following decls are for alignment */
    int i;
-   int j;
-   int k;
-   int l;
-#ifdef __powerpc64__
-   int m;
-   int n;
-   int o;
-#endif
    dbl_pair_t dbl_pair[3];      /* must be quad word aligned */
    unsigned long base;
    unsigned long offset;
@@ -130,11 +122,6 @@ int test_double_pair_instrs()
    __asm__ volatile ("stfdpx 10, 20, 21");
    printf("stfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
           FRT1, FRT2, dbl_pair[2].hi, dbl_pair[2].lo);
-#ifdef __powerpc64__
-   return i + j + k + l + m + n + o;
-#else
-   return i + j + k + l;
-#endif
 }
 
 
@@ -170,11 +157,10 @@ void test_fcpsgn()
 }
 
 /* b0 may be non-zero in lwarx/ldarx Power6 instrs */
-int test_reservation()
+void test_reservation()
 {
 
    int RT;
-   int i, j;
    unsigned long base;
    unsigned long offset;
    long arr[4] = { 0xdeadbeef, 0xbad0beef, 0xbeefdead, 0xbeef0bad };
@@ -193,7 +179,7 @@ int test_reservation()
    __asm__ volatile ("ldarx %0, 20, 21, 1":"=r" (RT));
    printf("ldarx => %x\n", RT);
 #endif
-   return i + j;
+
 }
 
 int main(void)
diff --git a/memcheck/tests/ppc64/power_ISA2_05.c b/memcheck/tests/ppc64/power_ISA2_05.c
index 82893a2976..d96ef9c576 100644
--- a/memcheck/tests/ppc64/power_ISA2_05.c
+++ b/memcheck/tests/ppc64/power_ISA2_05.c
@@ -66,7 +66,7 @@ void test_lfiwax()
 ** FPp+1= rightmost 64 bits stored at DS(RA)
 ** FPp must be an even float register
 */
-int test_double_pair_instrs()
+void test_double_pair_instrs()
 {
    typedef struct {
       double hi;
@@ -75,14 +75,6 @@ int test_double_pair_instrs()
 
    /* the following decls are for alignment */
    int i;
-   int j;
-   int k;
-   int l;
-#ifdef __powerpc64__
-   int m;
-   int n;
-   int o;
-#endif
    dbl_pair_t dbl_pair[3];      /* must be quad word aligned */
    unsigned long base;
    unsigned long offset;
@@ -130,11 +122,6 @@ int test_double_pair_instrs()
    __asm__ volatile ("stfdpx 10, 20, 21");
    printf("stfdpx (%f, %f) => F_hi=%f, F_lo=%f\n",
           FRT1, FRT2, dbl_pair[2].hi, dbl_pair[2].lo);
-#ifdef __powerpc64__
-   return i + j + k + l + m + n + o;
-#else
-   return i + j + k + l;
-#endif
 }
 
 
@@ -170,11 +157,10 @@ void test_fcpsgn()
 }
 
 /* b0 may be non-zero in lwarx/ldarx Power6 instrs */
-int test_reservation()
+void test_reservation()
 {
 
    int RT;
-   int i, j;
    unsigned long base;
    unsigned long offset;
    long arr[4] = { 0xdeadbeef, 0xbad0beef, 0xbeefdead, 0xbeef0bad };
@@ -193,7 +179,7 @@ int test_reservation()
    __asm__ volatile ("ldarx %0, 20, 21, 1":"=r" (RT));
    printf("ldarx => %x\n", RT);
 #endif
-   return i + j;
+
 }
 
 int main(void)
diff --git a/none/tests/ppc32/jm-insns.c b/none/tests/ppc32/jm-insns.c
index 3249d23ad3..760ea05d9e 100644
--- a/none/tests/ppc32/jm-insns.c
+++ b/none/tests/ppc32/jm-insns.c
@@ -4624,12 +4624,17 @@ static void test_int_two_args (const char* name, test_func_t func,
 {
    volatile HWord_t res;
    volatile uint32_t flags, xer, xer_orig;
-   int i, j, is_div, zap_hi32;
+   int i, j, is_div;
+#ifdef __powerpc64__
+   int zap_hi32;
+#endif
 
    // catches div, divwu, divo, divwu, divwuo, and . variants
    is_div = strstr(name, "divw") != NULL;
 
+#ifdef __powerpc64__
    zap_hi32 = strstr(name, "mulhw") != NULL;
+#endif
    
    xer_orig = 0x00000000;
  redo:
diff --git a/none/tests/ppc32/power5+_round.c b/none/tests/ppc32/power5+_round.c
index d6f6bc3206..b11e67bd9b 100644
--- a/none/tests/ppc32/power5+_round.c
+++ b/none/tests/ppc32/power5+_round.c
@@ -86,25 +86,11 @@ int main(int argc, char *argv[])
       double friz[] = { inf, 1.0, 1.0, 0, neg0, -1.0, -1.0, -inf, nan };
       double frip[] = { inf, 2.0, 2.0, 0, neg0, -1.0, -1.0, -inf, nan };
       double frim[] = { inf, 1.0, 1.0, 0, neg0, -2.0, -2.0, -inf, nan };
-      int fprf[] = { POS_INF, POS_NORMAL, POS_NORMAL, POS_ZERO, NEG_ZERO,
-         NEG_NORMAL, NEG_NORMAL, NEG_INF, NAN
-      };
       double set2[] = { 0.9, 0.1, -0.1, -0.9, 1e-40, -1e-40 };
       double frin2[] = { 1.0, 0.0, -0.0, -1.0, 0.0, -0.0 };
-      int frin2rf[] =
-          { POS_NORMAL, POS_ZERO, NEG_ZERO, NEG_NORMAL, POS_ZERO,
- NEG_ZERO };
       double friz2[] = { 0.0, 0.0, -0.0, -0.0, 0.0, -0.0 };
-      int friz2rf[] =
-          { POS_ZERO, POS_ZERO, NEG_ZERO, NEG_ZERO, POS_ZERO, NEG_ZERO };
       double frip2[] = { 1.0, 1.0, -0.0, -0.0, 1.0, -0.0 };
-      int frip2rf[] =
-          { POS_NORMAL, POS_NORMAL, NEG_ZERO, NEG_ZERO, POS_NORMAL,
- NEG_ZERO };
       double frim2[] = { 0.0, 0.0, -1.0, -1.0, 0.0, -1.0 };
-      int frim2rf[] =
-          { POS_ZERO, POS_ZERO, NEG_NORMAL, NEG_NORMAL, POS_ZERO,
- NEG_NORMAL };
       double ret;
       int i;
 
@@ -136,26 +122,15 @@ int main(int argc, char *argv[])
       double set1[] = { inf, 0.9, 0.1, 0, neg0, -0.1, -0.9, -inf, nan };
       double frsp1[] =
           { inf, 0.9f, 0.1f, 0, neg0, -0.1f, -0.9f, -inf, nan };
-      int fprf1[] =
-          { POS_INF, POS_NORMAL, POS_NORMAL, POS_ZERO, NEG_ZERO,
-   NEG_NORMAL,
-         NEG_NORMAL, NEG_INF, NAN
-      };
       double set2[] =
           { 1.2e-38, 1.1e-38, 1e-40, 8e-44, 9e-44, 8e-46, 7e-46 };
       double frsp2[] =
           { 1.2e-38f, 1.1e-38f, 1e-40f, 8e-44f, 9e-44f, 8e-46f, 0.0 };
-      int fprf2[] = { POS_NORMAL, POS_DENORMAL, POS_DENORMAL, POS_DENORMAL,
-         POS_DENORMAL, POS_DENORMAL, POS_ZERO
-      };
       double set3[] =
           { -1.2e-38, -1.1e-38, -1e-40, -8e-44, -9e-44, -8e-46, -7e-46 };
       double frsp3[] =
           { -1.2e-38f, -1.1e-38f, -1e-40f, -8e-44f, -9e-44f, -8e-46f,
 -0.0 };
-      int fprf3[] = { NEG_NORMAL, NEG_DENORMAL, NEG_DENORMAL, NEG_DENORMAL,
-         NEG_DENORMAL, NEG_DENORMAL, NEG_ZERO
-      };
       double ret;
       int i;
       DO_TEST(frsp, set1, frsp1, fprf1);
diff --git a/none/tests/ppc32/round.c b/none/tests/ppc32/round.c
index f49c0b50dd..dd2bef6556 100644
--- a/none/tests/ppc32/round.c
+++ b/none/tests/ppc32/round.c
@@ -142,7 +142,6 @@ int check_dbl_to_flt_round(round_mode_t mode, double dbl, float *expected)
 	int status = 0;
 	flt_overlay R, E;
 	char *result;
-	char *eq_ne;
 
 	set_rounding_mode(mode);
 
@@ -153,11 +152,9 @@ int check_dbl_to_flt_round(round_mode_t mode, double dbl, float *expected)
 		(R.layout.exp != E.layout.exp) ||
 		(R.layout.frac != E.layout.frac)) {
 		result = "FAILED";
-		eq_ne = "!=";
 		status = 1;
 	} else {
 		result = "PASSED";
-		eq_ne = "==";
 		status = 0;
 	}
 	printf("%s:%s:(double)(%-20a) = %20a",
diff --git a/none/tests/ppc32/test_dfp2.c b/none/tests/ppc32/test_dfp2.c
index 965191c8f9..31bdae9e46 100644
--- a/none/tests/ppc32/test_dfp2.c
+++ b/none/tests/ppc32/test_dfp2.c
@@ -576,14 +576,12 @@ static void test_dfp_two_arg_ops(int unused)
 static void test_dcffix_dcffixq(int has_vsx)
 {
    test_func_t func;
-   unsigned long long u0, u0x;
+   unsigned long long u0;
    double res, d0, *d0p;
-   double d0x, *d0xp;
    int k = 0, round_mode;
 
-   u0x = 0;
    d0p = &d0;
-   d0xp = &d0x;
+
 
    while ((func = dfp_dcffix_dcffixq_tests[k].test_func)) {
       int i;
diff --git a/none/tests/ppc32/test_dfp3.c b/none/tests/ppc32/test_dfp3.c
index e34b2d1b01..4fe3137ed2 100644
--- a/none/tests/ppc32/test_dfp3.c
+++ b/none/tests/ppc32/test_dfp3.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 
 #if defined(HAS_DFP)
 
@@ -868,7 +869,7 @@ static void test_dfp_qua_ops(void)
    unsigned long long u0, u0x, u1, u1x;
    double res, d0, d1, *d0p, *d1p;
    double d0x, d1x, *d0xp, *d1xp;
-   int k = 0, BF;
+   int k = 0;
    u0x = u1x = 0;
    d0p = &d0;
    d0xp = &d0x;
@@ -878,7 +879,6 @@ static void test_dfp_qua_ops(void)
    while ((func = dfp_qua_tests[k].test_func)) {
       int i, RMC;
       dfp_test_t test_def = dfp_qua_tests[k];
-      BF = 0;
 
       for (i = 0; i < test_def.num_tests; i++) {
          if (test_def.precision == LONG_TEST) {
@@ -945,7 +945,7 @@ static void test_dfp_rrnd_ops(void)
       dfp_one_arg_test_t test_def = dfp_rrnd_tests[k];
 
       for (i = 0; i < NUM_DFP_VALS; i++) {
-         int R, RMC;
+         int RMC;
 
          if (test_def.precision == LONG_TEST) {
             u0 = dfp64_vals[i];
diff --git a/none/tests/ppc32/test_dfp4.c b/none/tests/ppc32/test_dfp4.c
index bf6bfb4299..7cd8721567 100644
--- a/none/tests/ppc32/test_dfp4.c
+++ b/none/tests/ppc32/test_dfp4.c
@@ -484,7 +484,7 @@ static void test_dfp_ClassAndGroupTest_ops(void)
    int k = 0;
 
    while ((func = dfp_ClassAndGroupTest_tests[k].test_func)) {
-      int i, j;
+      int i;
       dfp_one_arg_test_t test_def = dfp_ClassAndGroupTest_tests[k];
 
       for (i = 0; i < NUM_DFP_VALS; i++) {
diff --git a/none/tests/ppc32/test_dfp5.c b/none/tests/ppc32/test_dfp5.c
index d1d2a75aa9..64008b6dd1 100644
--- a/none/tests/ppc32/test_dfp5.c
+++ b/none/tests/ppc32/test_dfp5.c
@@ -138,7 +138,7 @@ static void _test_dtstsfq(unsigned int BF, unsigned int ref_sig, dfp_val_t valB)
 
 static dfp_val_t _test_ddedpd(unsigned int SP, dfp_val_t valB)
 {
-   _Decimal64 ret;
+   _Decimal64 ret = 0;
    dfp_val_t result;
    _Decimal64 f16 = valB.dec_val;
    switch (SP) {
@@ -165,7 +165,7 @@ static dfp_val_t _test_ddedpd(unsigned int SP, dfp_val_t valB)
 
 static dfp_val_t _test_ddedpdq(unsigned int SP, dfp_val_t valB)
 {
-   _Decimal128 ret;
+   _Decimal128 ret = 0;
    dfp_val_t result;
    _Decimal128 f16 = valB.dec_val128;
    switch (SP) {
@@ -191,7 +191,7 @@ static dfp_val_t _test_ddedpdq(unsigned int SP, dfp_val_t valB)
 
 static dfp_val_t _test_denbcd(unsigned int S, dfp_val_t valB)
 {
-   _Decimal64 ret;
+   _Decimal64 ret = 0;
    dfp_val_t result;
    _Decimal64 f16 = valB.dec_val;
    switch (S) {
@@ -212,7 +212,7 @@ static dfp_val_t _test_denbcd(unsigned int S, dfp_val_t valB)
 
 static dfp_val_t _test_denbcdq(unsigned int S, dfp_val_t valB)
 {
-   _Decimal128 ret;
+   _Decimal128 ret = 0;
    dfp_val_t result;
    _Decimal128 f16 = valB.dec_val128;
    switch (S) {
@@ -408,7 +408,7 @@ static void test_dfp_ddedpd_ops(void)
    int k = 0;
 
    while ((func = dfp_test_dfp_ddedpd_tests[k].test_func)) {
-      int i, j;
+      int i;
       dfp_one_arg_bcd_test_t test_def = dfp_test_dfp_ddedpd_tests[k];
 
       for (i = 0; i < NUM_DFP_VALS; i++) {
@@ -457,7 +457,7 @@ static void test_dfp_denbcd_ops(void)
    int k = 0;
 
    while ((func = dfp_test_dfp_denbcd_tests[k].test_func)) {
-      int i, j;
+      int i;
       dfp_one_arg_bcd_test_t test_def = dfp_test_dfp_denbcd_tests[k];
       if (test_def.precision == LONG_TEST)
          num_test_vals = sizeof(bcd64_vals)/sizeof(unsigned long long);
diff --git a/none/tests/ppc32/test_isa_2_06_part1.c b/none/tests/ppc32/test_isa_2_06_part1.c
index 9138f4ad3c..25dcc2ec9b 100644
--- a/none/tests/ppc32/test_isa_2_06_part1.c
+++ b/none/tests/ppc32/test_isa_2_06_part1.c
@@ -1868,8 +1868,7 @@ do_store_test ( ldst_test_t storeTest )
 {
    test_func_t func;
    unsigned int *src, *dst;
-   int i, j, m, equality;
-   i = j = 0;
+   int m, equality;
 
    func = storeTest.test_func;
    r14 = (HWord_t) storeTest.base_addr;
diff --git a/none/tests/ppc32/test_isa_2_06_part2.c b/none/tests/ppc32/test_isa_2_06_part2.c
index 91a3161104..d9f2453773 100644
--- a/none/tests/ppc32/test_isa_2_06_part2.c
+++ b/none/tests/ppc32/test_isa_2_06_part2.c
@@ -1529,12 +1529,12 @@ signed long long div_dw_tdata[13][2] = {
                                        { 4, 4 },
                                        { 4, -5 },
                                        { 3, 8 },
-                                       { 0x8000000000000000, 0xa },
+                                       { 0x8000000000000000ULL, 0xa },
                                        { 0x50c, -1 },
                                        { 0x50c, -4096 },
                                        { 0x1234fedc, 0x8000a873 },
-                                       { 0xabcd87651234fedc, 0xa123b893 },
-                                       { 0x123456789abdc, 0 },
+                                       { 0xabcd87651234fedcULL, 0xa123b893 },
+                                       { 0x123456789abdcULL, 0 },
                                        { 0, 2 },
                                        { 0x77, 0xa3499 }
 };
diff --git a/none/tests/ppc32/test_isa_2_06_part3.c b/none/tests/ppc32/test_isa_2_06_part3.c
index 2f86760af1..a3639a66a6 100644
--- a/none/tests/ppc32/test_isa_2_06_part3.c
+++ b/none/tests/ppc32/test_isa_2_06_part3.c
@@ -1303,12 +1303,12 @@ signed long long div_dw_tdata[13][2] = {
                                        { 4, 4 },
                                        { 4, -5 },
                                        { 3, 8 },
-                                       { 0x8000000000000000, 0xa },
+                                       { 0x8000000000000000ULL, 0xa },
                                        { 0x50c, -1 },
                                        { 0x50c, -4096 },
                                        { 0x1234fedc, 0x8000a873 },
-                                       { 0xabcd87651234fedc, 0xa123b893 },
-                                       { 0x123456789abdc, 0 },
+                                       { 0xabcd87651234fedcULL, 0xa123b893 },
+                                       { 0x123456789abdcULL, 0 },
                                        { 0, 2 },
                                        { 0x77, 0xa3499 }
 };
diff --git a/none/tests/ppc64/round.c b/none/tests/ppc64/round.c
index f49c0b50dd..dd2bef6556 100644
--- a/none/tests/ppc64/round.c
+++ b/none/tests/ppc64/round.c
@@ -142,7 +142,6 @@ int check_dbl_to_flt_round(round_mode_t mode, double dbl, float *expected)
 	int status = 0;
 	flt_overlay R, E;
 	char *result;
-	char *eq_ne;
 
 	set_rounding_mode(mode);
 
@@ -153,11 +152,9 @@ int check_dbl_to_flt_round(round_mode_t mode, double dbl, float *expected)
 		(R.layout.exp != E.layout.exp) ||
 		(R.layout.frac != E.layout.frac)) {
 		result = "FAILED";
-		eq_ne = "!=";
 		status = 1;
 	} else {
 		result = "PASSED";
-		eq_ne = "==";
 		status = 0;
 	}
 	printf("%s:%s:(double)(%-20a) = %20a",