Merge GDB 7.5.1

gdb/expprint.c

 /* Print in infix form a struct expression.
 
    Copyright (C) 1986, 1988-1989, 1991-2000, 2003, 2007-2012 Free
    Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 118 matching lines @@
           {
             fputs_filtered (SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)), stream);
             fputs_filtered ("::", stream);
           }
         fputs_filtered (SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol), stream);
       }
       return;
 
     case OP_VAR_ENTRY_VALUE:
       {
-        struct block *b;
-
         (*pos) += 2;
         fprintf_filtered (stream, "%s@entry",
                           SYMBOL_PRINT_NAME (exp->elts[pc + 1].symbol));
       }
       return;
 
     case OP_LAST:
       (*pos) += 2;
       fprintf_filtered (stream, "$%d",
                         longest_to_int (exp->elts[pc + 1].longconst));
@@ skipping 489 matching lines @@
   op_print_tab = current_language->la_op_print_tab;
   for (tem = 0; op_print_tab[tem].opcode != OP_NULL; tem++)
     if (op_print_tab[tem].opcode == op)
       return op_print_tab[tem].string;
   return NULL;
 }
 
 /* Support for dumping the raw data from expressions in a human readable
    form.  */
 
-static char *op_name (struct expression *, enum exp_opcode);
 static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
 
 /* Name for OPCODE, when it appears in expression EXP.  */
 
-static char *
+char *
 op_name (struct expression *exp, enum exp_opcode opcode)
 {
   return exp->language_defn->la_exp_desc->op_name (opcode);
 }
 
 /* Default name for the standard operator OPCODE (i.e., one defined in
    the definition of enum exp_opcode).  */
 
 char *
 op_name_standard (enum exp_opcode opcode)
@@ skipping 302 matching lines @@
 
         len = longest_to_int (exp->elts[elt + 1].longconst);
         elem_name = &exp->elts[elt + 2].string;
 
         fprintf_filtered (stream, "Field name: `%.*s'", len, elem_name);
         elt += 4 + BYTES_TO_EXP_ELEM (len + 1);
       }
       break;
     case TYPE_INSTANCE:
       {
-        char *elem_name;
         LONGEST len;
 
         len = exp->elts[elt++].longconst;
         fprintf_filtered (stream, "%s TypeInstance: ", plongest (len));
         while (len-- > 0)
           {
             fprintf_filtered (stream, "Type @");
             gdb_print_host_address (exp->elts[elt].type, stream);
             fprintf_filtered (stream, " (");
             type_print (exp->elts[elt].type, NULL, stream, 0);
@@ skipping 39 matching lines @@
     fputs_filtered ("Type printing not yet supported....", stream);
   fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",
                     exp->language_defn->la_name, exp->nelts,
                     (long) sizeof (union exp_element));
   fputs_filtered ("\n", stream);
 
   for (elt = 0; elt < exp->nelts;)
     elt = dump_subexp (exp, stream, elt);
   fputs_filtered ("\n", stream);
 }