Split out eval_op_f_mod

This splits BINOP_MOD into a new function for future use.

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

	* f-lang.c (eval_op_f_mod): New function.
	(evaluate_subexp_f): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 058b073854028ce07071787e7a0f486a915857ad..4ef687f613e8673ea657929ac4ebfde92043d799 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * f-lang.c (eval_op_f_mod): New function.
+       (evaluate_subexp_f): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * f-lang.c (eval_op_f_abs): New function.

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 76b2f27e48944e0503df9f1b24b4b797c861ef4d..57e393614fe0029ad22360e8b5b459e73741b2e2 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1003,6 +1003,44 @@ eval_op_f_abs (struct type *expect_type, struct expression *exp,
   error (_("ABS of type %s not supported"), TYPE_SAFE_NAME (type));
 }
 
+/* A helper function for BINOP_MOD.  */
+
+static struct value *
+eval_op_f_mod (struct type *expect_type, struct expression *exp,
+              enum noside noside,
+              struct value *arg1, struct value *arg2)
+{
+  if (noside == EVAL_SKIP)
+    return eval_skip_value (exp);
+  struct type *type = value_type (arg1);
+  if (type->code () != value_type (arg2)->code ())
+    error (_("non-matching types for parameters to MOD ()"));
+  switch (type->code ())
+    {
+    case TYPE_CODE_FLT:
+      {
+       double d1
+         = target_float_to_host_double (value_contents (arg1),
+                                        value_type (arg1));
+       double d2
+         = target_float_to_host_double (value_contents (arg2),
+                                        value_type (arg2));
+       double d3 = fmod (d1, d2);
+       return value_from_host_double (type, d3);
+      }
+    case TYPE_CODE_INT:
+      {
+       LONGEST v1 = value_as_long (arg1);
+       LONGEST v2 = value_as_long (arg2);
+       if (v2 == 0)
+         error (_("calling MOD (N, 0) is undefined"));
+       LONGEST v3 = v1 - (v1 / v2) * v2;
+       return value_from_longest (value_type (arg1), v3);
+      }
+    }
+  error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type));
+}
+
 /* Special expression evaluation cases for Fortran.  */
 
 static struct value *
@@ -1031,35 +1069,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
     case BINOP_MOD:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
       arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
-      if (noside == EVAL_SKIP)
-       return eval_skip_value (exp);
-      type = value_type (arg1);
-      if (type->code () != value_type (arg2)->code ())
-       error (_("non-matching types for parameters to MOD ()"));
-      switch (type->code ())
-       {
-       case TYPE_CODE_FLT:
-         {
-           double d1
-             = target_float_to_host_double (value_contents (arg1),
-                                            value_type (arg1));
-           double d2
-             = target_float_to_host_double (value_contents (arg2),
-                                            value_type (arg2));
-           double d3 = fmod (d1, d2);
-           return value_from_host_double (type, d3);
-         }
-       case TYPE_CODE_INT:
-         {
-           LONGEST v1 = value_as_long (arg1);
-           LONGEST v2 = value_as_long (arg2);
-           if (v2 == 0)
-             error (_("calling MOD (N, 0) is undefined"));
-           LONGEST v3 = v1 - (v1 / v2) * v2;
-           return value_from_longest (value_type (arg1), v3);
-         }
-       }
-      error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type));
+      return eval_op_f_mod (expect_type, exp, noside, arg1, arg2);
 
     case UNOP_FORTRAN_CEILING:
       {