Re-factor (i386|amd64)mpx target descriptions.

[deliverable/binutils-gdb.git] / gdb / parse.c

diff --git a/gdb/parse.c b/gdb/parse.c
index 095d63d15b2e6a9cfae42465e4fa31361e7a3464..4191fc62d12fe9953e5a23a2b41df1c30633d676 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -1,6 +1,6 @@
 /* Parse expressions for GDB.
 
 /* Parse expressions for GDB.
 

-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 Free Software Foundation, Inc.

 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.
 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.


@@ -32,7 +32,6 @@
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"

-#include "gdb_string.h"

 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"


@@ -46,11 +45,9 @@
 #include "symfile.h"           /* for overlay functions */
 #include "inferior.h"
 #include "doublest.h"
 #include "symfile.h"           /* for overlay functions */
 #include "inferior.h"
 #include "doublest.h"

-#include "gdb_assert.h"

 #include "block.h"
 #include "source.h"
 #include "objfiles.h"
 #include "block.h"
 #include "source.h"
 #include "objfiles.h"

-#include "exceptions.h"

 #include "user-regs.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,
 #include "user-regs.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,


@@ -67,16 +64,13 @@ const struct exp_descriptor exp_descriptor_standard =
   };
 \f
 /* Global variables declared in parser-defs.h (and commented there).  */
   };
 \f
 /* Global variables declared in parser-defs.h (and commented there).  */

-struct expression *expout;
-int expout_size;
-int expout_ptr;

 const struct block *expression_context_block;
 CORE_ADDR expression_context_pc;
 const struct block *innermost_block;
 int arglist_len;
 static struct type_stack type_stack;
 const struct block *expression_context_block;
 CORE_ADDR expression_context_pc;
 const struct block *innermost_block;
 int arglist_len;
 static struct type_stack type_stack;

-char *lexptr;
-char *prev_lexptr;
+const char *lexptr;
+const char *prev_lexptr;

 int paren_depth;
 int comma_terminates;
 
 int paren_depth;
 int comma_terminates;
 


