2000-11-06 Fernando Nasser <fnasser@totem.toronto.redhat.com>
* wrapper.c (gdb_value_assign): New function. Longjump-free version of value_assign. (wrap_value_assign): New function. Wrapper for value_assign. * wrapper.h: Add declaration for the above. * varobj.c (varobj_set_value): Use gdb_value_assign, not value_assign which can longjump. Do not change varobj value if assign fails.
This commit is contained in:
parent
c4dfa77f43
commit
8a1a01128d
4 changed files with 52 additions and 1 deletions
|
@ -1,3 +1,13 @@
|
|||
2000-11-06 Fernando Nasser <fnasser@totem.toronto.redhat.com>
|
||||
|
||||
* wrapper.c (gdb_value_assign): New function. Longjump-free
|
||||
version of value_assign.
|
||||
(wrap_value_assign): New function. Wrapper for value_assign.
|
||||
* wrapper.h: Add declaration for the above.
|
||||
* varobj.c (varobj_set_value): Use gdb_value_assign, not
|
||||
value_assign which can longjump. Do not change varobj value if
|
||||
assign fails.
|
||||
|
||||
2000-11-06 Fernando Nasser <fnasser@cygnus.com>
|
||||
|
||||
From Steven Johnson <sbjohnson@ozemail.com.au>:
|
||||
|
|
|
@ -818,7 +818,8 @@ varobj_set_value (struct varobj *var, char *expression)
|
|||
}
|
||||
|
||||
VALUE_ADDRESS (temp) += offset;
|
||||
val = value_assign (temp, value);
|
||||
if (!gdb_value_assign (temp, value, &val))
|
||||
return 0;
|
||||
VALUE_ADDRESS (val) -= offset;
|
||||
value_free (var->value);
|
||||
release_value (val);
|
||||
|
|
|
@ -50,6 +50,8 @@ static int wrap_value_fetch_lazy (char *);
|
|||
|
||||
static int wrap_value_equal (char *);
|
||||
|
||||
static int wrap_value_assign (char *);
|
||||
|
||||
static int wrap_value_subscript (char *);
|
||||
|
||||
static int wrap_value_ind (char *opaque_arg);
|
||||
|
@ -166,6 +168,42 @@ wrap_value_equal (char *a)
|
|||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
gdb_value_assign (val1, val2, result)
|
||||
value_ptr val1;
|
||||
value_ptr val2;
|
||||
value_ptr *result;
|
||||
{
|
||||
struct gdb_wrapper_arguments args;
|
||||
|
||||
args.args[0].pointer = val1;
|
||||
args.args[1].pointer = val2;
|
||||
|
||||
if (!catch_errors ((catch_errors_ftype *) wrap_value_assign, &args,
|
||||
"", RETURN_MASK_ERROR))
|
||||
{
|
||||
/* An error occurred */
|
||||
return 0;
|
||||
}
|
||||
|
||||
*result = (value_ptr) args.result.pointer;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
wrap_value_assign (a)
|
||||
char *a;
|
||||
{
|
||||
struct gdb_wrapper_arguments *args = (struct gdb_wrapper_arguments *) a;
|
||||
value_ptr val1, val2;
|
||||
|
||||
val1 = (value_ptr) (args)->args[0].pointer;
|
||||
val2 = (value_ptr) (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)
|
||||
{
|
||||
|
|
|
@ -31,6 +31,8 @@ extern int gdb_value_fetch_lazy (value_ptr);
|
|||
|
||||
extern int gdb_value_equal (value_ptr, value_ptr, int *);
|
||||
|
||||
extern int gdb_value_assign (value_ptr, value_ptr, value_ptr *);
|
||||
|
||||
extern int gdb_value_subscript (value_ptr, value_ptr, value_ptr *);
|
||||
|
||||
extern int gdb_value_ind (value_ptr val, value_ptr * rval);
|
||||
|
|
Loading…
Reference in a new issue