2001-10-04 Frank Ch. Eigler <fche@redhat.com>

[binutils-gdb.git] / gdb / ax-gdb.c

diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 6dea775e7ff2e1e2a235a015bf3af716f9d34b44..75424546a7b1de478383689a314dda0c7a2f0a35 100644 (file)
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -1,5 +1,5 @@
 /* GDB-specific functions for operating on agent expressions
 /* GDB-specific functions for operating on agent expressions

-   Copyright 1998 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -31,10 +31,11 @@
 #include "ax.h"
 #include "ax-gdb.h"
 
 #include "ax.h"
 #include "ax-gdb.h"
 

-/* Probably the best way to read this file is to start with the types
-   and enums in ax-gdb.h, and then look at gen_expr, towards the
-   bottom; that's the main function that looks at the GDB expressions
-   and calls everything else to generate code.
+/* To make sense of this file, you should read doc/agentexpr.texi.
+   Then look at the types and enums in ax-gdb.h.  For the code itself,
+   look at gen_expr, towards the bottom; that's the main function that
+   looks at the GDB expressions and calls everything else to generate
+   code.

 
    I'm beginning to wonder whether it wouldn't be nicer to internally
    generate trees, with types, and then spit out the bytecode in
 
    I'm beginning to wonder whether it wouldn't be nicer to internally
    generate trees, with types, and then spit out the bytecode in


@@ -55,101 +56,81 @@
    struct agent_expr * --- agent expression buffer to generate code into
    struct axs_value * --- describes value left on top of stack  */
 
    struct agent_expr * --- agent expression buffer to generate code into
    struct axs_value * --- describes value left on top of stack  */
 

-static struct value *const_var_ref PARAMS ((struct symbol * var));
-static struct value *const_expr PARAMS ((union exp_element ** pc));
-static struct value *maybe_const_expr PARAMS ((union exp_element ** pc));
-
-static void gen_traced_pop PARAMS ((struct agent_expr *, struct axs_value *));
-
-static void gen_sign_extend PARAMS ((struct agent_expr *, struct type *));
-static void gen_extend PARAMS ((struct agent_expr *, struct type *));
-static void gen_fetch PARAMS ((struct agent_expr *, struct type *));
-static void gen_left_shift PARAMS ((struct agent_expr *, int));
-
-
-static void gen_frame_args_address PARAMS ((struct agent_expr *));
-static void gen_frame_locals_address PARAMS ((struct agent_expr *));
-static void gen_offset PARAMS ((struct agent_expr * ax, int offset));
-static void gen_sym_offset PARAMS ((struct agent_expr *, struct symbol *));
-static void gen_var_ref PARAMS ((struct agent_expr * ax,
-                                struct axs_value * value,
-                                struct symbol * var));
-
-
-static void gen_int_literal PARAMS ((struct agent_expr * ax,
-                                    struct axs_value * value,
-                                    LONGEST k, struct type * type));
-
-
-static void require_rvalue PARAMS ((struct agent_expr * ax,
-                                   struct axs_value * value));
-static void gen_usual_unary PARAMS ((struct agent_expr * ax,
-                                    struct axs_value * value));
-static int type_wider_than PARAMS ((struct type * type1,
-                                   struct type * type2));
-static struct type *max_type PARAMS ((struct type * type1,
-                                     struct type * type2));
-static void gen_conversion PARAMS ((struct agent_expr * ax,
-                                   struct type * from,
-                                   struct type * to));
-static int is_nontrivial_conversion PARAMS ((struct type * from,
-                                            struct type * to));
-static void gen_usual_arithmetic PARAMS ((struct agent_expr * ax,
-                                         struct axs_value * value1,
-                                         struct axs_value * value2));
-static void gen_integral_promotions PARAMS ((struct agent_expr * ax,
-                                            struct axs_value * value));
-static void gen_cast PARAMS ((struct agent_expr * ax,
-                             struct axs_value * value,
-                             struct type * type));
-static void gen_scale PARAMS ((struct agent_expr * ax,
-                              enum agent_op op,
-                              struct type * type));
-static void gen_add PARAMS ((struct agent_expr * ax,
-                            struct axs_value * value,
-                            struct axs_value * value1,
-                            struct axs_value * value2,
-                            char *name));
-static void gen_sub PARAMS ((struct agent_expr * ax,
-                            struct axs_value * value,
-                            struct axs_value * value1,
-                            struct axs_value * value2));
-static void gen_binop PARAMS ((struct agent_expr * ax,
-                              struct axs_value * value,
-                              struct axs_value * value1,
-                              struct axs_value * value2,
-                              enum agent_op op,
-                              enum agent_op op_unsigned,
-                              int may_carry,
-                              char *name));
-static void gen_logical_not PARAMS ((struct agent_expr * ax,
-                                    struct axs_value * value));
-static void gen_complement PARAMS ((struct agent_expr * ax,
-                                   struct axs_value * value));
-static void gen_deref PARAMS ((struct agent_expr *, struct axs_value *));
-static void gen_address_of PARAMS ((struct agent_expr *, struct axs_value *));
-static int find_field PARAMS ((struct type * type, char *name));
-static void gen_bitfield_ref PARAMS ((struct agent_expr * ax,
-                                     struct axs_value * value,
-                                     struct type * type,
-                                     int start, int end));
-static void gen_struct_ref PARAMS ((struct agent_expr * ax,
-                                   struct axs_value * value,
-                                   char *field,
-                                   char *operator_name,
-                                   char *operand_name));
-static void gen_repeat PARAMS ((union exp_element ** pc,
-                               struct agent_expr * ax,
-                               struct axs_value * value));
-static void gen_sizeof PARAMS ((union exp_element ** pc,
-                               struct agent_expr * ax,
-                               struct axs_value * value));
-static void gen_expr PARAMS ((union exp_element ** pc,
-                             struct agent_expr * ax,
-                             struct axs_value * value));
-
-static void print_axs_value PARAMS ((GDB_FILE * f, struct axs_value * value));
-static void agent_command PARAMS ((char *exp, int from_tty));
+static struct value *const_var_ref (struct symbol *var);
+static struct value *const_expr (union exp_element **pc);
+static struct value *maybe_const_expr (union exp_element **pc);
+
+static void gen_traced_pop (struct agent_expr *, struct axs_value *);
+
+static void gen_sign_extend (struct agent_expr *, struct type *);
+static void gen_extend (struct agent_expr *, struct type *);
+static void gen_fetch (struct agent_expr *, struct type *);
+static void gen_left_shift (struct agent_expr *, int);
+
+
+static void gen_frame_args_address (struct agent_expr *);
+static void gen_frame_locals_address (struct agent_expr *);
+static void gen_offset (struct agent_expr *ax, int offset);
+static void gen_sym_offset (struct agent_expr *, struct symbol *);
+static void gen_var_ref (struct agent_expr *ax,
+                        struct axs_value *value, struct symbol *var);
+
+
+static void gen_int_literal (struct agent_expr *ax,
+                            struct axs_value *value,
+                            LONGEST k, struct type *type);
+
+
+static void require_rvalue (struct agent_expr *ax, struct axs_value *value);
+static void gen_usual_unary (struct agent_expr *ax, struct axs_value *value);
+static int type_wider_than (struct type *type1, struct type *type2);
+static struct type *max_type (struct type *type1, struct type *type2);
+static void gen_conversion (struct agent_expr *ax,
+                           struct type *from, struct type *to);
+static int is_nontrivial_conversion (struct type *from, struct type *to);
+static void gen_usual_arithmetic (struct agent_expr *ax,
+                                 struct axs_value *value1,
+                                 struct axs_value *value2);
+static void gen_integral_promotions (struct agent_expr *ax,
+                                    struct axs_value *value);
+static void gen_cast (struct agent_expr *ax,
+                     struct axs_value *value, struct type *type);
+static void gen_scale (struct agent_expr *ax,
+                      enum agent_op op, struct type *type);
+static void gen_add (struct agent_expr *ax,
+                    struct axs_value *value,
+                    struct axs_value *value1,
+                    struct axs_value *value2, char *name);
+static void gen_sub (struct agent_expr *ax,
+                    struct axs_value *value,
+                    struct axs_value *value1, struct axs_value *value2);
+static void gen_binop (struct agent_expr *ax,
+                      struct axs_value *value,
+                      struct axs_value *value1,
+                      struct axs_value *value2,
+                      enum agent_op op,
+                      enum agent_op op_unsigned, int may_carry, char *name);
+static void gen_logical_not (struct agent_expr *ax, struct axs_value *value);
+static void gen_complement (struct agent_expr *ax, struct axs_value *value);
+static void gen_deref (struct agent_expr *, struct axs_value *);
+static void gen_address_of (struct agent_expr *, struct axs_value *);
+static int find_field (struct type *type, char *name);
+static void gen_bitfield_ref (struct agent_expr *ax,
+                             struct axs_value *value,
+                             struct type *type, int start, int end);
+static void gen_struct_ref (struct agent_expr *ax,
+                           struct axs_value *value,
+                           char *field,
+                           char *operator_name, char *operand_name);
+static void gen_repeat (union exp_element **pc,
+                       struct agent_expr *ax, struct axs_value *value);
+static void gen_sizeof (union exp_element **pc,
+                       struct agent_expr *ax, struct axs_value *value);
+static void gen_expr (union exp_element **pc,
+                     struct agent_expr *ax, struct axs_value *value);
+
+static void print_axs_value (struct ui_file *f, struct axs_value * value);
+static void agent_command (char *exp, int from_tty);

 \f
 
 /* Detecting constant expressions.  */
 \f
 
 /* Detecting constant expressions.  */


