From c40cc657bcc930b83ec42e071fe419073bd199f5 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 9 Oct 2014 12:37:17 -0400 Subject: [PATCH] [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/ChangeLog | 6 +++ gdb/ada-lang.c | 8 ++++ gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.ada/addr_arith.exp | 42 +++++++++++++++++++ .../gdb.ada/addr_arith/foo_na07_019.adb | 21 ++++++++++ gdb/testsuite/gdb.ada/addr_arith/pck.adb | 21 ++++++++++ gdb/testsuite/gdb.ada/addr_arith/pck.ads | 19 +++++++++ 7 files changed, 121 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/addr_arith.exp create mode 100644 gdb/testsuite/gdb.ada/addr_arith/foo_na07_019.adb create mode 100644 gdb/testsuite/gdb.ada/addr_arith/pck.adb create mode 100644 gdb/testsuite/gdb.ada/addr_arith/pck.ads diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 57ddd7bf0d4..9423d691e8c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-10-14 Joel Brobecker + + * ada-lang.c (ada_evaluate_subexp) : Add handling + of the case where the second operand is a pointer. + : Likewise. + 2014-10-14 Sergio Durigan Junior * breakpoint.c (bkpt_probe_insert_location): Call set_semaphore diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 36a2f24aa01..5793cd2b388 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)) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e780db3ce2c..1029e32aa66 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-10-14 Joel Brobecker + + * gdb.ada/addr_arith: New testcase. + 2014-10-14 Maciej W. Rozycki * gdb.dwarf2/dw2-case-insensitive-debug.S: Handle 64-bit pointers. diff --git a/gdb/testsuite/gdb.ada/addr_arith.exp b/gdb/testsuite/gdb.ada/addr_arith.exp new file mode 100644 index 00000000000..daba6385e40 --- /dev/null +++ b/gdb/testsuite/gdb.ada/addr_arith.exp @@ -0,0 +1,42 @@ +# Copyright 2014 Free Software Foundation, Inc. +# +# 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 . + +load_lib "ada.exp" + +standard_ada_testfile foo_na07_019 + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "START" ${testdir}/foo_na07_019.adb] +if ![runto "foo_na07_019.adb:$bp_location" ] then { + perror "Couldn't run ${testfile}" + return +} + +gdb_test "print something'address + 0" \ + "\\(system\\.address\\) $hex " + +gdb_test "print 0 + something'address" \ + "\\(system\\.address\\) $hex " + +gdb_test "print something'address - 0" \ + "\\(system\\.address\\) $hex " + +gdb_test "print 0 - something'address" \ + "\\(system\\.address\\) $hex.*" diff --git a/gdb/testsuite/gdb.ada/addr_arith/foo_na07_019.adb b/gdb/testsuite/gdb.ada/addr_arith/foo_na07_019.adb new file mode 100644 index 00000000000..a4d70df5952 --- /dev/null +++ b/gdb/testsuite/gdb.ada/addr_arith/foo_na07_019.adb @@ -0,0 +1,21 @@ +-- Copyright 2014 Free Software Foundation, Inc. +-- +-- 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 . + +with Pck; use Pck; + +procedure Foo_NA07_019 is +begin + Increment (Something); -- START +end Foo_NA07_019; diff --git a/gdb/testsuite/gdb.ada/addr_arith/pck.adb b/gdb/testsuite/gdb.ada/addr_arith/pck.adb new file mode 100644 index 00000000000..fbb43e1b77f --- /dev/null +++ b/gdb/testsuite/gdb.ada/addr_arith/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2014 Free Software Foundation, Inc. +-- +-- 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 . + +package body Pck is + procedure Increment (I : in out Integer) is + begin + I := I + 1; + end Increment; +end Pck; diff --git a/gdb/testsuite/gdb.ada/addr_arith/pck.ads b/gdb/testsuite/gdb.ada/addr_arith/pck.ads new file mode 100644 index 00000000000..f49e3212ef1 --- /dev/null +++ b/gdb/testsuite/gdb.ada/addr_arith/pck.ads @@ -0,0 +1,19 @@ +-- Copyright 2014 Free Software Foundation, Inc. +-- +-- 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 . + +package Pck is + Something : Integer := 0; + procedure Increment (I : in out Integer); +end Pck; -- 2.30.2