Split out eval_binop_assign_modify

This splits BINOP_ASSIGN_MODIFY into a new function for future use.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* eval.c (eval_binop_assign_modify): New function.
	(evaluate_subexp_standard): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ee6f5cc5937faa9a75425357ea1e7791d7b540a..9b4c9c80b6b701a6777ecdd9214bbc3c6705be2b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * eval.c (eval_binop_assign_modify): New function.
+       (evaluate_subexp_standard): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * m2-lang.c (eval_op_m2_subscript): New function.

diff --git a/gdb/eval.c b/gdb/eval.c
index def1220888300b6ff99aace6f239f42666da1515..78a10f741f03a0076109d98e6428e159c5aaa6e6 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2053,6 +2053,42 @@ eval_op_type (struct type *expect_type, struct expression *exp,
     error (_("Attempt to use a type name as an expression"));
 }
 
+/* A helper function for BINOP_ASSIGN_MODIFY.  */
+
+static struct value *
+eval_binop_assign_modify (struct type *expect_type, struct expression *exp,
+                         enum noside noside, enum exp_opcode op,
+                         struct value *arg1, struct value *arg2)
+{
+  if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+    return arg1;
+  if (binop_user_defined_p (op, arg1, arg2))
+    return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside);
+  else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn,
+                                             value_type (arg1))
+          && is_integral_type (value_type (arg2)))
+    arg2 = value_ptradd (arg1, value_as_long (arg2));
+  else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn,
+                                             value_type (arg1))
+          && is_integral_type (value_type (arg2)))
+    arg2 = value_ptradd (arg1, - value_as_long (arg2));
+  else
+    {
+      struct value *tmp = arg1;
+
+      /* For shift and integer exponentiation operations,
+        only promote the first argument.  */
+      if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP)
+         && is_integral_type (value_type (arg2)))
+       unop_promote (exp->language_defn, exp->gdbarch, &tmp);
+      else
+       binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
+
+      arg2 = value_binop (tmp, arg2, op);
+    }
+  return value_assign (arg1, arg2);
+}
+
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
                          struct expression *exp, int *pos,
@@ -2706,34 +2742,9 @@ evaluate_subexp_standard (struct type *expect_type,
       (*pos) += 2;
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
       arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
-      if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
-       return arg1;
       op = exp->elts[pc + 1].opcode;
-      if (binop_user_defined_p (op, arg1, arg2))
-       return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside);
-      else if (op == BINOP_ADD && ptrmath_type_p (exp->language_defn,
-                                                 value_type (arg1))
-              && is_integral_type (value_type (arg2)))
-       arg2 = value_ptradd (arg1, value_as_long (arg2));
-      else if (op == BINOP_SUB && ptrmath_type_p (exp->language_defn,
-                                                 value_type (arg1))
-              && is_integral_type (value_type (arg2)))
-       arg2 = value_ptradd (arg1, - value_as_long (arg2));
-      else
-       {
-         struct value *tmp = arg1;
-
-         /* For shift and integer exponentiation operations,
-            only promote the first argument.  */
-         if ((op == BINOP_LSH || op == BINOP_RSH || op == BINOP_EXP)
-             && is_integral_type (value_type (arg2)))
-           unop_promote (exp->language_defn, exp->gdbarch, &tmp);
-         else
-           binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
-
-         arg2 = value_binop (tmp, arg2, op);
-       }
-      return value_assign (arg1, arg2);
+      return eval_binop_assign_modify (expect_type, exp, noside, op,
+                                      arg1, arg2);
 
     case BINOP_ADD:
       arg1 = evaluate_subexp_with_coercion (exp, pos, noside);