From c40cc657bcc930b83ec42e071fe419073bd199f5 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 9 Oct 2014 12:37:17 -0400 Subject: [Ada] Error adding/subtracting pointer value to/from integral. When trying to evaluate an expression which adds a pointer and an integral, the evaluation succeeds if the pointer is on the left handside of the operator, but not when it is on the right handside: (gdb) p something'address + 0 $1 = (system.address) 0x613418 (gdb) p 0 + something'address Argument to arithmetic operation not a number or boolean. Same issue when doing subtractions: (gdb) p something'address - 0 $2 = (system.address) 0x613418 (gdb) p 0 - something'address Argument to arithmetic operation not a number or boolean. This patch enhances the Ada expression evaluator to handle these two situations. gdb/ChangeLog: * ada-lang.c (ada_evaluate_subexp) : Add handling of the case where the second operand is a pointer. : Likewise. gdb/testsuite/ChangeLog: * gdb.ada/addr_arith: New testcase. Tested on x86_64-linux. --- gdb/ada-lang.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 36a2f24..5793cd2 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10004,6 +10004,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, return (value_from_longest (value_type (arg1), value_as_long (arg1) + value_as_long (arg2))); + if (TYPE_CODE (value_type (arg2)) == TYPE_CODE_PTR) + return (value_from_longest + (value_type (arg2), + value_as_long (arg1) + value_as_long (arg2))); if ((ada_is_fixed_point_type (value_type (arg1)) || ada_is_fixed_point_type (value_type (arg2))) && value_type (arg1) != value_type (arg2)) @@ -10026,6 +10030,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, return (value_from_longest (value_type (arg1), value_as_long (arg1) - value_as_long (arg2))); + if (TYPE_CODE (value_type (arg2)) == TYPE_CODE_PTR) + return (value_from_longest + (value_type (arg2), + value_as_long (arg1) - value_as_long (arg2))); if ((ada_is_fixed_point_type (value_type (arg1)) || ada_is_fixed_point_type (value_type (arg2))) && value_type (arg1) != value_type (arg2)) -- cgit v1.1