#include "defs.h"
#include "value.h"
-#include "frame.h"
#include "wrapper.h"
/* Use this struct to pass arguments to wrapper routines. We assume
} args[10];
};
+struct captured_value_struct_elt_args
+{
+ struct value **argp;
+ struct value **args;
+ char *name;
+ int *static_memfuncp;
+ char *err;
+ struct value **result_ptr;
+};
+
static int wrap_parse_exp_1 (char *);
static int wrap_evaluate_expression (char *);
static int wrap_value_ind (char *opaque_arg);
+static int do_captured_value_struct_elt (struct ui_out *uiout, void *data);
+
static int wrap_parse_and_eval_type (char *);
int
}
int
-gdb_evaluate_expression (struct expression *exp, value_ptr *value)
+gdb_evaluate_expression (struct expression *exp, struct value **value)
{
struct gdb_wrapper_arguments args;
args.args[0].pointer = exp;
return 0;
}
- *value = (value_ptr) args.result.pointer;
+ *value = (struct value *) args.result.pointer;
return 1;
}
}
int
-gdb_value_fetch_lazy (value_ptr value)
+gdb_value_fetch_lazy (struct value *value)
{
struct gdb_wrapper_arguments args;
{
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
- value_fetch_lazy ((value_ptr) (args)->args[0].pointer);
+ value_fetch_lazy ((struct value *) (args)->args[0].pointer);
return 1;
}
int
-gdb_value_equal (value_ptr val1, value_ptr val2, int *result)
+gdb_value_equal (struct value *val1, struct value *val2, int *result)
{
struct gdb_wrapper_arguments args;
wrap_value_equal (char *a)
{
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
- value_ptr val1, val2;
+ struct value *val1;
+ struct value *val2;
- val1 = (value_ptr) (args)->args[0].pointer;
- val2 = (value_ptr) (args)->args[1].pointer;
+ val1 = (struct value *) (args)->args[0].pointer;
+ val2 = (struct value *) (args)->args[1].pointer;
(args)->result.integer = value_equal (val1, val2);
return 1;
}
int
-gdb_value_assign (value_ptr val1, value_ptr val2, value_ptr *result)
+gdb_value_assign (struct value *val1, struct value *val2, struct value **result)
{
struct gdb_wrapper_arguments args;
return 0;
}
- *result = (value_ptr) args.result.pointer;
+ *result = (struct value *) args.result.pointer;
return 1;
}
wrap_value_assign (char *a)
{
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
- value_ptr val1, val2;
+ struct value *val1;
+ struct value *val2;
- val1 = (value_ptr) (args)->args[0].pointer;
- val2 = (value_ptr) (args)->args[1].pointer;
+ val1 = (struct value *) (args)->args[0].pointer;
+ val2 = (struct value *) (args)->args[1].pointer;
(args)->result.pointer = value_assign (val1, val2);
return 1;
}
int
-gdb_value_subscript (value_ptr val1, value_ptr val2, value_ptr *rval)
+gdb_value_subscript (struct value *val1, struct value *val2, struct value **rval)
{
struct gdb_wrapper_arguments args;
return 0;
}
- *rval = (value_ptr) args.result.pointer;
+ *rval = (struct value *) args.result.pointer;
return 1;
}
wrap_value_subscript (char *a)
{
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
- value_ptr val1, val2;
+ struct value *val1;
+ struct value *val2;
- val1 = (value_ptr) (args)->args[0].pointer;
- val2 = (value_ptr) (args)->args[1].pointer;
+ val1 = (struct value *) (args)->args[0].pointer;
+ val2 = (struct value *) (args)->args[1].pointer;
(args)->result.pointer = value_subscript (val1, val2);
return 1;
}
int
-gdb_value_ind (value_ptr val, value_ptr *rval)
+gdb_value_ind (struct value *val, struct value **rval)
{
struct gdb_wrapper_arguments args;
return 0;
}
- *rval = (value_ptr) args.result.pointer;
+ *rval = (struct value *) args.result.pointer;
return 1;
}
wrap_value_ind (char *opaque_arg)
{
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) opaque_arg;
- value_ptr val;
+ struct value *val;
- val = (value_ptr) (args)->args[0].pointer;
+ val = (struct value *) (args)->args[0].pointer;
(args)->result.pointer = value_ind (val);
return 1;
}
return 1;
}
+
+enum gdb_rc
+gdb_value_struct_elt (struct ui_out *uiout, struct value **result, struct value **argp,
+ struct value **args, char *name, int *static_memfuncp,
+ char *err)
+{
+ struct captured_value_struct_elt_args cargs;
+ cargs.argp = argp;
+ cargs.args = args;
+ cargs.name = name;
+ cargs.static_memfuncp = static_memfuncp;
+ cargs.err = err;
+ cargs.result_ptr = result;
+ return catch_exceptions (uiout, do_captured_value_struct_elt, &cargs,
+ NULL, RETURN_MASK_ALL);
+}
+
+static int
+do_captured_value_struct_elt (struct ui_out *uiout, void *data)
+{
+ struct captured_value_struct_elt_args *cargs = data;
+ *cargs->result_ptr = value_struct_elt (cargs->argp, cargs->args, cargs->name,
+ cargs->static_memfuncp, cargs->err);
+ return GDB_RC_OK;
+}
+