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:35 -0700 |
| commit | 9e99f48f27790c43d5fd663c9eb4c3a19ae49efa (patch) | |
| tree | 7be2a4a52c7744deea83464c9ed4a0dd604babe1 /gdb | |
| parent | 7631cf6cc8812fef7d27aff800e12f8e31393f29 (diff) | |
| download | gdb-9e99f48f27790c43d5fd663c9eb4c3a19ae49efa.zip gdb-9e99f48f27790c43d5fd663c9eb4c3a19ae49efa.tar.gz gdb-9e99f48f27790c43d5fd663c9eb4c3a19ae49efa.tar.bz2 | |
Introduce ada_atr_val_operation
This adds class ada_atr_val_operation, which implements OP_ATR_VAL.
gdb/ChangeLog
2021-03-08 Tom Tromey <tom@tromey.com>
* ada-lang.c (ada_val_atr): No longer static.
(ada_atr_val_operation::evaluate): New method.
* ada-exp.h (class ada_atr_val_operation): New.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/ada-exp.h | 19 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 11 |
3 files changed, 35 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index adb5140..c49a9db 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2021-03-08 Tom Tromey <tom@tromey.com> + * ada-lang.c (ada_val_atr): No longer static. + (ada_atr_val_operation::evaluate): New method. + * ada-exp.h (class ada_atr_val_operation): New. + +2021-03-08 Tom Tromey <tom@tromey.com> + * ada-lang.c (ada_pos_atr): No longer static. * ada-exp.h (ada_pos_operation): New typedef. diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 07744c1..c86b054 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -69,6 +69,9 @@ extern struct value *ada_pos_atr (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg); +extern struct value *ada_val_atr (enum noside noside, struct type *type, + struct value *arg); + namespace expr { @@ -334,6 +337,22 @@ protected: using operation::do_generate_ax; }; +/* Implement the Ada 'val attribute. */ +class ada_atr_val_operation + : public tuple_holding_operation<struct type *, 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 OP_ATR_VAL; } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 52766ae..c689c7f 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -8892,7 +8892,7 @@ val_atr (struct type *type, LONGEST val) return value_from_longest (type, val); } -static struct value * +struct value * ada_val_atr (enum noside noside, struct type *type, struct value *arg) { if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -10694,6 +10694,15 @@ ada_var_value_operation::evaluate (struct type *expect_type, return ada_to_fixed_value (arg1); } +value * +ada_atr_val_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return ada_val_atr (noside, std::get<0> (m_storage), arg); +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure |