[034/203] Split out eval_op_postinc

Message ID 20210101214723.1784144-35-tom@tromey.com
State Superseded
Headers show
Series
  • Refactor expressions
Related show

Commit Message

Tom Tromey Jan. 1, 2021, 9:44 p.m.
This splits UNOP_POSTINCREMENT into a new function for future use.

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

	* eval.c (eval_op_postinc): New function.
	(evaluate_subexp_standard): Use it.
---
 gdb/ChangeLog |  5 +++++
 gdb/eval.c    | 59 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 24 deletions(-)

-- 
2.26.2

Patch

diff --git a/gdb/eval.c b/gdb/eval.c
index c8e2c14b8b0..82215d32d0d 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1946,6 +1946,40 @@  eval_op_predec (struct type *expect_type, struct expression *exp,
     }
 }
 
+/* A helper function for UNOP_POSTINCREMENT.  */
+
+static struct value *
+eval_op_postinc (struct type *expect_type, struct expression *exp,
+		 enum noside noside, enum exp_opcode op,
+		 struct value *arg1)
+{
+  if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
+    return arg1;
+  else if (unop_user_defined_p (op, arg1))
+    {
+      return value_x_unop (arg1, op, noside);
+    }
+  else
+    {
+      struct value *arg3 = value_non_lval (arg1);
+      struct value *arg2;
+
+      if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
+	arg2 = value_ptradd (arg1, 1);
+      else
+	{
+	  struct value *tmp = arg1;
+
+	  arg2 = value_one (value_type (arg1));
+	  binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
+	  arg2 = value_binop (tmp, arg2, BINOP_ADD);
+	}
+
+      value_assign (arg1, arg2);
+      return arg3;
+    }
+}
+
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
@@ -2888,30 +2922,7 @@  evaluate_subexp_standard (struct type *expect_type,
 
     case UNOP_POSTINCREMENT:
       arg1 = evaluate_subexp (expect_type, exp, pos, noside);
-      if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
-	return arg1;
-      else if (unop_user_defined_p (op, arg1))
-	{
-	  return value_x_unop (arg1, op, noside);
-	}
-      else
-	{
-	  arg3 = value_non_lval (arg1);
-
-	  if (ptrmath_type_p (exp->language_defn, value_type (arg1)))
-	    arg2 = value_ptradd (arg1, 1);
-	  else
-	    {
-	      struct value *tmp = arg1;
-
-	      arg2 = value_one (value_type (arg1));
-	      binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
-	      arg2 = value_binop (tmp, arg2, BINOP_ADD);
-	    }
-
-	  value_assign (arg1, arg2);
-	  return arg3;
-	}
+      return eval_op_postinc (expect_type, exp, noside, op, arg1);
 
     case UNOP_POSTDECREMENT:
       arg1 = evaluate_subexp (expect_type, exp, pos, noside);