diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/funcall_char.exp | 32 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/funcall_char/foo.adb | 33 |
5 files changed, 77 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f03a2fd..fd471c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-09-03 Pierre-Marie de Rodat <derodat@adacore.com> + + * ada-lang.c (ada_language_arch_info): Create a TYPE_CODE_CHAR + type instead of a TYPE_CODE_INT one for the string_char_type + and the ada_primitive_type_char types. + 2015-09-03 Yao Qi <yao.qi@linaro.org> * aarch64-linux-nat.c (aarch64_linux_region_ok_for_hw_watchpoint): diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a7809ff..5604849 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13775,7 +13775,7 @@ ada_language_arch_info (struct gdbarch *gdbarch, 0, "short_integer"); lai->string_char_type = lai->primitive_type_vector [ada_primitive_type_char] - = arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, "character"); + = arch_character_type (gdbarch, TARGET_CHAR_BIT, 0, "character"); lai->primitive_type_vector [ada_primitive_type_float] = arch_float_type (gdbarch, gdbarch_float_bit (gdbarch), "float", NULL); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4eaf1d1..2a1cc07 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-03 Pierre-Marie de Rodat <derodat@adacore.com> + + * gdb.ada/funcall_char.exp: New testcase. + * gdb.ada/funcall_char/foo.adb: New file. + 2015-09-01 Pierre-Marie de Rodat <derodat@adacore.com> * gdb.ada/complete.exp: Add "pck.ambiguous_func" to the relevant diff --git a/gdb/testsuite/gdb.ada/funcall_char.exp b/gdb/testsuite/gdb.ada/funcall_char.exp new file mode 100644 index 0000000..ee53966 --- /dev/null +++ b/gdb/testsuite/gdb.ada/funcall_char.exp @@ -0,0 +1,32 @@ +# Copyright 2015 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 + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb] +runto "foo.adb:$bp_location" + +# Make sure we can call a function that takes a character with a character +# literal. If we cannot, then GDB will instead invoke the function that takes +# an integer and will return a negative number. +gdb_test "print f('A')" " = 65" diff --git a/gdb/testsuite/gdb.ada/funcall_char/foo.adb b/gdb/testsuite/gdb.ada/funcall_char/foo.adb new file mode 100644 index 0000000..b5c0506 --- /dev/null +++ b/gdb/testsuite/gdb.ada/funcall_char/foo.adb @@ -0,0 +1,33 @@ +-- Copyright 2015 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/>. + +procedure Foo is + + function F (C : Character) return Integer is + begin + return Character'Pos (C); + end F; + + function F (I : Integer) return Integer is + begin + return -I; + end F; + + I1 : constant Integer := F ('A'); -- BREAK + I2 : constant Integer := F (1); + +begin + null; +end Foo; |