Fix my last change to actually compile.

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

diff --git a/gdb/wrapper.c b/gdb/wrapper.c
index 83405e508a2470d5994f0e9decc77a6bdd799150..60b259e011cbb17d2c4be559cba7e09e14190622 100644 (file)
--- a/gdb/wrapper.c
+++ b/gdb/wrapper.c
@@ -42,31 +42,23 @@ struct gdb_wrapper_arguments
       } args[10];
   };
 
-int gdb_parse_exp_1 PARAMS ((char **, struct block *, 
-                            int, struct expression **));
-int wrap_parse_exp_1 PARAMS ((char *));
+static int wrap_parse_exp_1 (char *);
 
-int gdb_evaluate_expression PARAMS ((struct expression *, value_ptr *));
-int wrap_evaluate_expression PARAMS ((char *));
+static int wrap_evaluate_expression (char *);
 
-int gdb_value_fetch_lazy PARAMS ((value_ptr));
-int wrap_value_fetch_lazy PARAMS ((char *));
+static int wrap_value_fetch_lazy (char *);
 
-int gdb_value_equal PARAMS ((value_ptr, value_ptr, int *));
-int wrap_value_equal PARAMS ((char *));
+static int wrap_value_equal (char *);
 
-int gdb_value_subscript PARAMS ((value_ptr, value_ptr, value_ptr * rval));
-int wrap_value_subscript PARAMS ((char *));
+static int wrap_value_subscript (char *);
 
-int gdb_value_ind PARAMS ((value_ptr val, value_ptr * rval));
-int wrap_value_ind PARAMS ((char *opaque_arg));
+static int wrap_value_ind (char *opaque_arg);
+
+static int wrap_parse_and_eval_type (char *);
 
 int
-gdb_parse_exp_1 (stringptr, block, comma, expression)
-     char **stringptr;
-     struct block *block;
-     int comma;
-     struct expression **expression;
+gdb_parse_exp_1 (char **stringptr, struct block *block, int comma,
+                struct expression **expression)
 {
   struct gdb_wrapper_arguments args;
   args.args[0].pointer = stringptr;
@@ -85,9 +77,8 @@ gdb_parse_exp_1 (stringptr, block, comma, expression)
   
 }
 
-int
-wrap_parse_exp_1 (argptr)
-     char *argptr;
+static int
+wrap_parse_exp_1 (char *argptr)
 {
   struct gdb_wrapper_arguments *args 
     = (struct gdb_wrapper_arguments *) argptr;
@@ -98,9 +89,7 @@ wrap_parse_exp_1 (argptr)
 }
 
 int
-gdb_evaluate_expression (exp, value)
-     struct expression *exp;
-     value_ptr *value;
+gdb_evaluate_expression (struct expression *exp, value_ptr *value)
 {
   struct gdb_wrapper_arguments args;
   args.args[0].pointer = exp;
@@ -116,9 +105,8 @@ gdb_evaluate_expression (exp, value)
   return 1;
 }
 
-int
-wrap_evaluate_expression (a)
-     char *a;
+static int
+wrap_evaluate_expression (char *a)
 {
   struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
 
@@ -128,8 +116,7 @@ wrap_evaluate_expression (a)
 }
 
 int
-gdb_value_fetch_lazy (value)
-     value_ptr value;
+gdb_value_fetch_lazy (value_ptr value)
 {
   struct gdb_wrapper_arguments args;
 
@@ -138,9 +125,8 @@ gdb_value_fetch_lazy (value)
                       "", RETURN_MASK_ERROR);
 }
 
-int
-wrap_value_fetch_lazy (a)
-     char *a;
+static int
+wrap_value_fetch_lazy (char *a)
 {
   struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
 
@@ -149,10 +135,7 @@ wrap_value_fetch_lazy (a)
 }
 
 int
-gdb_value_equal (val1, val2, result)
-     value_ptr val1;
-     value_ptr val2;
-     int *result;
+gdb_value_equal (value_ptr val1, value_ptr val2, int *result)
 {
   struct gdb_wrapper_arguments args;
 
@@ -170,9 +153,8 @@ gdb_value_equal (val1, val2, result)
   return 1;
 }
 
-int
-wrap_value_equal (a)
-     char *a;
+static int
+wrap_value_equal (char *a)
 {
   struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
   value_ptr val1, val2;
@@ -185,10 +167,7 @@ wrap_value_equal (a)
 }
 
 int
-gdb_value_subscript (val1, val2, rval)
-     value_ptr val1;
-     value_ptr val2;
-     value_ptr * rval;
+gdb_value_subscript (value_ptr val1, value_ptr val2, value_ptr *rval)
 {
   struct gdb_wrapper_arguments args;
 
@@ -206,9 +185,8 @@ gdb_value_subscript (val1, val2, rval)
   return 1;
 }
 
-int
-wrap_value_subscript (a)
-     char *a;
+static int
+wrap_value_subscript (char *a)
 {
   struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
   value_ptr val1, val2;
@@ -221,9 +199,7 @@ wrap_value_subscript (a)
 }
 
 int
-gdb_value_ind (val, rval)
-     value_ptr val;
-     value_ptr *rval;
+gdb_value_ind (value_ptr val, value_ptr *rval)
 {
   struct gdb_wrapper_arguments args;
 
@@ -240,9 +216,8 @@ gdb_value_ind (val, rval)
   return 1;
 }
 
-int
-wrap_value_ind (opaque_arg)
-     char *opaque_arg;
+static int
+wrap_value_ind (char *opaque_arg)
 {
   struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) opaque_arg;
   value_ptr val;
@@ -252,3 +227,33 @@ wrap_value_ind (opaque_arg)
   return 1;
 }
 
+int
+gdb_parse_and_eval_type (char *p, int length, struct type **type)
+{
+  struct gdb_wrapper_arguments args;
+  args.args[0].pointer = p;
+  args.args[1].integer = length;
+
+  if (!catch_errors ((catch_errors_ftype *) wrap_parse_and_eval_type, &args,
+                    "", RETURN_MASK_ALL))
+    {
+      /* An error occurred */
+      return 0;
+    }
+
+  *type = (struct type *) args.result.pointer;
+  return 1;
+}
+
+static int
+wrap_parse_and_eval_type (char *a)
+{
+  struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
+
+  char *p = (char *) args->args[0].pointer;
+  int length = args->args[1].integer;
+
+  args->result.pointer = (char *) parse_and_eval_type (p, length);
+
+  return 1;
+}