@@ -173,8 +154,7 @@ static void agent_command PARAMS ((char *exp, int from_tty));
    proletariat?  */
 
 static struct value *
    proletariat?  */
 
 static struct value *

-const_var_ref (var)
-     struct symbol *var;
+const_var_ref (struct symbol *var)

 {
   struct type *type = SYMBOL_TYPE (var);
 
 {
   struct type *type = SYMBOL_TYPE (var);
 


@@ -184,7 +164,7 @@ const_var_ref (var)
       return value_from_longest (type, (LONGEST) SYMBOL_VALUE (var));
 
     case LOC_LABEL:
       return value_from_longest (type, (LONGEST) SYMBOL_VALUE (var));
 
     case LOC_LABEL:

-      return value_from_longest (type, (LONGEST) SYMBOL_VALUE_ADDRESS (var));
+      return value_from_pointer (type, (CORE_ADDR) SYMBOL_VALUE_ADDRESS (var));

 
     default:
       return 0;
 
     default:
       return 0;


@@ -197,8 +177,7 @@ const_var_ref (var)
    advanced to the end of it.  If we return zero, *PC could be
    anywhere.  */
 static struct value *
    advanced to the end of it.  If we return zero, *PC could be
    anywhere.  */
 static struct value *

-const_expr (pc)
-     union exp_element **pc;
+const_expr (union exp_element **pc)

 {
   enum exp_opcode op = (*pc)->opcode;
   struct value *v1;
 {
   enum exp_opcode op = (*pc)->opcode;
   struct value *v1;


@@ -239,8 +218,7 @@ const_expr (pc)
 /* Like const_expr, but guarantee also that *PC is undisturbed if the
    expression is not constant.  */
 static struct value *
 /* Like const_expr, but guarantee also that *PC is undisturbed if the
    expression is not constant.  */
 static struct value *

-maybe_const_expr (pc)
-     union exp_element **pc;
+maybe_const_expr (union exp_element **pc)

 {
   union exp_element *tentative_pc = *pc;
   struct value *v = const_expr (&tentative_pc);
 {
   union exp_element *tentative_pc = *pc;
   struct value *v = const_expr (&tentative_pc);


@@ -326,9 +304,7 @@ static int trace_kludge;
    the value.  Useful on the left side of a comma, and at the end of
    an expression being used for tracing.  */
 static void
    the value.  Useful on the left side of a comma, and at the end of
    an expression being used for tracing.  */
 static void

-gen_traced_pop (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_traced_pop (struct agent_expr *ax, struct axs_value *value)

 {
   if (trace_kludge)
     switch (value->kind)
 {
   if (trace_kludge)
     switch (value->kind)


@@ -373,9 +349,7 @@ gen_traced_pop (ax, value)
 /* Assume that the lower bits of the top of the stack is a value of
    type TYPE, and the upper bits are zero.  Sign-extend if necessary.  */
 static void
 /* Assume that the lower bits of the top of the stack is a value of
    type TYPE, and the upper bits are zero.  Sign-extend if necessary.  */
 static void

-gen_sign_extend (ax, type)
-     struct agent_expr *ax;
-     struct type *type;
+gen_sign_extend (struct agent_expr *ax, struct type *type)

 {
   /* Do we need to sign-extend this?  */
   if (!TYPE_UNSIGNED (type))
 {
   /* Do we need to sign-extend this?  */
   if (!TYPE_UNSIGNED (type))


@@ -387,9 +361,7 @@ gen_sign_extend (ax, type)
    TYPE, and the upper bits are garbage.  Sign-extend or truncate as
    needed.  */
 static void
    TYPE, and the upper bits are garbage.  Sign-extend or truncate as
    needed.  */
 static void

-gen_extend (ax, type)
-     struct agent_expr *ax;
-     struct type *type;
+gen_extend (struct agent_expr *ax, struct type *type)

 {
   int bits = type->length * TARGET_CHAR_BIT;
   /* I just had to.  */
 {
   int bits = type->length * TARGET_CHAR_BIT;
   /* I just had to.  */


@@ -401,9 +373,7 @@ gen_extend (ax, type)
    to TYPE"; generate code to fetch its value.  Note that TYPE is the
    target type, not the pointer type.  */
 static void
    to TYPE"; generate code to fetch its value.  Note that TYPE is the
    target type, not the pointer type.  */
 static void

-gen_fetch (ax, type)
-     struct agent_expr *ax;
-     struct type *type;
+gen_fetch (struct agent_expr *ax, struct type *type)

 {
   if (trace_kludge)
     {
 {
   if (trace_kludge)
     {


@@ -439,7 +409,8 @@ gen_fetch (ax, type)
             implementing something we should be (this code's fault).
             In any case, it's a bug the user shouldn't see.  */
        default:
             implementing something we should be (this code's fault).
             In any case, it's a bug the user shouldn't see.  */
        default:

-         error ("GDB bug: ax-gdb.c (gen_fetch): strange size");
+         internal_error (__FILE__, __LINE__,
+                         "gen_fetch: strange size");

        }
 
       gen_sign_extend (ax, type);
        }
 
       gen_sign_extend (ax, type);


@@ -450,7 +421,8 @@ gen_fetch (ax, type)
          pointer (other code's fault), or we're not implementing
          something we should be (this code's fault).  In any case,
          it's a bug the user shouldn't see.  */
          pointer (other code's fault), or we're not implementing
          something we should be (this code's fault).  In any case,
          it's a bug the user shouldn't see.  */

-      error ("GDB bug: ax-gdb.c (gen_fetch): bad type code");
+      internal_error (__FILE__, __LINE__,
+                     "gen_fetch: bad type code");

     }
 }
 
     }
 }
 


@@ -459,9 +431,7 @@ gen_fetch (ax, type)
    right shift it by -DISTANCE bits if DISTANCE < 0.  This generates
    unsigned (logical) right shifts.  */
 static void
    right shift it by -DISTANCE bits if DISTANCE < 0.  This generates
    unsigned (logical) right shifts.  */
 static void

-gen_left_shift (ax, distance)
-     struct agent_expr *ax;
-     int distance;
+gen_left_shift (struct agent_expr *ax, int distance)

 {
   if (distance > 0)
     {
 {
   if (distance > 0)
     {


@@ -482,10 +452,10 @@ gen_left_shift (ax, distance)
 /* Generate code to push the base address of the argument portion of
    the top stack frame.  */
 static void
 /* Generate code to push the base address of the argument portion of
    the top stack frame.  */
 static void

-gen_frame_args_address (ax)
-     struct agent_expr *ax;
+gen_frame_args_address (struct agent_expr *ax)

 {
 {

-  long frame_reg, frame_offset;
+  int frame_reg;
+  LONGEST frame_offset;

 
   TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset);
   ax_reg (ax, frame_reg);
 
   TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset);
   ax_reg (ax, frame_reg);


@@ -496,10 +466,10 @@ gen_frame_args_address (ax)
 /* Generate code to push the base address of the locals portion of the
    top stack frame.  */
 static void
 /* Generate code to push the base address of the locals portion of the
    top stack frame.  */
 static void

-gen_frame_locals_address (ax)
-     struct agent_expr *ax;
+gen_frame_locals_address (struct agent_expr *ax)

 {
 {

-  long frame_reg, frame_offset;
+  int frame_reg;
+  LONGEST frame_offset;

 
   TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset);
   ax_reg (ax, frame_reg);
 
   TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset);
   ax_reg (ax, frame_reg);


@@ -513,9 +483,7 @@ gen_frame_locals_address (ax)
    programming in ML, it would be clearer why these are the same
    thing.  */
 static void
    programming in ML, it would be clearer why these are the same
    thing.  */
 static void

-gen_offset (ax, offset)
-     struct agent_expr *ax;
-     int offset;
+gen_offset (struct agent_expr *ax, int offset)

 {
   /* It would suffice to simply push the offset and add it, but this
      makes it easier to read positive and negative offsets in the
 {
   /* It would suffice to simply push the offset and add it, but this
      makes it easier to read positive and negative offsets in the


@@ -537,9 +505,7 @@ gen_offset (ax, offset)
    address (stack frame, base register, etc.)  Generate code to add
    VAR's value to the top of the stack.  */
 static void
    address (stack frame, base register, etc.)  Generate code to add
    VAR's value to the top of the stack.  */
 static void

-gen_sym_offset (ax, var)
-     struct agent_expr *ax;
-     struct symbol *var;
+gen_sym_offset (struct agent_expr *ax, struct symbol *var)

 {
   gen_offset (ax, SYMBOL_VALUE (var));
 }
 {
   gen_offset (ax, SYMBOL_VALUE (var));
 }


@@ -549,10 +515,7 @@ gen_sym_offset (ax, var)
    symbol VAR.  Set VALUE to describe the result.  */
 
 static void
    symbol VAR.  Set VALUE to describe the result.  */
 
 static void

-gen_var_ref (ax, value, var)
-     struct agent_expr *ax;
-     struct axs_value *value;
-     struct symbol *var;
+gen_var_ref (struct agent_expr *ax, struct axs_value *value, struct symbol *var)

 {
   /* Dereference any typedefs. */
   value->type = check_typedef (SYMBOL_TYPE (var));
 {
   /* Dereference any typedefs. */
   value->type = check_typedef (SYMBOL_TYPE (var));


@@ -571,7 +534,8 @@ gen_var_ref (ax, value, var)
       break;
 
     case LOC_CONST_BYTES:
       break;
 
     case LOC_CONST_BYTES:

-      error ("GDB bug: ax-gdb.c (gen_var_ref): LOC_CONST_BYTES symbols are not supported");
+      internal_error (__FILE__, __LINE__,
+                     "gen_var_ref: LOC_CONST_BYTES symbols are not supported");

 
       /* Variable at a fixed location in memory.  Easy.  */
     case LOC_STATIC:
 
       /* Variable at a fixed location in memory.  Easy.  */
     case LOC_STATIC:


@@ -667,11 +631,8 @@ gen_var_ref (ax, value, var)
 /* Generating bytecode from GDB expressions: literals */
 
 static void
 /* Generating bytecode from GDB expressions: literals */
 
 static void

-gen_int_literal (ax, value, k, type)
-     struct agent_expr *ax;
-     struct axs_value *value;
-     LONGEST k;
-     struct type *type;
+gen_int_literal (struct agent_expr *ax, struct axs_value *value, LONGEST k,
+                struct type *type)

 {
   ax_const_l (ax, k);
   value->kind = axs_rvalue;
 {
   ax_const_l (ax, k);
   value->kind = axs_rvalue;


@@ -686,9 +647,7 @@ gen_int_literal (ax, value, k, type)
    try to make an rvalue out of it.  Signal an error if we can't do
    that.  */
 static void
    try to make an rvalue out of it.  Signal an error if we can't do
    that.  */
 static void

-require_rvalue (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+require_rvalue (struct agent_expr *ax, struct axs_value *value)

 {
   switch (value->kind)
     {
 {
   switch (value->kind)
     {


@@ -733,9 +692,7 @@ require_rvalue (ax, value)
    lvalue through unchanged, and let `+' raise an error.  */
 
 static void
    lvalue through unchanged, and let `+' raise an error.  */
 
 static void

-gen_usual_unary (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_usual_unary (struct agent_expr *ax, struct axs_value *value)

 {
   /* We don't have to generate any code for the usual integral
      conversions, since values are always represented as full-width on
 {
   /* We don't have to generate any code for the usual integral
      conversions, since values are always represented as full-width on


@@ -782,8 +739,7 @@ gen_usual_unary (ax, value)
 /* Return non-zero iff the type TYPE1 is considered "wider" than the
    type TYPE2, according to the rules described in gen_usual_arithmetic.  */
 static int
 /* Return non-zero iff the type TYPE1 is considered "wider" than the
    type TYPE2, according to the rules described in gen_usual_arithmetic.  */
 static int

-type_wider_than (type1, type2)
-     struct type *type1, *type2;
+type_wider_than (struct type *type1, struct type *type2)

 {
   return (TYPE_LENGTH (type1) > TYPE_LENGTH (type2)
          || (TYPE_LENGTH (type1) == TYPE_LENGTH (type2)
 {
   return (TYPE_LENGTH (type1) > TYPE_LENGTH (type2)
          || (TYPE_LENGTH (type1) == TYPE_LENGTH (type2)


@@ -794,8 +750,7 @@ type_wider_than (type1, type2)
 
 /* Return the "wider" of the two types TYPE1 and TYPE2.  */
 static struct type *
 
 /* Return the "wider" of the two types TYPE1 and TYPE2.  */
 static struct type *

-max_type (type1, type2)
-     struct type *type1, *type2;
+max_type (struct type *type1, struct type *type2)

 {
   return type_wider_than (type1, type2) ? type1 : type2;
 }
 {
   return type_wider_than (type1, type2) ? type1 : type2;
 }


@@ -803,9 +758,7 @@ max_type (type1, type2)
 
 /* Generate code to convert a scalar value of type FROM to type TO.  */
 static void
 
 /* Generate code to convert a scalar value of type FROM to type TO.  */
 static void

-gen_conversion (ax, from, to)
-     struct agent_expr *ax;
-     struct type *from, *to;
+gen_conversion (struct agent_expr *ax, struct type *from, struct type *to)

 {
   /* Perhaps there is a more graceful way to state these rules.  */
 
 {
   /* Perhaps there is a more graceful way to state these rules.  */
 


@@ -835,8 +788,7 @@ gen_conversion (ax, from, to)
 /* Return non-zero iff the type FROM will require any bytecodes to be
    emitted to be converted to the type TO.  */
 static int
 /* Return non-zero iff the type FROM will require any bytecodes to be
    emitted to be converted to the type TO.  */
 static int

-is_nontrivial_conversion (from, to)
-     struct type *from, *to;
+is_nontrivial_conversion (struct type *from, struct type *to)

 {
   struct agent_expr *ax = new_agent_expr (0);
   int nontrivial;
 {
   struct agent_expr *ax = new_agent_expr (0);
   int nontrivial;


@@ -860,9 +812,8 @@ is_nontrivial_conversion (from, to)
    and promotes each argument to that type.  *VALUE1 and *VALUE2
    describe the values as they are passed in, and as they are left.  */
 static void
    and promotes each argument to that type.  *VALUE1 and *VALUE2
    describe the values as they are passed in, and as they are left.  */
 static void

-gen_usual_arithmetic (ax, value1, value2)
-     struct agent_expr *ax;
-     struct axs_value *value1, *value2;
+gen_usual_arithmetic (struct agent_expr *ax, struct axs_value *value1,
+                     struct axs_value *value2)

 {
   /* Do the usual binary conversions.  */
   if (TYPE_CODE (value1->type) == TYPE_CODE_INT
 {
   /* Do the usual binary conversions.  */
   if (TYPE_CODE (value1->type) == TYPE_CODE_INT


@@ -898,9 +849,7 @@ gen_usual_arithmetic (ax, value1, value2)
    the value on the top of the stack, as described by VALUE.  Assume
    the value has integral type.  */
 static void
    the value on the top of the stack, as described by VALUE.  Assume
    the value has integral type.  */
 static void

-gen_integral_promotions (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_integral_promotions (struct agent_expr *ax, struct axs_value *value)

 {
   if (!type_wider_than (value->type, builtin_type_int))
     {
 {
   if (!type_wider_than (value->type, builtin_type_int))
     {


@@ -917,10 +866,7 @@ gen_integral_promotions (ax, value)
 
 /* Generate code for a cast to TYPE.  */
 static void
 
 /* Generate code for a cast to TYPE.  */
 static void

-gen_cast (ax, value, type)
-     struct agent_expr *ax;
-     struct axs_value *value;
-     struct type *type;
+gen_cast (struct agent_expr *ax, struct axs_value *value, struct type *type)

 {
   /* GCC does allow casts to yield lvalues, so this should be fixed
      before merging these changes into the trunk.  */
 {
   /* GCC does allow casts to yield lvalues, so this should be fixed
      before merging these changes into the trunk.  */


@@ -975,10 +921,7 @@ gen_cast (ax, value, type)
 /* Scale the integer on the top of the stack by the size of the target
    of the pointer type TYPE.  */
 static void
 /* Scale the integer on the top of the stack by the size of the target
    of the pointer type TYPE.  */
 static void

-gen_scale (ax, op, type)
-     struct agent_expr *ax;
-     enum agent_op op;
-     struct type *type;
+gen_scale (struct agent_expr *ax, enum agent_op op, struct type *type)

 {
   struct type *element = TYPE_TARGET_TYPE (type);
 
 {
   struct type *element = TYPE_TARGET_TYPE (type);
 


@@ -996,10 +939,8 @@ gen_scale (ax, op, type)
    they've undergone the usual binary conversions.  Used by both
    BINOP_ADD and BINOP_SUBSCRIPT.  NAME is used in error messages.  */
 static void
    they've undergone the usual binary conversions.  Used by both
    BINOP_ADD and BINOP_SUBSCRIPT.  NAME is used in error messages.  */
 static void

-gen_add (ax, value, value1, value2, name)
-     struct agent_expr *ax;
-     struct axs_value *value, *value1, *value2;
-     char *name;
+gen_add (struct agent_expr *ax, struct axs_value *value,
+        struct axs_value *value1, struct axs_value *value2, char *name)

 {
   /* Is it INT+PTR?  */
   if (value1->type->code == TYPE_CODE_INT
 {
   /* Is it INT+PTR?  */
   if (value1->type->code == TYPE_CODE_INT


@@ -1045,12 +986,9 @@ gen_add (ax, value, value1, value2, name)
    value; we assume VALUE1 and VALUE2 describe the two operands, and
    that they've undergone the usual binary conversions.  */
 static void
    value; we assume VALUE1 and VALUE2 describe the two operands, and
    that they've undergone the usual binary conversions.  */
 static void

-gen_sub (ax, value, value1, value2)
-     struct agent_expr *ax;
-     struct axs_value *value, *value1, *value2;
+gen_sub (struct agent_expr *ax, struct axs_value *value,
+        struct axs_value *value1, struct axs_value *value2)

 {
 {

-  struct type *element;
-

   if (value1->type->code == TYPE_CODE_PTR)
     {
       /* Is it PTR - INT?  */
   if (value1->type->code == TYPE_CODE_PTR)
     {
       /* Is it PTR - INT?  */


@@ -1101,12 +1039,9 @@ an integer nor a pointer of the same type.");
    result needs to be extended.  NAME is the English name of the
    operator, used in error messages */
 static void
    result needs to be extended.  NAME is the English name of the
    operator, used in error messages */
 static void

-gen_binop (ax, value, value1, value2, op, op_unsigned, may_carry, name)
-     struct agent_expr *ax;
-     struct axs_value *value, *value1, *value2;
-     enum agent_op op, op_unsigned;
-     int may_carry;
-     char *name;
+gen_binop (struct agent_expr *ax, struct axs_value *value,
+          struct axs_value *value1, struct axs_value *value2, enum agent_op op,
+          enum agent_op op_unsigned, int may_carry, char *name)

 {
   /* We only handle INT op INT.  */
   if ((value1->type->code != TYPE_CODE_INT)
 {
   /* We only handle INT op INT.  */
   if ((value1->type->code != TYPE_CODE_INT)


@@ -1123,9 +1058,7 @@ gen_binop (ax, value, value1, value2, op, op_unsigned, may_carry, name)
 
 
 static void
 
 
 static void

-gen_logical_not (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_logical_not (struct agent_expr *ax, struct axs_value *value)

 {
   if (TYPE_CODE (value->type) != TYPE_CODE_INT
       && TYPE_CODE (value->type) != TYPE_CODE_PTR)
 {
   if (TYPE_CODE (value->type) != TYPE_CODE_INT
       && TYPE_CODE (value->type) != TYPE_CODE_PTR)


@@ -1138,9 +1071,7 @@ gen_logical_not (ax, value)
 
 
 static void
 
 
 static void

-gen_complement (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_complement (struct agent_expr *ax, struct axs_value *value)

 {
   if (TYPE_CODE (value->type) != TYPE_CODE_INT)
     error ("Illegal type of operand to `~'.");
 {
   if (TYPE_CODE (value->type) != TYPE_CODE_INT)
     error ("Illegal type of operand to `~'.");


@@ -1157,14 +1088,13 @@ gen_complement (ax, value)
 
 /* Dereference the value on the top of the stack.  */
 static void
 
 /* Dereference the value on the top of the stack.  */
 static void

-gen_deref (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_deref (struct agent_expr *ax, struct axs_value *value)

 {
   /* The caller should check the type, because several operators use
      this, and we don't know what error message to generate.  */
   if (value->type->code != TYPE_CODE_PTR)
 {
   /* The caller should check the type, because several operators use
      this, and we don't know what error message to generate.  */
   if (value->type->code != TYPE_CODE_PTR)

-    error ("GDB bug: ax-gdb.c (gen_deref): expected a pointer");
+    internal_error (__FILE__, __LINE__,
+                   "gen_deref: expected a pointer");

 
   /* We've got an rvalue now, which is a pointer.  We want to yield an
      lvalue, whose address is exactly that pointer.  So we don't
 
   /* We've got an rvalue now, which is a pointer.  We want to yield an
      lvalue, whose address is exactly that pointer.  So we don't


@@ -1179,9 +1109,7 @@ gen_deref (ax, value)
 
 /* Produce the address of the lvalue on the top of the stack.  */
 static void
 
 /* Produce the address of the lvalue on the top of the stack.  */
 static void

-gen_address_of (ax, value)
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_address_of (struct agent_expr *ax, struct axs_value *value)

 {
   /* Special case for taking the address of a function.  The ANSI
      standard describes this as a special case, too, so this
 {
   /* Special case for taking the address of a function.  The ANSI
      standard describes this as a special case, too, so this


@@ -1213,9 +1141,7 @@ gen_address_of (ax, value)
 /* Find the field in the structure type TYPE named NAME, and return
    its index in TYPE's field array.  */
 static int
 /* Find the field in the structure type TYPE named NAME, and return
    its index in TYPE's field array.  */
 static int

-find_field (type, name)
-     struct type *type;
-     char *name;
+find_field (struct type *type, char *name)

 {
   int i;
 
 {
   int i;
 


@@ -1223,7 +1149,8 @@ find_field (type, name)
 
   /* Make sure this isn't C++.  */
   if (TYPE_N_BASECLASSES (type) != 0)
 
   /* Make sure this isn't C++.  */
   if (TYPE_N_BASECLASSES (type) != 0)

-    error ("GDB bug: ax-gdb.c (find_field): derived classes supported");
+    internal_error (__FILE__, __LINE__,
+                   "find_field: derived classes supported");

 
   for (i = 0; i < TYPE_NFIELDS (type); i++)
     {
 
   for (i = 0; i < TYPE_NFIELDS (type); i++)
     {


@@ -1233,7 +1160,8 @@ find_field (type, name)
        return i;
 
       if (this_name[0] == '\0')
        return i;
 
       if (this_name[0] == '\0')

-       error ("GDB bug: ax-gdb.c (find_field): anonymous unions not supported");
+       internal_error (__FILE__, __LINE__,
+                       "find_field: anonymous unions not supported");

     }
 
   error ("Couldn't find member named `%s' in struct/union `%s'",
     }
 
   error ("Couldn't find member named `%s' in struct/union `%s'",


@@ -1248,11 +1176,8 @@ find_field (type, name)
    starting and one-past-ending *bit* numbers of the field within the
    structure.  */
 static void
    starting and one-past-ending *bit* numbers of the field within the
    structure.  */
 static void

-gen_bitfield_ref (ax, value, type, start, end)
-     struct agent_expr *ax;
-     struct axs_value *value;
-     struct type *type;
-     int start, end;
+gen_bitfield_ref (struct agent_expr *ax, struct axs_value *value,
+                 struct type *type, int start, int end)

 {
   /* Note that ops[i] fetches 8 << i bits.  */
   static enum agent_op ops[]
 {
   /* Note that ops[i] fetches 8 << i bits.  */
   static enum agent_op ops[]


@@ -1308,7 +1233,8 @@ gen_bitfield_ref (ax, value, type, start, end)
 
   /* Can we fetch the number of bits requested at all?  */
   if ((end - start) > ((1 << num_ops) * 8))
 
   /* Can we fetch the number of bits requested at all?  */
   if ((end - start) > ((1 << num_ops) * 8))

-    error ("GDB bug: ax-gdb.c (gen_bitfield_ref): bitfield too wide");
+    internal_error (__FILE__, __LINE__,
+                   "gen_bitfield_ref: bitfield too wide");

 
   /* Note that we know here that we only need to try each opcode once.
      That may not be true on machines with weird byte sizes.  */
 
   /* Note that we know here that we only need to try each opcode once.
      That may not be true on machines with weird byte sizes.  */


@@ -1411,12 +1337,8 @@ gen_bitfield_ref (ax, value, type, start, end)
    the operator being compiled, and OPERAND_NAME is the kind of thing
    it operates on; we use them in error messages.  */
 static void
    the operator being compiled, and OPERAND_NAME is the kind of thing
    it operates on; we use them in error messages.  */
 static void

-gen_struct_ref (ax, value, field, operator_name, operand_name)
-     struct agent_expr *ax;
-     struct axs_value *value;
-     char *field;
-     char *operator_name;
-     char *operand_name;
+gen_struct_ref (struct agent_expr *ax, struct axs_value *value, char *field,
+               char *operator_name, char *operand_name)

 {
   struct type *type;
   int i;
 {
   struct type *type;
   int i;


@@ -1429,7 +1351,7 @@ gen_struct_ref (ax, value, field, operator_name, operand_name)
       gen_usual_unary (ax, value);
       gen_deref (ax, value);
     }
       gen_usual_unary (ax, value);
       gen_deref (ax, value);
     }

-  type = value->type;
+  type = check_typedef (value->type);

 
   /* This must yield a structure or a union.  */
   if (TYPE_CODE (type) != TYPE_CODE_STRUCT
 
   /* This must yield a structure or a union.  */
   if (TYPE_CODE (type) != TYPE_CODE_STRUCT


@@ -1471,10 +1393,8 @@ gen_struct_ref (ax, value, field, operator_name, operand_name)
    stack slots, doing weird things with sizeof, etc.  So we require
    the right operand to be a constant expression.  */
 static void
    stack slots, doing weird things with sizeof, etc.  So we require
    the right operand to be a constant expression.  */
 static void

-gen_repeat (pc, ax, value)
-     union exp_element **pc;
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_repeat (union exp_element **pc, struct agent_expr *ax,
+           struct axs_value *value)

 {
   struct axs_value value1;
   /* We don't want to turn this into an rvalue, so no conversions
 {
   struct axs_value value1;
   /* We don't want to turn this into an rvalue, so no conversions


@@ -1516,10 +1436,8 @@ gen_repeat (pc, ax, value)
    *PC should point at the start of the operand expression; we advance it
    to the first instruction after the operand.  */
 static void
    *PC should point at the start of the operand expression; we advance it
    to the first instruction after the operand.  */
 static void

-gen_sizeof (pc, ax, value)
-     union exp_element **pc;
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_sizeof (union exp_element **pc, struct agent_expr *ax,
+           struct axs_value *value)

 {
   /* We don't care about the value of the operand expression; we only
      care about its type.  However, in the current arrangement, the
 {
   /* We don't care about the value of the operand expression; we only
      care about its type.  However, in the current arrangement, the


@@ -1543,10 +1461,8 @@ gen_sizeof (pc, ax, value)
 /* A gen_expr function written by a Gen-X'er guy.
    Append code for the subexpression of EXPR starting at *POS_P to AX.  */
 static void
 /* A gen_expr function written by a Gen-X'er guy.
    Append code for the subexpression of EXPR starting at *POS_P to AX.  */
 static void

-gen_expr (pc, ax, value)
-     union exp_element **pc;
-     struct agent_expr *ax;
-     struct axs_value *value;
+gen_expr (union exp_element **pc, struct agent_expr *ax,
+         struct axs_value *value)

 {
   /* Used to hold the descriptions of operand expressions.  */
   struct axs_value value1, value2;
 {
   /* Used to hold the descriptions of operand expressions.  */
   struct axs_value value1, value2;


@@ -1628,7 +1544,8 @@ gen_expr (pc, ax, value)
        default:
          /* We should only list operators in the outer case statement
             that we actually handle in the inner case statement.  */
        default:
          /* We should only list operators in the outer case statement
             that we actually handle in the inner case statement.  */

-         error ("GDB bug: ax-gdb.c (gen_expr): op case sets don't match");
+         internal_error (__FILE__, __LINE__,
+                         "gen_expr: op case sets don't match");

        }
       break;
 
        }
       break;
 


@@ -1703,7 +1620,8 @@ gen_expr (pc, ax, value)
           the given type, and dereference it.  */
        if (value->kind != axs_rvalue)
          /* This would be weird.  */
           the given type, and dereference it.  */
        if (value->kind != axs_rvalue)
          /* This would be weird.  */

-         error ("GDB bug: ax-gdb.c (gen_expr): OP_MEMVAL operand isn't an rvalue???");
+         internal_error (__FILE__, __LINE__,
+                         "gen_expr: OP_MEMVAL operand isn't an rvalue???");

        value->type = type;
        value->kind = axs_lvalue_memory;
       }
        value->type = type;
        value->kind = axs_lvalue_memory;
       }


@@ -1771,7 +1689,8 @@ gen_expr (pc, ax, value)
        else
          /* If this `if' chain doesn't handle it, then the case list
             shouldn't mention it, and we shouldn't be here.  */
        else
          /* If this `if' chain doesn't handle it, then the case list
             shouldn't mention it, and we shouldn't be here.  */

-         error ("GDB bug: ax-gdb.c (gen_expr): unhandled struct case");
+         internal_error (__FILE__, __LINE__,
+                         "gen_expr: unhandled struct case");

       }
       break;
 
       }
       break;
 


@@ -1785,22 +1704,19 @@ gen_expr (pc, ax, value)
 \f
 
 
 \f
 
 

-#if 0                          /* not used */

 /* Generating bytecode from GDB expressions: driver */
 
 /* Given a GDB expression EXPR, produce a string of agent bytecode
    which computes its value.  Return the agent expression, and set
    *VALUE to describe its type, and whether it's an lvalue or rvalue.  */
 struct agent_expr *
 /* Generating bytecode from GDB expressions: driver */
 
 /* Given a GDB expression EXPR, produce a string of agent bytecode
    which computes its value.  Return the agent expression, and set
    *VALUE to describe its type, and whether it's an lvalue or rvalue.  */
 struct agent_expr *

-expr_to_agent (expr, value)
-     struct expression *expr;
-     struct axs_value *value;
+expr_to_agent (struct expression *expr, struct axs_value *value)

 {
   struct cleanup *old_chain = 0;
 {
   struct cleanup *old_chain = 0;

-  struct agent_expr *ax = new_agent_expr ();
+  struct agent_expr *ax = new_agent_expr (0);

   union exp_element *pc;
 
   union exp_element *pc;
 

-  old_chain = make_cleanup ((make_cleanup_func) free_agent_expr, ax);
+  old_chain = make_cleanup_free_agent_expr (ax);

 
   pc = expr->elts;
   trace_kludge = 0;
 
   pc = expr->elts;
   trace_kludge = 0;


@@ -1814,14 +1730,14 @@ expr_to_agent (expr, value)
 }
 
 
 }
 
 

+#if 0                          /* not used */

 /* Given a GDB expression EXPR denoting an lvalue in memory, produce a
    string of agent bytecode which will leave its address and size on
    the top of stack.  Return the agent expression.
 
    Not sure this function is useful at all.  */
 struct agent_expr *
 /* Given a GDB expression EXPR denoting an lvalue in memory, produce a
    string of agent bytecode which will leave its address and size on
    the top of stack.  Return the agent expression.
 
    Not sure this function is useful at all.  */
 struct agent_expr *

-expr_to_address_and_size (expr)
-     struct expression *expr;
+expr_to_address_and_size (struct expression *expr)

 {
   struct axs_value value;
   struct agent_expr *ax = expr_to_agent (expr, &value);
 {
   struct axs_value value;
   struct agent_expr *ax = expr_to_agent (expr, &value);


@@ -1838,7 +1754,7 @@ expr_to_address_and_size (expr)
 
   return ax;
 }
 
   return ax;
 }

-#endif /* 0 */
+#endif

 
 /* Given a GDB expression EXPR, return bytecode to trace its value.
    The result will use the `trace' and `trace_quick' bytecodes to
 
 /* Given a GDB expression EXPR, return bytecode to trace its value.
    The result will use the `trace' and `trace_quick' bytecodes to


@@ -1846,16 +1762,14 @@ expr_to_address_and_size (expr)
    caller can then use the ax_reqs function to discover which
    registers it relies upon.  */
 struct agent_expr *
    caller can then use the ax_reqs function to discover which
    registers it relies upon.  */
 struct agent_expr *

-gen_trace_for_expr (scope, expr)
-     CORE_ADDR scope;
-     struct expression *expr;
+gen_trace_for_expr (CORE_ADDR scope, struct expression *expr)

 {
   struct cleanup *old_chain = 0;
   struct agent_expr *ax = new_agent_expr (scope);
   union exp_element *pc;
   struct axs_value value;
 
 {
   struct cleanup *old_chain = 0;
   struct agent_expr *ax = new_agent_expr (scope);
   union exp_element *pc;
   struct axs_value value;
 

-  old_chain = make_cleanup ((make_cleanup_func) free_agent_expr, ax);
+  old_chain = make_cleanup_free_agent_expr (ax);

 
   pc = expr->elts;
   trace_kludge = 1;
 
   pc = expr->elts;
   trace_kludge = 1;


@@ -1879,9 +1793,7 @@ gen_trace_for_expr (scope, expr)
 /* The "agent" command, for testing: compile and disassemble an expression.  */
 
 static void
 /* The "agent" command, for testing: compile and disassemble an expression.  */
 
 static void

-print_axs_value (f, value)
-     GDB_FILE *f;
-     struct axs_value *value;
+print_axs_value (struct ui_file *f, struct axs_value *value)

 {
   switch (value->kind)
     {
 {
   switch (value->kind)
     {


@@ -1904,14 +1816,12 @@ print_axs_value (f, value)
 
 
 static void
 
 
 static void

-agent_command (exp, from_tty)
-     char *exp;
-     int from_tty;
+agent_command (char *exp, int from_tty)

 {
   struct cleanup *old_chain = 0;
   struct expression *expr;
   struct agent_expr *agent;
 {
   struct cleanup *old_chain = 0;
   struct expression *expr;
   struct agent_expr *agent;

-  struct frame_info *fi = get_current_frame ();                /* need current scope */
+  struct frame_info *fi = get_current_frame ();        /* need current scope */

 
   /* We don't deal with overlay debugging at the moment.  We need to
      think more carefully about this.  If you copy this code into
 
   /* We don't deal with overlay debugging at the moment.  We need to
      think more carefully about this.  If you copy this code into


@@ -1924,9 +1834,9 @@ agent_command (exp, from_tty)
     error_no_arg ("expression to translate");
 
   expr = parse_expression (exp);
     error_no_arg ("expression to translate");
 
   expr = parse_expression (exp);

-  old_chain = make_cleanup ((make_cleanup_func) free_current_contents, &expr);
+  old_chain = make_cleanup (free_current_contents, &expr);

   agent = gen_trace_for_expr (fi->pc, expr);
   agent = gen_trace_for_expr (fi->pc, expr);

-  make_cleanup ((make_cleanup_func) free_agent_expr, agent);
+  make_cleanup_free_agent_expr (agent);

   ax_print (gdb_stdout, agent);
 
   /* It would be nice to call ax_reqs here to gather some general info
   ax_print (gdb_stdout, agent);
 
   /* It would be nice to call ax_reqs here to gather some general info


@@ -1939,12 +1849,10 @@ agent_command (exp, from_tty)
 
 /* Initialization code.  */
 
 
 /* Initialization code.  */
 

-void _initialize_ax_gdb PARAMS ((void));
+void _initialize_ax_gdb (void);

 void
 void

-_initialize_ax_gdb ()
+_initialize_ax_gdb (void)

 {
 {

-  struct cmd_list_element *c;
-

   add_cmd ("agent", class_maintenance, agent_command,
           "Translate an expression into remote agent bytecode.",
           &maintenancelist);
   add_cmd ("agent", class_maintenance, agent_command,
           "Translate an expression into remote agent bytecode.",
           &maintenancelist);