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.

1 files changed, 38 insertions, 0 deletions

diff --git a/gdb/wrapper.c b/gdb/wrapper.c
index 60b259e011c..f8adff4fb2b 100644
--- a/gdb/wrapper.c
+++ b/gdb/wrapper.c
@@ -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);
@@ -167,6 +169,42 @@ wrap_value_equal (char *a)
 }
 
 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)
 {
   struct gdb_wrapper_arguments args;