@@ -123,7 +117,7 @@ static int prefixify_subexp (struct expression *, struct expression *, int,
 static struct expression *parse_exp_in_context (const char **, CORE_ADDR,
                                                const struct block *, int, 
                                                int, int *);
 static struct expression *parse_exp_in_context (const char **, CORE_ADDR,
                                                const struct block *, int, 
                                                int, int *);

-static struct expression *parse_exp_in_context_1 (char **, CORE_ADDR,
+static struct expression *parse_exp_in_context_1 (const char **, CORE_ADDR,

                                                  const struct block *, int,
                                                  int, int *);
 
                                                  const struct block *, int,
                                                  int, int *);
 


@@ -146,13 +140,13 @@ static struct funcall *funcall_chain;
 void
 start_arglist (void)
 {
 void
 start_arglist (void)
 {

-  struct funcall *new;
+  struct funcall *newobj;

 
 

-  new = (struct funcall *) xmalloc (sizeof (struct funcall));
-  new->next = funcall_chain;
-  new->arglist_len = arglist_len;
+  newobj = XNEW (struct funcall);
+  newobj->next = funcall_chain;
+  newobj->arglist_len = arglist_len;

   arglist_len = 0;
   arglist_len = 0;

-  funcall_chain = new;
+  funcall_chain = newobj;

 }
 
 /* Return the number of arguments in a function call just terminated,
 }
 
 /* Return the number of arguments in a function call just terminated,


@@ -185,118 +179,122 @@ free_funcalls (void *ignore)
     }
 }
 \f
     }
 }
 \f

-/* This page contains the functions for adding data to the struct expression
-   being constructed.  */

 
 /* See definition in parser-defs.h.  */
 
 void
 
 /* See definition in parser-defs.h.  */
 
 void

-initialize_expout (int initial_size, const struct language_defn *lang,
+initialize_expout (struct parser_state *ps, size_t initial_size,
+                  const struct language_defn *lang,

                   struct gdbarch *gdbarch)
 {
                   struct gdbarch *gdbarch)
 {

-  expout_size = initial_size;
-  expout_ptr = 0;
-  expout = xmalloc (sizeof (struct expression)
-                   + EXP_ELEM_TO_BYTES (expout_size));
-  expout->language_defn = lang;
-  expout->gdbarch = gdbarch;
+  ps->expout_size = initial_size;
+  ps->expout_ptr = 0;
+  ps->expout
+    = (struct expression *) xmalloc (sizeof (struct expression)
+                                    + EXP_ELEM_TO_BYTES (ps->expout_size));
+  ps->expout->language_defn = lang;
+  ps->expout->gdbarch = gdbarch;

 }
 
 /* See definition in parser-defs.h.  */
 
 void
 }
 
 /* See definition in parser-defs.h.  */
 
 void

-reallocate_expout (void)
+reallocate_expout (struct parser_state *ps)

 {
   /* Record the actual number of expression elements, and then
      reallocate the expression memory so that we free up any
      excess elements.  */
 
 {
   /* Record the actual number of expression elements, and then
      reallocate the expression memory so that we free up any
      excess elements.  */
 

-  expout->nelts = expout_ptr;
-  expout = xrealloc ((char *) expout,
-                    sizeof (struct expression)
-                    + EXP_ELEM_TO_BYTES (expout_ptr));
+  ps->expout->nelts = ps->expout_ptr;
+  ps->expout = (struct expression *)
+     xrealloc (ps->expout,
+              sizeof (struct expression)
+              + EXP_ELEM_TO_BYTES (ps->expout_ptr));

 }
 
 }
 

+/* This page contains the functions for adding data to the struct expression
+   being constructed.  */
+

 /* Add one element to the end of the expression.  */
 
 /* To avoid a bug in the Sun 4 compiler, we pass things that can fit into
    a register through here.  */
 
 static void
 /* Add one element to the end of the expression.  */
 
 /* To avoid a bug in the Sun 4 compiler, we pass things that can fit into
    a register through here.  */
 
 static void

-write_exp_elt (const union exp_element *expelt)
+write_exp_elt (struct parser_state *ps, const union exp_element *expelt)

 {
 {

-  if (expout_ptr >= expout_size)
+  if (ps->expout_ptr >= ps->expout_size)

     {
     {

-      expout_size *= 2;
-      expout = (struct expression *)
-       xrealloc ((char *) expout, sizeof (struct expression)
-                 + EXP_ELEM_TO_BYTES (expout_size));
+      ps->expout_size *= 2;
+      ps->expout = (struct expression *)
+       xrealloc (ps->expout, sizeof (struct expression)
+                 + EXP_ELEM_TO_BYTES (ps->expout_size));

     }
     }

-  expout->elts[expout_ptr++] = *expelt;
+  ps->expout->elts[ps->expout_ptr++] = *expelt;

 }
 
 void
 }
 
 void

-write_exp_elt_opcode (enum exp_opcode expelt)
+write_exp_elt_opcode (struct parser_state *ps, enum exp_opcode expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.opcode = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.opcode = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_sym (struct symbol *expelt)
+write_exp_elt_sym (struct parser_state *ps, struct symbol *expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.symbol = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.symbol = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_block (const struct block *b)
+write_exp_elt_block (struct parser_state *ps, const struct block *b)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.block = b;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.block = b;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_objfile (struct objfile *objfile)
+write_exp_elt_objfile (struct parser_state *ps, struct objfile *objfile)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.objfile = objfile;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.objfile = objfile;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_longcst (LONGEST expelt)
+write_exp_elt_longcst (struct parser_state *ps, LONGEST expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.longconst = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.longconst = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_dblcst (DOUBLEST expelt)
+write_exp_elt_dblcst (struct parser_state *ps, DOUBLEST expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.doubleconst = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.doubleconst = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_decfloatcst (gdb_byte expelt[16])
+write_exp_elt_decfloatcst (struct parser_state *ps, gdb_byte expelt[16])

 {
   union exp_element tmp;
   int index;
 {
   union exp_element tmp;
   int index;


@@ -304,27 +302,27 @@ write_exp_elt_decfloatcst (gdb_byte expelt[16])
   for (index = 0; index < 16; index++)
     tmp.decfloatconst[index] = expelt[index];
 
   for (index = 0; index < 16; index++)
     tmp.decfloatconst[index] = expelt[index];
 

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_type (struct type *expelt)
+write_exp_elt_type (struct parser_state *ps, struct type *expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.type = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.type = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 void
 }
 
 void

-write_exp_elt_intern (struct internalvar *expelt)
+write_exp_elt_intern (struct parser_state *ps, struct internalvar *expelt)

 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.internalvar = expelt;
 {
   union exp_element tmp;
 
   memset (&tmp, 0, sizeof (union exp_element));
   tmp.internalvar = expelt;

-  write_exp_elt (&tmp);
+  write_exp_elt (ps, &tmp);

 }
 
 /* Add a string constant to the end of the expression.
 }
 
 /* Add a string constant to the end of the expression.


@@ -349,10 +347,10 @@ write_exp_elt_intern (struct internalvar *expelt)
 
 
 void
 
 
 void

-write_exp_string (struct stoken str)
+write_exp_string (struct parser_state *ps, struct stoken str)

 {
   int len = str.length;
 {
   int len = str.length;

-  int lenelt;
+  size_t lenelt;

   char *strdata;
 
   /* Compute the number of expression elements required to hold the string
   char *strdata;
 
   /* Compute the number of expression elements required to hold the string


@@ -362,28 +360,19 @@ write_exp_string (struct stoken str)
 
   lenelt = 2 + BYTES_TO_EXP_ELEM (len + 1);
 
 
   lenelt = 2 + BYTES_TO_EXP_ELEM (len + 1);
 

-  /* Ensure that we have enough available expression elements to store
-     everything.  */
-
-  if ((expout_ptr + lenelt) >= expout_size)
-    {
-      expout_size = max (expout_size * 2, expout_ptr + lenelt + 10);
-      expout = (struct expression *)
-       xrealloc ((char *) expout, (sizeof (struct expression)
-                                   + EXP_ELEM_TO_BYTES (expout_size)));
-    }
+  increase_expout_size (ps, lenelt);

 
   /* Write the leading length expression element (which advances the current
      expression element index), then write the string constant followed by a
      terminating null byte, and then write the trailing length expression
      element.  */
 
 
   /* Write the leading length expression element (which advances the current
      expression element index), then write the string constant followed by a
      terminating null byte, and then write the trailing length expression
      element.  */
 

-  write_exp_elt_longcst ((LONGEST) len);
-  strdata = (char *) &expout->elts[expout_ptr];
+  write_exp_elt_longcst (ps, (LONGEST) len);
+  strdata = (char *) &ps->expout->elts[ps->expout_ptr];

   memcpy (strdata, str.ptr, len);
   *(strdata + len) = '\0';
   memcpy (strdata, str.ptr, len);
   *(strdata + len) = '\0';

-  expout_ptr += lenelt - 2;
-  write_exp_elt_longcst ((LONGEST) len);
+  ps->expout_ptr += lenelt - 2;
+  write_exp_elt_longcst (ps, (LONGEST) len);

 }
 
 /* Add a vector of string constants to the end of the expression.
 }
 
 /* Add a vector of string constants to the end of the expression.


@@ -400,9 +389,11 @@ write_exp_string (struct stoken str)
    long constant, followed by the contents of the string.  */
 
 void
    long constant, followed by the contents of the string.  */
 
 void

-write_exp_string_vector (int type, struct stoken_vector *vec)
+write_exp_string_vector (struct parser_state *ps, int type,
+                        struct stoken_vector *vec)

 {
 {

-  int i, n_slots, len;
+  int i, len;
+  size_t n_slots;

 
   /* Compute the size.  We compute the size in number of slots to
      avoid issues with string padding.  */
 
   /* Compute the size.  We compute the size in number of slots to
      avoid issues with string padding.  */


@@ -421,28 +412,22 @@ write_exp_string_vector (int type, struct stoken_vector *vec)
   len = EXP_ELEM_TO_BYTES (n_slots) - 1;
 
   n_slots += 4;
   len = EXP_ELEM_TO_BYTES (n_slots) - 1;
 
   n_slots += 4;

-  if ((expout_ptr + n_slots) >= expout_size)
-    {
-      expout_size = max (expout_size * 2, expout_ptr + n_slots + 10);
-      expout = (struct expression *)
-       xrealloc ((char *) expout, (sizeof (struct expression)
-                                   + EXP_ELEM_TO_BYTES (expout_size)));
-    }
+  increase_expout_size (ps, n_slots);

 
 

-  write_exp_elt_opcode (OP_STRING);
-  write_exp_elt_longcst (len);
-  write_exp_elt_longcst (type);
+  write_exp_elt_opcode (ps, OP_STRING);
+  write_exp_elt_longcst (ps, len);
+  write_exp_elt_longcst (ps, type);

 
   for (i = 0; i < vec->len; ++i)
     {
 
   for (i = 0; i < vec->len; ++i)
     {

-      write_exp_elt_longcst (vec->tokens[i].length);
-      memcpy (&expout->elts[expout_ptr], vec->tokens[i].ptr,
+      write_exp_elt_longcst (ps, vec->tokens[i].length);
+      memcpy (&ps->expout->elts[ps->expout_ptr], vec->tokens[i].ptr,

              vec->tokens[i].length);
              vec->tokens[i].length);

-      expout_ptr += BYTES_TO_EXP_ELEM (vec->tokens[i].length);
+      ps->expout_ptr += BYTES_TO_EXP_ELEM (vec->tokens[i].length);

     }
 
     }
 

-  write_exp_elt_longcst (len);
-  write_exp_elt_opcode (OP_STRING);
+  write_exp_elt_longcst (ps, len);
+  write_exp_elt_opcode (ps, OP_STRING);

 }
 
 /* Add a bitstring constant to the end of the expression.
 }
 
 /* Add a bitstring constant to the end of the expression.


@@ -457,11 +442,11 @@ write_exp_string_vector (int type, struct stoken_vector *vec)
    either end of the bitstring.  */
 
 void
    either end of the bitstring.  */
 
 void

-write_exp_bitstring (struct stoken str)
+write_exp_bitstring (struct parser_state *ps, struct stoken str)

 {
   int bits = str.length;       /* length in bits */
   int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
 {
   int bits = str.length;       /* length in bits */
   int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;

-  int lenelt;
+  size_t lenelt;

   char *strdata;
 
   /* Compute the number of expression elements required to hold the bitstring,
   char *strdata;
 
   /* Compute the number of expression elements required to hold the bitstring,


@@ -470,39 +455,32 @@ write_exp_bitstring (struct stoken str)
 
   lenelt = 2 + BYTES_TO_EXP_ELEM (len);
 
 
   lenelt = 2 + BYTES_TO_EXP_ELEM (len);
 

-  /* Ensure that we have enough available expression elements to store
-     everything.  */
-
-  if ((expout_ptr + lenelt) >= expout_size)
-    {
-      expout_size = max (expout_size * 2, expout_ptr + lenelt + 10);
-      expout = (struct expression *)
-       xrealloc ((char *) expout, (sizeof (struct expression)
-                                   + EXP_ELEM_TO_BYTES (expout_size)));
-    }
+  increase_expout_size (ps, lenelt);

 
   /* Write the leading length expression element (which advances the current
      expression element index), then write the bitstring constant, and then
      write the trailing length expression element.  */
 
 
   /* Write the leading length expression element (which advances the current
      expression element index), then write the bitstring constant, and then
      write the trailing length expression element.  */
 

-  write_exp_elt_longcst ((LONGEST) bits);
-  strdata = (char *) &expout->elts[expout_ptr];
+  write_exp_elt_longcst (ps, (LONGEST) bits);
+  strdata = (char *) &ps->expout->elts[ps->expout_ptr];

   memcpy (strdata, str.ptr, len);
   memcpy (strdata, str.ptr, len);

-  expout_ptr += lenelt - 2;
-  write_exp_elt_longcst ((LONGEST) bits);
+  ps->expout_ptr += lenelt - 2;
+  write_exp_elt_longcst (ps, (LONGEST) bits);

 }
 
 /* Add the appropriate elements for a minimal symbol to the end of
    the expression.  */
 
 void
 }
 
 /* Add the appropriate elements for a minimal symbol to the end of
    the expression.  */
 
 void

-write_exp_msymbol (struct minimal_symbol *msymbol)
+write_exp_msymbol (struct parser_state *ps,
+                  struct bound_minimal_symbol bound_msym)

 {
 {

-  struct objfile *objfile = msymbol_objfile (msymbol);
+  struct minimal_symbol *msymbol = bound_msym.minsym;
+  struct objfile *objfile = bound_msym.objfile;

   struct gdbarch *gdbarch = get_objfile_arch (objfile);
 
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
 

-  CORE_ADDR addr = SYMBOL_VALUE_ADDRESS (msymbol);
-  struct obj_section *section = SYMBOL_OBJ_SECTION (msymbol);
+  CORE_ADDR addr = BMSYMBOL_VALUE_ADDRESS (bound_msym);
+  struct obj_section *section = MSYMBOL_OBJ_SECTION (objfile, msymbol);

   enum minimal_symbol_type type = MSYMBOL_TYPE (msymbol);
   CORE_ADDR pc;
 
   enum minimal_symbol_type type = MSYMBOL_TYPE (msymbol);
   CORE_ADDR pc;
 


@@ -511,13 +489,14 @@ write_exp_msymbol (struct minimal_symbol *msymbol)
   pc = gdbarch_convert_from_func_ptr_addr (gdbarch, addr, &current_target);
   if (pc != addr)
     {
   pc = gdbarch_convert_from_func_ptr_addr (gdbarch, addr, &current_target);
   if (pc != addr)
     {

-      struct minimal_symbol *ifunc_msym = lookup_minimal_symbol_by_pc (pc);
+      struct bound_minimal_symbol ifunc_msym = lookup_minimal_symbol_by_pc (pc);

 
       /* In this case, assume we have a code symbol instead of
         a data symbol.  */
 
 
       /* In this case, assume we have a code symbol instead of
         a data symbol.  */
 

-      if (ifunc_msym != NULL && MSYMBOL_TYPE (ifunc_msym) == mst_text_gnu_ifunc
-         && SYMBOL_VALUE_ADDRESS (ifunc_msym) == pc)
+      if (ifunc_msym.minsym != NULL
+         && MSYMBOL_TYPE (ifunc_msym.minsym) == mst_text_gnu_ifunc
+         && BMSYMBOL_VALUE_ADDRESS (ifunc_msym) == pc)

        {
          /* A function descriptor has been resolved but PC is still in the
             STT_GNU_IFUNC resolver body (such as because inferior does not
        {
          /* A function descriptor has been resolved but PC is still in the
             STT_GNU_IFUNC resolver body (such as because inferior does not


@@ -534,62 +513,62 @@ write_exp_msymbol (struct minimal_symbol *msymbol)
   if (overlay_debugging)
     addr = symbol_overlayed_address (addr, section);
 
   if (overlay_debugging)
     addr = symbol_overlayed_address (addr, section);
 

-  write_exp_elt_opcode (OP_LONG);
+  write_exp_elt_opcode (ps, OP_LONG);

   /* Let's make the type big enough to hold a 64-bit address.  */
   /* Let's make the type big enough to hold a 64-bit address.  */

-  write_exp_elt_type (objfile_type (objfile)->builtin_core_addr);
-  write_exp_elt_longcst ((LONGEST) addr);
-  write_exp_elt_opcode (OP_LONG);
+  write_exp_elt_type (ps, objfile_type (objfile)->builtin_core_addr);
+  write_exp_elt_longcst (ps, (LONGEST) addr);
+  write_exp_elt_opcode (ps, OP_LONG);

 
   if (section && section->the_bfd_section->flags & SEC_THREAD_LOCAL)
     {
 
   if (section && section->the_bfd_section->flags & SEC_THREAD_LOCAL)
     {

-      write_exp_elt_opcode (UNOP_MEMVAL_TLS);
-      write_exp_elt_objfile (objfile);
-      write_exp_elt_type (objfile_type (objfile)->nodebug_tls_symbol);
-      write_exp_elt_opcode (UNOP_MEMVAL_TLS);
+      write_exp_elt_opcode (ps, UNOP_MEMVAL_TLS);
+      write_exp_elt_objfile (ps, objfile);
+      write_exp_elt_type (ps, objfile_type (objfile)->nodebug_tls_symbol);
+      write_exp_elt_opcode (ps, UNOP_MEMVAL_TLS);

       return;
     }
 
       return;
     }
 

-  write_exp_elt_opcode (UNOP_MEMVAL);
+  write_exp_elt_opcode (ps, UNOP_MEMVAL);

   switch (type)
     {
     case mst_text:
     case mst_file_text:
     case mst_solib_trampoline:
   switch (type)
     {
     case mst_text:
     case mst_file_text:
     case mst_solib_trampoline:

-      write_exp_elt_type (objfile_type (objfile)->nodebug_text_symbol);
+      write_exp_elt_type (ps, objfile_type (objfile)->nodebug_text_symbol);

       break;
 
     case mst_text_gnu_ifunc:
       break;
 
     case mst_text_gnu_ifunc:

-      write_exp_elt_type (objfile_type (objfile)
-                                              ->nodebug_text_gnu_ifunc_symbol);
+      write_exp_elt_type (ps, objfile_type (objfile)
+                         ->nodebug_text_gnu_ifunc_symbol);

       break;
 
     case mst_data:
     case mst_file_data:
     case mst_bss:
     case mst_file_bss:
       break;
 
     case mst_data:
     case mst_file_data:
     case mst_bss:
     case mst_file_bss:

-      write_exp_elt_type (objfile_type (objfile)->nodebug_data_symbol);
+      write_exp_elt_type (ps, objfile_type (objfile)->nodebug_data_symbol);

       break;
 
     case mst_slot_got_plt:
       break;
 
     case mst_slot_got_plt:

-      write_exp_elt_type (objfile_type (objfile)->nodebug_got_plt_symbol);
+      write_exp_elt_type (ps, objfile_type (objfile)->nodebug_got_plt_symbol);

       break;
 
     default:
       break;
 
     default:

-      write_exp_elt_type (objfile_type (objfile)->nodebug_unknown_symbol);
+      write_exp_elt_type (ps, objfile_type (objfile)->nodebug_unknown_symbol);

       break;
     }
       break;
     }

-  write_exp_elt_opcode (UNOP_MEMVAL);
+  write_exp_elt_opcode (ps, UNOP_MEMVAL);

 }
 
 /* Mark the current index as the starting location of a structure
    expression.  This is used when completing on field names.  */
 
 void
 }
 
 /* Mark the current index as the starting location of a structure
    expression.  This is used when completing on field names.  */
 
 void

-mark_struct_expression (void)
+mark_struct_expression (struct parser_state *ps)

 {
   gdb_assert (parse_completion
              && expout_tag_completion_type == TYPE_CODE_UNDEF);
 {
   gdb_assert (parse_completion
              && expout_tag_completion_type == TYPE_CODE_UNDEF);

-  expout_last_struct = expout_ptr;
+  expout_last_struct = ps->expout_ptr;

 }
 
 /* Indicate that the current parser invocation is completing a tag.
 }
 
 /* Indicate that the current parser invocation is completing a tag.


@@ -605,10 +584,9 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length)
              && expout_last_struct == -1);
   gdb_assert (tag == TYPE_CODE_UNION
              || tag == TYPE_CODE_STRUCT
              && expout_last_struct == -1);
   gdb_assert (tag == TYPE_CODE_UNION
              || tag == TYPE_CODE_STRUCT

-             || tag == TYPE_CODE_CLASS

              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;
              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;

-  expout_completion_name = xmalloc (length + 1);
+  expout_completion_name = (char *) xmalloc (length + 1);

   memcpy (expout_completion_name, ptr, length);
   expout_completion_name[length] = '\0';
 }
   memcpy (expout_completion_name, ptr, length);
   expout_completion_name[length] = '\0';
 }


@@ -636,10 +614,10 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length)
    value in the value history, I.e. $$1  */
 
 void
    value in the value history, I.e. $$1  */
 
 void

-write_dollar_variable (struct stoken str)
+write_dollar_variable (struct parser_state *ps, struct stoken str)

 {
 {

-  struct symbol *sym = NULL;
-  struct minimal_symbol *msym = NULL;
+  struct block_symbol sym;
+  struct bound_minimal_symbol msym;

   struct internalvar *isym = NULL;
 
   /* Handle the tokens $digits; also $ (short for $0) and $$ (short for $$1)
   struct internalvar *isym = NULL;
 
   /* Handle the tokens $digits; also $ (short for $0) and $$ (short for $$1)


@@ -674,7 +652,7 @@ write_dollar_variable (struct stoken str)
 
   /* Handle tokens that refer to machine registers:
      $ followed by a register name.  */
 
   /* Handle tokens that refer to machine registers:
      $ followed by a register name.  */

-  i = user_reg_map_name_to_regnum (parse_gdbarch,
+  i = user_reg_map_name_to_regnum (parse_gdbarch (ps),

                                   str.ptr + 1, str.length - 1);
   if (i >= 0)
     goto handle_register;
                                   str.ptr + 1, str.length - 1);
   if (i >= 0)
     goto handle_register;


@@ -684,9 +662,9 @@ write_dollar_variable (struct stoken str)
   isym = lookup_only_internalvar (copy_name (str) + 1);
   if (isym)
     {
   isym = lookup_only_internalvar (copy_name (str) + 1);
   if (isym)
     {

-      write_exp_elt_opcode (OP_INTERNALVAR);
-      write_exp_elt_intern (isym);
-      write_exp_elt_opcode (OP_INTERNALVAR);
+      write_exp_elt_opcode (ps, OP_INTERNALVAR);
+      write_exp_elt_intern (ps, isym);
+      write_exp_elt_opcode (ps, OP_INTERNALVAR);

       return;
     }
 
       return;
     }
 


@@ -695,44 +673,44 @@ write_dollar_variable (struct stoken str)
 
   sym = lookup_symbol (copy_name (str), (struct block *) NULL,
                       VAR_DOMAIN, NULL);
 
   sym = lookup_symbol (copy_name (str), (struct block *) NULL,
                       VAR_DOMAIN, NULL);

-  if (sym)
+  if (sym.symbol)

     {
     {

-      write_exp_elt_opcode (OP_VAR_VALUE);
-      write_exp_elt_block (block_found);       /* set by lookup_symbol */
-      write_exp_elt_sym (sym);
-      write_exp_elt_opcode (OP_VAR_VALUE);
+      write_exp_elt_opcode (ps, OP_VAR_VALUE);
+      write_exp_elt_block (ps, sym.block);
+      write_exp_elt_sym (ps, sym.symbol);
+      write_exp_elt_opcode (ps, OP_VAR_VALUE);

       return;
     }
       return;
     }

-  msym = lookup_minimal_symbol (copy_name (str), NULL, NULL);
-  if (msym)
+  msym = lookup_bound_minimal_symbol (copy_name (str));
+  if (msym.minsym)

     {
     {

-      write_exp_msymbol (msym);
+      write_exp_msymbol (ps, msym);

       return;
     }
 
   /* Any other names are assumed to be debugger internal variables.  */
 
       return;
     }
 
   /* Any other names are assumed to be debugger internal variables.  */
 

-  write_exp_elt_opcode (OP_INTERNALVAR);
-  write_exp_elt_intern (create_internalvar (copy_name (str) + 1));
-  write_exp_elt_opcode (OP_INTERNALVAR);
+  write_exp_elt_opcode (ps, OP_INTERNALVAR);
+  write_exp_elt_intern (ps, create_internalvar (copy_name (str) + 1));
+  write_exp_elt_opcode (ps, OP_INTERNALVAR);

   return;
 handle_last:
   return;
 handle_last:

-  write_exp_elt_opcode (OP_LAST);
-  write_exp_elt_longcst ((LONGEST) i);
-  write_exp_elt_opcode (OP_LAST);
+  write_exp_elt_opcode (ps, OP_LAST);
+  write_exp_elt_longcst (ps, (LONGEST) i);
+  write_exp_elt_opcode (ps, OP_LAST);

   return;
 handle_register:
   return;
 handle_register:

-  write_exp_elt_opcode (OP_REGISTER);
+  write_exp_elt_opcode (ps, OP_REGISTER);

   str.length--;
   str.ptr++;
   str.length--;
   str.ptr++;

-  write_exp_string (str);
-  write_exp_elt_opcode (OP_REGISTER);
+  write_exp_string (ps, str);
+  write_exp_elt_opcode (ps, OP_REGISTER);

   return;
 }
 
 
   return;
 }
 
 

-char *
-find_template_name_end (char *p)
+const char *
+find_template_name_end (const char *p)

 {
   int depth = 1;
   int just_seen_right = 0;
 {
   int depth = 1;
   int just_seen_right = 0;


@@ -818,7 +796,7 @@ copy_name (struct stoken token)
   if (namecopy_size < token.length + 1)
     {
       namecopy_size = token.length + 1;
   if (namecopy_size < token.length + 1)
     {
       namecopy_size = token.length + 1;

-      namecopy = xrealloc (namecopy, token.length + 1);
+      namecopy = (char *) xrealloc (namecopy, token.length + 1);

     }
       
   memcpy (namecopy, token.ptr, token.length);
     }
       
   memcpy (namecopy, token.ptr, token.length);


@@ -971,6 +949,7 @@ operator_length_standard (const struct expression *expr, int endpos,
     case UNOP_TRUNC:
     case OP_TYPEOF:
     case OP_DECLTYPE:
     case UNOP_TRUNC:
     case OP_TYPEOF:
     case OP_DECLTYPE:

+    case OP_TYPEID:

       oplen = 1;
       args = 1;
       break;
       oplen = 1;
       args = 1;
       break;


@@ -1027,8 +1006,9 @@ operator_length_standard (const struct expression *expr, int endpos,
 
     case OP_F90_RANGE:
       oplen = 3;
 
     case OP_F90_RANGE:
       oplen = 3;

+      range_type = (enum f90_range_type)
+       longest_to_int (expr->elts[endpos - 2].longconst);

 
 

-      range_type = longest_to_int (expr->elts[endpos - 2].longconst);

       switch (range_type)
        {
        case LOW_BOUND_DEFAULT:
       switch (range_type)
        {
        case LOW_BOUND_DEFAULT:


@@ -1139,16 +1119,8 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
                      const struct block *block,
                      int comma, int void_context_p, int *out_subexp)
 {
                      const struct block *block,
                      int comma, int void_context_p, int *out_subexp)
 {

-  struct expression *expr;
-  char *const_hack = *stringptr ? xstrdup (*stringptr) : NULL;
-  char *orig = const_hack;
-  struct cleanup *back_to = make_cleanup (xfree, const_hack);
-
-  expr = parse_exp_in_context_1 (&const_hack, pc, block, comma,
+  return parse_exp_in_context_1 (stringptr, pc, block, comma,

                                 void_context_p, out_subexp);
                                 void_context_p, out_subexp);

-  (*stringptr) += const_hack - orig;
-  do_cleanups (back_to);
-  return expr;

 }
 
 /* As for parse_exp_1, except that if VOID_CONTEXT_P, then
 }
 
 /* As for parse_exp_1, except that if VOID_CONTEXT_P, then


@@ -1159,13 +1131,13 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
    is left untouched.  */
 
 static struct expression *
    is left untouched.  */
 
 static struct expression *

-parse_exp_in_context_1 (char **stringptr, CORE_ADDR pc,
+parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,

                        const struct block *block,
                        int comma, int void_context_p, int *out_subexp)
 {
                        const struct block *block,
                        int comma, int void_context_p, int *out_subexp)
 {

-  volatile struct gdb_exception except;

   struct cleanup *old_chain, *inner_chain;
   const struct language_defn *lang = NULL;
   struct cleanup *old_chain, *inner_chain;
   const struct language_defn *lang = NULL;

+  struct parser_state ps;

   int subexp;
 
   lexptr = *stringptr;
   int subexp;
 
   lexptr = *stringptr;


@@ -1203,7 +1175,8 @@ parse_exp_in_context_1 (char **stringptr, CORE_ADDR pc,
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
       if (cursal.symtab)
        expression_context_block
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
       if (cursal.symtab)
        expression_context_block

-         = BLOCKVECTOR_BLOCK (BLOCKVECTOR (cursal.symtab), STATIC_BLOCK);
+         = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab),
+                              STATIC_BLOCK);

       if (expression_context_block)
        expression_context_pc = BLOCK_START (expression_context_block);
     }
       if (expression_context_block)
        expression_context_pc = BLOCK_START (expression_context_block);
     }


@@ -1238,47 +1211,49 @@ parse_exp_in_context_1 (char **stringptr, CORE_ADDR pc,
      While we need CURRENT_LANGUAGE to be set to LANG (for lookup_symbol
      and others called from *.y) ensure CURRENT_LANGUAGE gets restored
      to the value matching SELECTED_FRAME as set by get_current_arch.  */
      While we need CURRENT_LANGUAGE to be set to LANG (for lookup_symbol
      and others called from *.y) ensure CURRENT_LANGUAGE gets restored
      to the value matching SELECTED_FRAME as set by get_current_arch.  */

-  initialize_expout (10, lang, get_current_arch ());
+
+  initialize_expout (&ps, 10, lang, get_current_arch ());

   inner_chain = make_cleanup_restore_current_language ();
   set_language (lang->la_language);
 
   inner_chain = make_cleanup_restore_current_language ();
   set_language (lang->la_language);
 

-  TRY_CATCH (except, RETURN_MASK_ALL)
+  TRY

     {
     {

-      if (lang->la_parser ())
+      if (lang->la_parser (&ps))

         lang->la_error (NULL);
     }
         lang->la_error (NULL);
     }

-  if (except.reason < 0)
+  CATCH (except, RETURN_MASK_ALL)

     {
       if (! parse_completion)
        {
     {
       if (! parse_completion)
        {

-         xfree (expout);
+         xfree (ps.expout);

          throw_exception (except);
        }
     }
          throw_exception (except);
        }
     }

+  END_CATCH

 
 

-  reallocate_expout ();
+  reallocate_expout (&ps);

 
   /* Convert expression from postfix form as generated by yacc
      parser, to a prefix form.  */
 
   if (expressiondebug)
 
   /* Convert expression from postfix form as generated by yacc
      parser, to a prefix form.  */
 
   if (expressiondebug)

-    dump_raw_expression (expout, gdb_stdlog,
+    dump_raw_expression (ps.expout, gdb_stdlog,

                         "before conversion to prefix form");
 
                         "before conversion to prefix form");
 

-  subexp = prefixify_expression (expout);
+  subexp = prefixify_expression (ps.expout);

   if (out_subexp)
     *out_subexp = subexp;
 
   if (out_subexp)
     *out_subexp = subexp;
 

-  lang->la_post_parser (&expout, void_context_p);
+  lang->la_post_parser (&ps.expout, void_context_p);

 
   if (expressiondebug)
 
   if (expressiondebug)

-    dump_prefix_expression (expout, gdb_stdlog);
+    dump_prefix_expression (ps.expout, gdb_stdlog);

 
   do_cleanups (inner_chain);
   discard_cleanups (old_chain);
 
   *stringptr = lexptr;
 
   do_cleanups (inner_chain);
   discard_cleanups (old_chain);
 
   *stringptr = lexptr;

-  return expout;
+  return ps.expout;

 }
 
 /* Parse STRING as an expression, and complain if this fails
 }
 
 /* Parse STRING as an expression, and complain if this fails


@@ -1295,6 +1270,28 @@ parse_expression (const char *string)
   return exp;
 }
 
   return exp;
 }
 

+/* Same as parse_expression, but using the given language (LANG)
+   to parse the expression.  */
+
+struct expression *
+parse_expression_with_language (const char *string, enum language lang)
+{
+  struct cleanup *old_chain = NULL;
+  struct expression *expr;
+
+  if (current_language->la_language != lang)
+    {
+      old_chain = make_cleanup_restore_current_language ();
+      set_language (lang);
+    }
+
+  expr = parse_expression (string);
+
+  if (old_chain != NULL)
+    do_cleanups (old_chain);
+  return expr;
+}
+

 /* Parse STRING as an expression.  If parsing ends in the middle of a
    field reference, return the type of the left-hand-side of the
    reference; furthermore, if the parsing ends in the field name,
 /* Parse STRING as an expression.  If parsing ends in the middle of a
    field reference, return the type of the left-hand-side of the
    reference; furthermore, if the parsing ends in the field name,


@@ -1310,15 +1307,20 @@ parse_expression_for_completion (const char *string, char **name,
   struct expression *exp = NULL;
   struct value *val;
   int subexp;
   struct expression *exp = NULL;
   struct value *val;
   int subexp;

-  volatile struct gdb_exception except;

 
 

-  TRY_CATCH (except, RETURN_MASK_ERROR)
+  TRY

     {
       parse_completion = 1;
       exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp);
     }
     {
       parse_completion = 1;
       exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp);
     }

+  CATCH (except, RETURN_MASK_ERROR)
+    {
+      /* Nothing, EXP remains NULL.  */
+    }
+  END_CATCH
+

   parse_completion = 0;
   parse_completion = 0;

-  if (except.reason < 0 || ! exp)
+  if (exp == NULL)

     return NULL;
 
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)
     return NULL;
 
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)


@@ -1372,7 +1374,7 @@ parse_float (const char *p, int len, DOUBLEST *d, const char **suffix)
   char *copy;
   int n, num;
 
   char *copy;
   int n, num;
 

-  copy = xmalloc (len + 1);
+  copy = (char *) xmalloc (len + 1);

   memcpy (copy, p, len);
   copy[len] = 0;
 
   memcpy (copy, p, len);
   copy[len] = 0;
 


@@ -1438,8 +1440,8 @@ type_stack_reserve (struct type_stack *stack, int howmuch)
       stack->size *= 2;
       if (stack->size < howmuch)
        stack->size = howmuch;
       stack->size *= 2;
       if (stack->size < howmuch)
        stack->size = howmuch;

-      stack->elements = xrealloc (stack->elements,
-                                 stack->size * sizeof (union type_stack_elt));
+      stack->elements = XRESIZEVEC (union type_stack_elt, stack->elements,
+                                   stack->size);

     }
 }
 
     }
 }
 


@@ -1517,7 +1519,7 @@ push_type_int (int n)
    item.  */
 
 void
    item.  */
 
 void

-insert_type_address_space (char *string)
+insert_type_address_space (struct parser_state *pstate, char *string)

 {
   union type_stack_elt element;
   int slot;
 {
   union type_stack_elt element;
   int slot;


@@ -1532,7 +1534,8 @@ insert_type_address_space (char *string)
 
   element.piece = tp_space_identifier;
   insert_into_type_stack (slot, element);
 
   element.piece = tp_space_identifier;
   insert_into_type_stack (slot, element);

-  element.int_val = address_space_name_to_int (parse_gdbarch, string);
+  element.int_val = address_space_name_to_int (parse_gdbarch (pstate),
+                                              string);

   insert_into_type_stack (slot, element);
 }
 
   insert_into_type_stack (slot, element);
 }
 


@@ -1618,7 +1621,7 @@ get_type_stack (void)
 void
 type_stack_cleanup (void *arg)
 {
 void
 type_stack_cleanup (void *arg)
 {

-  struct type_stack *stack = arg;
+  struct type_stack *stack = (struct type_stack *) arg;

 
   xfree (stack->elements);
   xfree (stack);
 
   xfree (stack->elements);
   xfree (stack);


@@ -1715,7 +1718,8 @@ follow_types (struct type *follow_type)
          lookup_array_range_type (follow_type,
                                   0, array_size >= 0 ? array_size - 1 : 0);
        if (array_size < 0)
          lookup_array_range_type (follow_type,
                                   0, array_size >= 0 ? array_size - 1 : 0);
        if (array_size < 0)

-         TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (follow_type) = 1;
+         TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (follow_type))
+           = PROP_UNDEFINED;

        break;
       case tp_function:
        /* FIXME-type-allocation: need a way to free this type when we are
        break;
       case tp_function:
        /* FIXME-type-allocation: need a way to free this type when we are


@@ -1835,7 +1839,7 @@ operator_check_standard (struct expression *exp, int pos,
 
        /* Check objfile where the variable itself is placed.
           SYMBOL_OBJ_SECTION (symbol) may be NULL.  */
 
        /* Check objfile where the variable itself is placed.
           SYMBOL_OBJ_SECTION (symbol) may be NULL.  */

-       if ((*objfile_func) (SYMBOL_SYMTAB (symbol)->objfile, data))
+       if ((*objfile_func) (symbol_objfile (symbol), data))

          return 1;
 
        /* Check objfile where is placed the code touching the variable.  */
          return 1;
 
        /* Check objfile where is placed the code touching the variable.  */


@@ -1857,12 +1861,12 @@ operator_check_standard (struct expression *exp, int pos,
   return 0;
 }
 
   return 0;
 }
 

-/* Call OBJFILE_FUNC for any TYPE and OBJFILE found being referenced by EXP.
-   The functions are never called with NULL OBJFILE.  Functions get passed an
-   arbitrary caller supplied DATA pointer.  If any of the functions returns
-   non-zero value then (any other) non-zero value is immediately returned to
-   the caller.  Otherwise zero is returned after iterating through whole EXP.
-   */
+/* Call OBJFILE_FUNC for any objfile found being referenced by EXP.
+   OBJFILE_FUNC is never called with NULL OBJFILE.  OBJFILE_FUNC get
+   passed an arbitrary caller supplied DATA pointer.  If OBJFILE_FUNC
+   returns non-zero value then (any other) non-zero value is immediately
+   returned to the caller.  Otherwise zero is returned after iterating
+   through whole EXP.  */

 
 static int
 exp_iterate (struct expression *exp,
 
 static int
 exp_iterate (struct expression *exp,


@@ -1894,7 +1898,7 @@ exp_iterate (struct expression *exp,
 static int
 exp_uses_objfile_iter (struct objfile *exp_objfile, void *objfile_voidp)
 {
 static int
 exp_uses_objfile_iter (struct objfile *exp_objfile, void *objfile_voidp)
 {

-  struct objfile *objfile = objfile_voidp;
+  struct objfile *objfile = (struct objfile *) objfile_voidp;

 
   if (exp_objfile->separate_debug_objfile_backlink)
     exp_objfile = exp_objfile->separate_debug_objfile_backlink;
 
   if (exp_objfile->separate_debug_objfile_backlink)
     exp_objfile = exp_objfile->separate_debug_objfile_backlink;


@@ -1914,6 +1918,21 @@ exp_uses_objfile (struct expression *exp, struct objfile *objfile)
   return exp_iterate (exp, exp_uses_objfile_iter, objfile);
 }
 
   return exp_iterate (exp, exp_uses_objfile_iter, objfile);
 }
 

+/* See definition in parser-defs.h.  */
+
+void
+increase_expout_size (struct parser_state *ps, size_t lenelt)
+{
+  if ((ps->expout_ptr + lenelt) >= ps->expout_size)
+    {
+      ps->expout_size = max (ps->expout_size * 2,
+                            ps->expout_ptr + lenelt + 10);
+      ps->expout = (struct expression *)
+       xrealloc (ps->expout, (sizeof (struct expression)
+                              + EXP_ELEM_TO_BYTES (ps->expout_size)));
+    }
+}
+

 void
 _initialize_parse (void)
 {
 void
 _initialize_parse (void)
 {