diff options
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 8 | ||||
-rw-r--r-- | gdb/eval.c | 8 | ||||
-rw-r--r-- | gdb/expop.h | 50 |
3 files changed, 62 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 17281bf..5824898 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2021-03-08 Tom Tromey <tom@tromey.com> + * expop.h (unop_incr_operation): New template. + (preinc_operation, predec_operation, postinc_operation) + (postdec_operation): New typedefs. + * eval.c (eval_op_preinc, eval_op_predec, eval_op_postinc) + (eval_op_postdec): No longer static. + +2021-03-08 Tom Tromey <tom@tromey.com> + * expop.h (unary_ftype): New typedef. (unop_operation, usual_ax_binop_operation): New templates. (unary_plus_operation, unary_neg_operation) @@ -1912,7 +1912,7 @@ eval_op_memval (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_PREINCREMENT. */ -static struct value * +struct value * eval_op_preinc (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) @@ -1943,7 +1943,7 @@ eval_op_preinc (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_PREDECREMENT. */ -static struct value * +struct value * eval_op_predec (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) @@ -1974,7 +1974,7 @@ eval_op_predec (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_POSTINCREMENT. */ -static struct value * +struct value * eval_op_postinc (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) @@ -2008,7 +2008,7 @@ eval_op_postinc (struct type *expect_type, struct expression *exp, /* A helper function for UNOP_POSTDECREMENT. */ -static struct value * +struct value * eval_op_postdec (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1) diff --git a/gdb/expop.h b/gdb/expop.h index abd914a..ec73109 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -162,6 +162,26 @@ extern struct value *eval_op_lognot (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1); +extern struct value *eval_op_preinc (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1); +extern struct value *eval_op_predec (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1); +extern struct value *eval_op_postinc (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1); +extern struct value *eval_op_postdec (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1); namespace expr { @@ -1316,6 +1336,36 @@ using unary_complement_operation using unary_logical_not_operation = usual_ax_unop_operation<UNOP_LOGICAL_NOT, eval_op_lognot>; +/* Handle pre- and post- increment and -decrement. */ +template<enum exp_opcode OP, unary_ftype FUNC> +class unop_incr_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 + { + value *val = std::get<0> (m_storage)->evaluate (expect_type, exp, noside); + return FUNC (expect_type, exp, noside, OP, val); + } + + enum exp_opcode opcode () const override + { return OP; } +}; + +using preinc_operation + = unop_incr_operation<UNOP_PREINCREMENT, eval_op_preinc>; +using predec_operation + = unop_incr_operation<UNOP_PREDECREMENT, eval_op_predec>; +using postinc_operation + = unop_incr_operation<UNOP_POSTINCREMENT, eval_op_postinc>; +using postdec_operation + = unop_incr_operation<UNOP_POSTDECREMENT, eval_op_postdec>; + } /* namespace expr */ #endif /* EXPOP_H */ |