diff options
author | Joel Brobecker <brobecker@adacore.com> | 2014-10-09 12:37:17 -0400 |
---|---|---|
committer | Joel Brobecker <brobecker@adacore.com> | 2014-10-14 14:05:11 -0700 |
commit | c40cc657bcc930b83ec42e071fe419073bd199f5 (patch) | |
tree | 5bbf82ebaeae8c4787a1ffa35b2011cacaa07dd2 /gdb/testsuite/gdb.ada | |
parent | 2abf49e11e603ecc002fa27704a978733c601386 (diff) | |
download | fsf-binutils-gdb-c40cc657bcc930b83ec42e071fe419073bd199f5.zip fsf-binutils-gdb-c40cc657bcc930b83ec42e071fe419073bd199f5.tar.gz fsf-binutils-gdb-c40cc657bcc930b83ec42e071fe419073bd199f5.tar.bz2 |
[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 <pck.something>
(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 <pck.something>
(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) <BINOP_ADD>: Add handling
of the case where the second operand is a pointer.
<BINOP_SUB>: Likewise.
gdb/testsuite/ChangeLog:
* gdb.ada/addr_arith: New testcase.
Tested on x86_64-linux.
Diffstat (limited to 'gdb/testsuite/gdb.ada')
-rw-r--r-- | gdb/testsuite/gdb.ada/addr_arith.exp | 42 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/addr_arith/foo_na07_019.adb | 21 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/addr_arith/pck.adb | 21 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/addr_arith/pck.ads | 19 |
4 files changed, 103 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.ada/addr_arith.exp b/gdb/testsuite/gdb.ada/addr_arith.exp new file mode 100644 index 0000000..daba638 --- /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 <http://www.gnu.org/licenses/>. + +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 <pck\\.something>" + +gdb_test "print 0 + something'address" \ + "\\(system\\.address\\) $hex <pck\\.something>" + +gdb_test "print something'address - 0" \ + "\\(system\\.address\\) $hex <pck\\.something>" + +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 0000000..a4d70df --- /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 <http://www.gnu.org/licenses/>. + +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 0000000..fbb43e1 --- /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 <http://www.gnu.org/licenses/>. + +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 0000000..f49e321 --- /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 <http://www.gnu.org/licenses/>. + +package Pck is + Something : Integer := 0; + procedure Increment (I : in out Integer); +end Pck; |