Merge GDB 7.5.1

gdb/expression.h

 /* Definitions for expressions stored in reversed prefix form, for GDB.
 
    Copyright (C) 1986, 1989, 1992, 1994, 2000, 2003, 2005, 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 82 matching lines @@
     ((elements) * sizeof (union exp_element))
 #define BYTES_TO_EXP_ELEM(bytes) \
     (((bytes) + sizeof (union exp_element) - 1) / sizeof (union exp_element))
 
 /* From parse.c */
 
 extern struct expression *parse_expression (char *);
 
 extern struct type *parse_field_expression (char *, char **);
 
-extern struct expression *parse_exp_1 (char **, struct block *, int);
+extern struct expression *parse_exp_1 (char **, CORE_ADDR pc, struct block *,
+                                       int);
 
 /* For use by parsers; set if we want to parse an expression and
    attempt to complete a field name.  */
 extern int in_parse_field;
 
 /* The innermost context required by the stack and register variables
    we've encountered so far.  To use this, set it to NULL, then call
    parse_<whatever>, then look at it.  */
 extern struct block *innermost_block;
 
@@ skipping 16 matching lines @@
                                    declared will be lval_register).  */
   };
 
 extern struct value *evaluate_subexp_standard
   (struct type *, struct expression *, int *, enum noside);
 
 /* From expprint.c */
 
 extern void print_expression (struct expression *, struct ui_file *);
 
+extern char *op_name (struct expression *exp, enum exp_opcode opcode);
+
 extern char *op_string (enum exp_opcode);
 
 extern void dump_raw_expression (struct expression *,
                                  struct ui_file *, char *);
 extern void dump_prefix_expression (struct expression *, struct ui_file *);
 
 #endif /* !defined (EXPRESSION_H) */