* tools/gap: Clean up unused variables, bad size usage, return success on

failure cases, and other nits.

svn path=/trunk/yasm/; revision=1397

diff --git a/tools/gap/gap.c b/tools/gap/gap.c
index 981649c6fcbd767e460a08b9052cca8621517ae4..b78b2da4dff09962bac62c305a8f065a5862a992 100644 (file)
--- a/tools/gap/gap.c
+++ b/tools/gap/gap.c
@@ -579,7 +579,7 @@ make_c_tab(
 
        if (blen < 16) {
            for (i=0; i<blen; ++i)
-               fprintf(f, "%3d,", scramble[tab[i].val_b]);
+               fprintf(f, "%3ld,", scramble[tab[i].val_b]);
        } else if (blen <= 1024) {
            for (i=0; i<blen; i+=16)
                fprintf(f, "%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,\n",
@@ -600,7 +600,7 @@ make_c_tab(
                    scramble[tab[i+6].val_b], scramble[tab[i+7].val_b]); 
        } else {
            for (i=0; i<blen; i+=16)
-               fprintf(f, "%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,%ld,\n",
+               fprintf(f, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,\n",
                    tab[i+0].val_b, tab[i+1].val_b, 
                    tab[i+2].val_b, tab[i+3].val_b, 
                    tab[i+4].val_b, tab[i+5].val_b, 
@@ -770,6 +770,7 @@ static int get_line(FILE *in)
        }
        p -= 2;
     }
+    return 0;
 }
 
 static struct {
@@ -794,11 +795,7 @@ int
 main(int argc, char *argv[])
 {
     FILE *in, *out;
-    int i, t;
-    int insn_numnongas = 0, insn_numgas = 0, insn_numcommon = 0;
-    int cpu_num = 0, cpu_numalias = 0, cpu_numfeature = 0;
-    int prefix_numnongas = 0, prefix_numgas = 0, prefix_numcommon = 0;
-    int reg_numcommon = 0, reg_num64 = 0, reg_numgroup = 0, reg_numseg = 0;
+    int i;
     char *tok;
     int count[NUM_DIRS];
     dir_byp *db;

diff --git a/tools/gap/perfect.c b/tools/gap/perfect.c
index 2eae6c6fbf14ccdd3c5ace2ac09a7bbcce5e46f4..3313a5a352a906ea57d47f8e1293b89858903185 100644 (file)
--- a/tools/gap/perfect.c
+++ b/tools/gap/perfect.c
@@ -49,6 +49,7 @@ determined a perfect hash for the whole set of keys.
 ------------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include "tools/gap/standard.h"
 #include "libyasm/coretype.h"
 #include "libyasm/phash.h"
@@ -124,25 +125,25 @@ hashform *form;
        !memcmp(key1->name_k, key2->name_k, (size_t)key1->len_k))
     {
       fprintf(stderr, "perfect.c: Duplicates keys!  %.*s\n",
-             key1->len_k, key1->name_k);
-      exit(EXIT_SUCCESS);
+             (int)key1->len_k, key1->name_k);
+      exit(EXIT_FAILURE);
     }
     break;
   case INT_HT:
     if (key1->hash_k == key2->hash_k)
     {
       fprintf(stderr, "perfect.c: Duplicate keys!  %.8lx\n", key1->hash_k);
-      exit(EXIT_SUCCESS);
+      exit(EXIT_FAILURE);
     }
     break;
   case AB_HT:
     fprintf(stderr, "perfect.c: Duplicate keys!  %.8lx %.8lx\n",
            key1->a_k, key1->b_k);
-    exit(EXIT_SUCCESS);
+    exit(EXIT_FAILURE);
     break;
   default:
     fprintf(stderr, "perfect.c: Illegal hash type %ld\n", (ub4)form->hashtype);
-    exit(EXIT_SUCCESS);
+    exit(EXIT_FAILURE);
     break;
   }
 }
@@ -221,7 +222,7 @@ gencode  *final;                          /* output, code for the final hash */
     sprintf(final->line[2],
            "  phash_checksum(key, len, state);\n");
     sprintf(final->line[3], 
-           "  rsl = ((state[0]&0x%x)^scramble[tab[state[1]&0x%x]]);\n",
+           "  rsl = ((state[0]&0x%lx)^scramble[tab[state[1]&0x%lx]]);\n",
            alen-1, blen-1);
   }
   else
@@ -244,12 +245,12 @@ gencode  *final;                          /* output, code for the final hash */
     }
     else if (blen < USE_SCRAMBLE)
     {
-      sprintf(final->line[1], "  rsl = ((val>>%ld)^tab[val&0x%x]);\n",
+      sprintf(final->line[1], "  rsl = ((val>>%ld)^tab[val&0x%lx]);\n",
              UB4BITS-phash_log2(alen), blen-1);
     }
     else
     {
-      sprintf(final->line[1], "  rsl = ((val>>%ld)^scramble[tab[val&0x%x]]);\n",
+      sprintf(final->line[1], "  rsl = ((val>>%ld)^scramble[tab[val&0x%lx]]);\n",
              UB4BITS-phash_log2(alen), blen-1);
     }
   }
@@ -320,8 +321,6 @@ ub4       salt;                     /* used to initialize the hash function */
 hashform *form;                                           /* user directives */
 gencode  *final;                                      /* code for final hash */
 {
-  ub4 finished;
-
   /* Do the initial hash of the keys */
   switch(form->mode)
   {
@@ -617,7 +616,7 @@ hashform *form;                                           /* user directives */
       "perfect.c: Can't deal with (A,B) having A bigger than twice \n");
     fprintf(stderr,
       "  the smallest power of two greater or equal to any legal hash.\n");
-    exit(EXIT_SUCCESS);
+    exit(EXIT_FAILURE);
   }
 
   /* allocate working memory */
@@ -635,7 +634,7 @@ hashform *form;                                           /* user directives */
     if (form->perfect == MINIMAL_HP)
     {
       printf("fatal error: Cannot find perfect hash for user (A,B) pairs\n");
-      exit(EXIT_SUCCESS);
+      exit(EXIT_FAILURE);
     }
     else
     {
@@ -648,7 +647,7 @@ hashform *form;                                           /* user directives */
       if (!perfect(*tabb, tabh, tabq, *blen, *smax, scramble, nkeys, form))
       {
        printf("fatal error: Cannot find perfect hash for user (A,B) pairs\n");
-       exit(EXIT_SUCCESS);
+       exit(EXIT_FAILURE);
       }
     }
   }
@@ -898,7 +897,7 @@ void findhash(
        {
          duplicates(*tabb, *blen, keys, form);      /* check for duplicates */
          printf("fatal error: Cannot perfect hash: cannot find distinct (A,B)\n");
-         exit(EXIT_SUCCESS);
+         exit(EXIT_FAILURE);
        }
        bad_initkey = 0;
        bad_perfect = 0;
@@ -926,7 +925,7 @@ void findhash(
        else
        {
          printf("fatal error: Cannot perfect hash: cannot build tab[]\n");
-         exit(EXIT_SUCCESS);
+         exit(EXIT_FAILURE);
        }
        bad_perfect = 0;
       }