diff options
author | Tom Tromey <tom@tromey.com> | 2021-03-08 07:27:57 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2021-03-08 07:28:25 -0700 |
commit | 03070ee9c77877655051c073cf060585f7cb2ff2 (patch) | |
tree | bc8dfd2a72ea6b5324ac40ca94a460d93bdfd573 | |
parent | 821e72d77536b201b3e6b801d8f0d9c5b624ec96 (diff) | |
download | binutils-03070ee9c77877655051c073cf060585f7cb2ff2.zip binutils-03070ee9c77877655051c073cf060585f7cb2ff2.tar.gz binutils-03070ee9c77877655051c073cf060585f7cb2ff2.tar.bz2 |
Introduce ada_wrapped_operation
This adds class ada_wrapped_operation, which is used to wrap some
generic operations with a bit of Ada-specific handling. This
corresponds to the old "default" case in ada_evaluate_subexp.
gdb/ChangeLog
2021-03-08 Tom Tromey <tom@tromey.com>
* ada-lang.c (ada_wrapped_operation::evaluate): New method.
* ada-exp.h: New file.
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/ada-exp.h | 47 | ||||
-rw-r--r-- | gdb/ada-lang.c | 29 |
3 files changed, 81 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 10a738a..ff5862e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-03-08 Tom Tromey <tom@tromey.com> + * ada-lang.c (ada_wrapped_operation::evaluate): New method. + * ada-exp.h: New file. + +2021-03-08 Tom Tromey <tom@tromey.com> + * expop.h (class multi_subscript_operation): New. * eval.c (multi_subscript_operation::evaluate): New method. diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h new file mode 100644 index 0000000..3f780dc --- /dev/null +++ b/gdb/ada-exp.h @@ -0,0 +1,47 @@ +/* Definitions for Ada expressions + + Copyright (C) 2020 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef ADA_EXP_H +#define ADA_EXP_H + +#include "expop.h" + +namespace expr +{ + +/* In Ada, some generic operations must be wrapped with a handler that + handles some Ada-specific type conversions. */ +class ada_wrapped_operation + : public tuple_holding_operation<operation_up> +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return std::get<0> (m_storage)->opcode (); } +}; + +} /* namespace expr */ + +#endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index be1827c..4db5823 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -57,6 +57,7 @@ #include "gdbsupport/function-view.h" #include "gdbsupport/byte-vector.h" #include <algorithm> +#include "ada-exp.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). @@ -10387,6 +10388,34 @@ ada_binop_exp (struct type *expect_type, } } +namespace expr +{ + +value * +ada_wrapped_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *result = std::get<0> (m_storage)->evaluate (expect_type, exp, noside); + if (noside == EVAL_NORMAL) + result = unwrap_value (result); + + /* If evaluating an OP_FLOAT and an EXPECT_TYPE was provided, + then we need to perform the conversion manually, because + evaluate_subexp_standard doesn't do it. This conversion is + necessary in Ada because the different kinds of float/fixed + types in Ada have different representations. + + Similarly, we need to perform the conversion from OP_LONG + ourselves. */ + if ((opcode () == OP_FLOAT || opcode () == OP_LONG) && expect_type != NULL) + result = ada_value_cast (expect_type, result); + + return result; +} + +} + /* Implement the evaluate_exp routine in the exp_descriptor structure for the Ada language. */ |