aboutsummaryrefslogtreecommitdiff
path: root/gdb/wrapper.c
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2000-03-13 21:51:46 +0000
committerJim Ingham <jingham@apple.com>2000-03-13 21:51:46 +0000
commit73a93a3251211bf8c5774282e41dbc023820404a (patch)
treed1cedff69c4d1306c93cc4bfb59d4719026200b6 /gdb/wrapper.c
parent271bb601c426b043736a308b1a5f6d36bb47857a (diff)
downloadgdb-73a93a3251211bf8c5774282e41dbc023820404a.zip
gdb-73a93a3251211bf8c5774282e41dbc023820404a.tar.gz
gdb-73a93a3251211bf8c5774282e41dbc023820404a.tar.bz2
2000-03-13 James Ingham <jingham@leda.cygnus.com>
Add support for a variable object that tries to evaluate itself in the currently selected frame, rather than in a fixed frame. * wrapper.c,h (gdb_parse_exp_1): Added a wrapper for gdb_parse_exp_1. * varobj.h: Added USE_CURRENT_FRAME to varobj_type & changed def'n of varobj_create. * varobj.c (varobj_list): Return type indicates whether the variable's type has changed (for current frame variables). (varobj_update): Handle the case where the variable's type has changed. (delete_variable_1): Allow for deletion of variables that have not been installed yet. (new_root_variable): Initialize use_selected_frame variable. (value_of_root): This is where most of the work to handle "current frame" variables was added. Most of the complexity involves handling the case where the type of the variable has changed. (varobj_create): Add a "type" argument, to tell if the variable is one of these "current frame" variables. Also protect call to parse_exp_1 from long jumping. * mi-var-block.exp: The error report from varobj_create changed since I am now trapping parse_exp_1 errors. Change the tests to match the new error message. * mi-var-child.exp: Ditto. * mi-var-cmd.exp: Ditto. * lib/gdb.exp: Fix the gdbtk_start routine to correctly find all the library directories. * gdbtk-varobj.c (variable_create): Pass the correct "how_specified" flag to the varobj_create routine.
Diffstat (limited to 'gdb/wrapper.c')
-rw-r--r--gdb/wrapper.c41
1 files changed, 41 insertions, 0 deletions
diff --git a/gdb/wrapper.c b/gdb/wrapper.c
index be7d4e2..ea43fd9 100644
--- a/gdb/wrapper.c
+++ b/gdb/wrapper.c
@@ -33,6 +33,10 @@ struct gdb_wrapper_arguments
char *args[10];
};
+int gdb_parse_exp_1 PARAMS ((char **, struct block *,
+ int, struct expression **));
+int wrap_parse_exp_1 PARAMS ((char *));
+
int gdb_evaluate_expression PARAMS ((struct expression *, value_ptr *));
int wrap_evaluate_expression PARAMS ((char *));
@@ -46,6 +50,42 @@ int gdb_value_ind PARAMS ((value_ptr val, value_ptr * rval));
int wrap_value_ind PARAMS ((char *opaque_arg));
int
+gdb_parse_exp_1 (stringptr, block, comma, expression)
+ char **stringptr;
+ struct block *block;
+ int comma;
+ struct expression **expression;
+{
+ struct gdb_wrapper_arguments args;
+ args.args[0] = (char *) stringptr;
+ args.args[1] = (char *) block;
+ args.args[2] = (char *) comma;
+
+ if (!catch_errors ((catch_errors_ftype *) wrap_parse_exp_1, &args,
+ "", RETURN_MASK_ERROR))
+ {
+ /* An error occurred */
+ return 0;
+ }
+
+ *expression = (struct expression *) args.result;
+ return 1;
+
+}
+
+int
+wrap_parse_exp_1 (argptr)
+ char *argptr;
+{
+ struct gdb_wrapper_arguments *args
+ = (struct gdb_wrapper_arguments *) argptr;
+ args->result = (char *) parse_exp_1((char **) args->args[0],
+ (struct block *) args->args[1],
+ (int) args->args[2]);
+ return 1;
+}
+
+int
gdb_evaluate_expression (exp, value)
struct expression *exp;
value_ptr *value;
@@ -163,3 +203,4 @@ wrap_value_ind (opaque_arg)
(args)->result = (char *) value_ind (val);
return 1;
}
+