5 files changed, 36 insertions, 9 deletions

diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c
index 924102720b14..e4a778720301 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm.c
@@ -362,7 +362,7 @@ output_code()
 " *\n"
 "%s */\n", versions);
 
-        fprintf(ofile, "static uint8_t seqprog[] = {\n");
+        fprintf(ofile, "static const uint8_t seqprog[] = {\n");
         for (cur_instr = STAILQ_FIRST(&seq_program);
              cur_instr != NULL;
              cur_instr = STAILQ_NEXT(cur_instr, links)) {
@@ -415,7 +415,7 @@ output_code()
         }
 
         fprintf(ofile,
-"static struct patch {\n"
+"static const struct patch {\n"
 "       %spatch_func_t          *patch_func;\n"
 "       uint32_t                 begin          :10,\n"
 "                                skip_instr     :10,\n"
@@ -435,7 +435,7 @@ output_code()
         fprintf(ofile, "\n};\n\n");
 
         fprintf(ofile,
-"static struct cs {\n"
+"static const struct cs {\n"
 "       uint16_t        begin;\n"
 "       uint16_t        end;\n"
 "} critical_sections[] = {\n");
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index e1079dd3cc28..81be6a261cc8 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -143,6 +143,8 @@ void yyerror(const char *string);
 
 %token <value> T_ADDRESS
 
+%token T_COUNT
+
 %token T_ACCESS_MODE
 
 %token T_MODES
@@ -353,6 +355,7 @@ reg_attribute_list:
 reg_attribute:
         reg_address
 |       size
+|       count
 |       access_mode
 |       modes
 |       field_defn
@@ -393,6 +396,13 @@ size:
         }
 ;
 
+count:
+        T_COUNT T_NUMBER
+        {
+                cur_symbol->count += $2;
+        }
+;
+
 access_mode:
         T_ACCESS_MODE T_MODE
         {
@@ -801,6 +811,7 @@ scratch_ram:
                         cur_symtype = SRAMLOC;
                         cur_symbol->type = SRAMLOC;
                         initialize_symbol(cur_symbol);
+                        cur_symbol->count += 1;
                 }
                 reg_address
                 {
@@ -832,6 +843,7 @@ scb:
                         initialize_symbol(cur_symbol);
                         /* 64 bytes of SCB space */
                         cur_symbol->info.rinfo->size = 64;
+                        cur_symbol->count += 1;
                 }
                 reg_address
                 {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
index 62b6c1bc82c6..2c7f02daf88d 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
@@ -162,6 +162,7 @@ register		{ return T_REGISTER; }
 const                   { yylval.value = FALSE; return T_CONST; }
 download                { return T_DOWNLOAD; }
 address                 { return T_ADDRESS; }
+count                   { return T_COUNT; }
 access_mode             { return T_ACCESS_MODE; }
 modes                   { return T_MODES; }
 RW|RO|WO                {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
index f1f448dff569..fcd357872b43 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
@@ -77,6 +77,7 @@ symbol_create(char *name)
         if (new_symbol->name == NULL)
                  stop("Unable to strdup symbol name", EX_SOFTWARE);
         new_symbol->type = UNINITIALIZED;
+        new_symbol->count = 1;
         return (new_symbol);
 }
 
@@ -198,6 +199,12 @@ symtable_get(char *name)
                 }
         }
         memcpy(&stored_ptr, data.data, sizeof(stored_ptr));
+        stored_ptr->count++;
+        data.data = &stored_ptr;
+        if (symtable->put(symtable, &key, &data, /*flags*/0) !=0) {
+                perror("Symtable put failed");
+                exit(EX_SOFTWARE);
+        }
         return (stored_ptr);
 }
 
@@ -256,7 +263,7 @@ symlist_add(symlist_t *symlist, symbol_t *symbol, int how)
                     && (curnode->symbol->info.finfo->value >
                         newnode->symbol->info.finfo->value))))
                  || (!field && (curnode->symbol->info.rinfo->address >
-                               newnode->symbol->info.rinfo->address))) {
+                                newnode->symbol->info.rinfo->address))) {
                         SLIST_INSERT_HEAD(symlist, newnode, links);
                         return;
                 }
@@ -271,7 +278,7 @@ symlist_add(symlist_t *symlist, symbol_t *symbol, int how)
 
                                 cursymbol = SLIST_NEXT(curnode, links)->symbol;
                                 if ((field
-                                  && (cursymbol->type > symbol->type
+                                  && (cursymbol->type > symbol->type
                                    || (cursymbol->type == symbol->type
                                     && (cursymbol->info.finfo->value >
                                         symbol->info.finfo->value))))
@@ -351,7 +358,7 @@ aic_print_reg_dump_types(FILE *ofile)
 {
         if (ofile == NULL)
                 return;
-                
+
         fprintf(ofile,
 "typedef int (%sreg_print_t)(u_int, u_int *, u_int);\n"
 "typedef struct %sreg_parse_entry {\n"
@@ -370,7 +377,7 @@ aic_print_reg_dump_start(FILE *dfile, symbol_node_t *regnode)
                 return;
 
         fprintf(dfile,
-"static %sreg_parse_entry_t %s_parse_table[] = {\n",
+"static const %sreg_parse_entry_t %s_parse_table[] = {\n",
                 prefix,
                 regnode->symbol->name);
 }
@@ -385,7 +392,7 @@ aic_print_reg_dump_end(FILE *ofile, FILE *dfile,
         lower_name = strdup(regnode->symbol->name);
         if (lower_name == NULL)
                  stop("Unable to strdup symbol name", EX_SOFTWARE);
-        
+
         for (letter = lower_name; *letter != '\0'; letter++)
                 *letter = tolower(*letter);
 
@@ -472,6 +479,7 @@ symtable_dump(FILE *ofile, FILE *dfile)
         DBT              key;
         DBT              data;
         int              flag;
+        int              reg_count = 0, reg_used = 0;
         u_int            i;
 
         if (symtable == NULL)
@@ -541,6 +549,9 @@ symtable_dump(FILE *ofile, FILE *dfile)
                         int              num_entries;
 
                         num_entries = 0;
+                        reg_count++;
+                        if (curnode->symbol->count == 1)
+                                break;
                         fields = &curnode->symbol->info.rinfo->fields;
                         SLIST_FOREACH(fieldnode, fields, links) {
                                 if (num_entries == 0)
@@ -553,11 +564,14 @@ symtable_dump(FILE *ofile, FILE *dfile)
                         }
                         aic_print_reg_dump_end(ofile, dfile,
                                                curnode, num_entries);
+                        reg_used++;
                 }
                 default:
                         break;
                 }
         }
+        fprintf(stderr, "%s: %d of %d register definitions used\n", appname,
+                reg_used, reg_count);
 
         /* Fold in the masks and bits */
         while (SLIST_FIRST(&masks) != NULL) {
@@ -646,7 +660,6 @@ symtable_dump(FILE *ofile, FILE *dfile)
                 free(curnode);
         }
 
-        
         fprintf(ofile, "\n\n/* Downloaded Constant Definitions */\n");
 
         for (i = 0; SLIST_FIRST(&download_constants) != NULL; i++) {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
index afc22e8b4903..05190c1a2fb7 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
@@ -128,6 +128,7 @@ typedef struct expression_info {
 typedef struct symbol {
         char    *name;
         symtype type;
+        int     count;
         union   {
                 struct reg_info   *rinfo;
                 struct field_info *finfo;