From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 14:27:57 +0000 (-0700)
Subject: Split out eval_op_f_floor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f1a1f3c4f8fd9dd7422bf246ef3d199df22eb18;p=binutils-gdb.git

Split out eval_op_f_floor

This splits UNOP_FORTRAN_FLOOR into a new function for future use.

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b00777edb8..2d712353bea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* f-lang.c (eval_op_f_floor): New function.
+	(evaluate_subexp_f): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* f-lang.c (eval_op_f_ceil): New function.
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index f3fce2240d5..bd1605294e5 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1060,6 +1060,25 @@ eval_op_f_ceil (struct type *expect_type, struct expression *exp,
   return value_from_host_double (type, val);
 }
 
+/* A helper function for UNOP_FORTRAN_FLOOR.  */
+
+static struct value *
+eval_op_f_floor (struct type *expect_type, struct expression *exp,
+		 enum noside noside,
+		 struct value *arg1)
+{
+  if (noside == EVAL_SKIP)
+    return eval_skip_value (exp);
+  struct type *type = value_type (arg1);
+  if (type->code () != TYPE_CODE_FLT)
+    error (_("argument to FLOOR must be of type float"));
+  double val
+    = target_float_to_host_double (value_contents (arg1),
+				   value_type (arg1));
+  val = floor (val);
+  return value_from_host_double (type, val);
+}
+
 /* Special expression evaluation cases for Fortran.  */
 
 static struct value *
@@ -1095,19 +1114,8 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
       return eval_op_f_ceil (expect_type, exp, noside, arg1);
 
     case UNOP_FORTRAN_FLOOR:
-      {
-	arg1 = evaluate_subexp (nullptr, exp, pos, noside);
-	if (noside == EVAL_SKIP)
-	  return eval_skip_value (exp);
-	type = value_type (arg1);
-	if (type->code () != TYPE_CODE_FLT)
-	  error (_("argument to FLOOR must be of type float"));
-	double val
-	  = target_float_to_host_double (value_contents (arg1),
-					 value_type (arg1));
-	val = floor (val);
-	return value_from_host_double (type, val);
-      }
+      arg1 = evaluate_subexp (nullptr, exp, pos, noside);
+      return eval_op_f_floor (expect_type, exp, noside, arg1);
 
     case UNOP_FORTRAN_ALLOCATED:
       {