Introduce ada_binop_in_bounds

This adds class ada_binop_in_bounds, which implements BINOP_IN_BOUNDS.

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

	* ada-lang.c (ada_binop_in_bounds): No longer static.
	* ada-exp.h (class ada_binop_in_bounds_operation): New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 57d083c350ab89c209624fb65b089bae240ae273..c414df1395ec3622278d5089c3a4dd5e66f4c843 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * ada-lang.c (ada_binop_in_bounds): No longer static.
+       * ada-exp.h (class ada_binop_in_bounds_operation): New.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * ada-lang.c (ada_ternop_slice): No longer static.

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 96e3c407b6fa9f321397b7928f64d8c68995d79a..4c30734171ff8ea04b714db1dfabc3bfefdabadf 100644 (file)
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -55,6 +55,11 @@ extern struct value *ada_ternop_slice (struct expression *exp,
                                       struct value *array,
                                       struct value *low_bound_val,
                                       struct value *high_bound_val);
+extern struct value *ada_binop_in_bounds (struct expression *exp,
+                                         enum noside noside,
+                                         struct value *arg1,
+                                         struct value *arg2,
+                                         int n);
 
 namespace expr
 {
@@ -240,6 +245,28 @@ public:
   { return TERNOP_SLICE; }
 };
 
+/* Implement BINOP_IN_BOUNDS for Ada.  */
+class ada_binop_in_bounds_operation
+  : public maybe_constant_operation<operation_up, operation_up, int>
+{
+public:
+
+  using maybe_constant_operation::maybe_constant_operation;
+
+  value *evaluate (struct type *expect_type,
+                  struct expression *exp,
+                  enum noside noside) override
+  {
+    value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+    value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+    return ada_binop_in_bounds (exp, noside, arg1, arg2,
+                               std::get<2> (m_storage));
+  }
+
+  enum exp_opcode opcode () const override
+  { return BINOP_IN_BOUNDS; }
+};
+
 } /* namespace expr */
 
 #endif /* ADA_EXP_H */

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 3f14922e18c2730c4e612a3f5f954de160928678..24241676737537bd090504f4985653a4889d4b58 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10237,7 +10237,7 @@ ada_ternop_slice (struct expression *exp,
 
 /* A helper function for BINOP_IN_BOUNDS.  */
 
-static value *
+value *
 ada_binop_in_bounds (struct expression *exp, enum noside noside,
                     struct value *arg1, struct value *arg2, int n)
 {