[RFA] Fix parameter coercing for Ada function calls (take 2)
Joel Brobecker
brobecker@adacore.com
Tue Jan 8 18:53:00 GMT 2008
Hi Daniel,
Does this look like what you had in mind? It's a little more work
than my first patch, but indeed a little more elegant.
2008-01-08 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (ada_convert_actual): Renames convert_actual.
Make non-static.
(ada_convert_actuals): Delete.
* ada-lang.c (ada_convert_actual): Add declaration.
(ada_convert_actuals): Remove declaration.
* infcall.c: #include "ada-lang.h".
(value_arg_coerce): Add new parameter sp. Add handling of Ada
function call parameters.
* Makefile.in (infcall.o): Update dependencies.
I am also reposting the testcase for everyone's convenience
(I feel sufficiently confident about the testcase that's very simple
to auto-review myself, but a second pair of eyes is always appreciated).
2008-01-08 Joel Brobecker <brobecker@adacore.com>
* gdb.ada/arrayparam: New test program.
* gdb.ada/arrayparam.exp: New testcase.
All tested on x86-linux, no regression.
OK to commit?
Thanks,
--
Joel
-------------- next part --------------
Index: ada-lang.c
===================================================================
--- ada-lang.c (revision 107)
+++ ada-lang.c (revision 108)
@@ -3942,9 +3942,9 @@ ensure_lval (struct value *val, CORE_ADD
allocating any necessary descriptors (fat pointers), or copies of
values not residing in memory, updating it as needed. */
-static struct value *
-convert_actual (struct value *actual, struct type *formal_type0,
- CORE_ADDR *sp)
+struct value *
+ada_convert_actual (struct value *actual, struct type *formal_type0,
+ CORE_ADDR *sp)
{
struct type *actual_type = ada_check_typedef (value_type (actual));
struct type *formal_type = ada_check_typedef (formal_type0);
@@ -4036,30 +4036,6 @@ make_array_descriptor (struct type *type
else
return descriptor;
}
-
-
-/* Assuming a dummy frame has been established on the target, perform any
- conversions needed for calling function FUNC on the NARGS actual
- parameters in ARGS, other than standard C conversions. Does
- nothing if FUNC does not have Ada-style prototype data, or if NARGS
- does not match the number of arguments expected. Use *SP as a
- stack pointer for additional data that must be pushed, updating its
- value as needed. */
-
-void
-ada_convert_actuals (struct value *func, int nargs, struct value *args[],
- CORE_ADDR *sp)
-{
- int i;
-
- if (TYPE_NFIELDS (value_type (func)) == 0
- || nargs != TYPE_NFIELDS (value_type (func)))
- return;
-
- for (i = 0; i < nargs; i += 1)
- args[i] =
- convert_actual (args[i], TYPE_FIELD_TYPE (value_type (func), i), sp);
-}
/* Dummy definitions for an experimental caching module that is not
* used in the public sources. */
Index: ada-lang.h
===================================================================
--- ada-lang.h (revision 107)
+++ ada-lang.h (revision 108)
@@ -278,8 +278,9 @@ extern void ada_printchar (int, struct u
extern void ada_printstr (struct ui_file *, const gdb_byte *,
unsigned int, int, int);
-extern void ada_convert_actuals (struct value *, int, struct value **,
- CORE_ADDR *);
+struct value *ada_convert_actual (struct value *actual,
+ struct type *formal_type0,
+ CORE_ADDR *sp);
extern struct value *ada_value_subscript (struct value *, int,
struct value **);
Index: infcall.c
===================================================================
--- infcall.c (revision 107)
+++ infcall.c (revision 108)
@@ -34,6 +34,7 @@
#include "gdb_string.h"
#include "infcall.h"
#include "dummy-frame.h"
+#include "ada-lang.h"
/* NOTE: cagney/2003-04-16: What's the future of this code?
@@ -91,19 +92,23 @@ Unwinding of stack if a signal is receiv
/* Perform the standard coercions that are specified
- for arguments to be passed to C functions.
+ for arguments to be passed to C or Ada functions.
If PARAM_TYPE is non-NULL, it is the expected parameter type.
IS_PROTOTYPED is non-zero if the function declaration is prototyped. */
static struct value *
value_arg_coerce (struct value *arg, struct type *param_type,
- int is_prototyped)
+ int is_prototyped, CORE_ADDR *pc)
{
struct type *arg_type = check_typedef (value_type (arg));
struct type *type
= param_type ? check_typedef (param_type) : arg_type;
+ /* Perform any Ada-specific coercion first. */
+ if (current_language->la_language == language_ada)
+ arg = ada_convert_actual (arg, type, pc);
+
switch (TYPE_CODE (type))
{
case TYPE_CODE_REF:
@@ -577,7 +582,7 @@ call_function_by_hand (struct value *fun
else
param_type = NULL;
- args[i] = value_arg_coerce (args[i], param_type, prototyped);
+ args[i] = value_arg_coerce (args[i], param_type, prototyped, &sp);
if (param_type != NULL && language_pass_by_reference (param_type))
args[i] = value_addr (args[i]);
Index: Makefile.in
===================================================================
--- Makefile.in (revision 107)
+++ Makefile.in (revision 108)
@@ -2271,7 +2271,7 @@ ia64-tdep.o: ia64-tdep.c $(defs_h) $(inf
infcall.o: infcall.c $(defs_h) $(breakpoint_h) $(target_h) $(regcache_h) \
$(inferior_h) $(gdb_assert_h) $(block_h) $(gdbcore_h) $(language_h) \
$(objfiles_h) $(gdbcmd_h) $(command_h) $(gdb_string_h) $(infcall_h) \
- $(dummy_frame_h)
+ $(dummy_frame_h) $(ada_lang_h)
inf-child.o: inf-child.c $(defs_h) $(regcache_h) $(memattr_h) $(symtab_h) \
$(target_h) $(inferior_h) $(gdb_string_h)
infcmd.o: infcmd.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \
-------------- next part --------------
Index: gdb.ada/arrayparam.exp
===================================================================
--- gdb.ada/arrayparam.exp (revision 0)
+++ gdb.ada/arrayparam.exp (revision 100)
@@ -0,0 +1,61 @@
+# Copyright 2008 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/>.
+
+if $tracelevel then {
+ strace $tracelevel
+}
+
+load_lib "ada.exp"
+
+set testdir "arrayparam"
+set testfile "${testdir}/foo"
+set srcfile ${srcdir}/${subdir}/${testfile}.adb
+set binfile ${objdir}/${subdir}/${testfile}
+
+file mkdir ${objdir}/${subdir}/${testdir}
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+ return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
+runto "foo.adb:$bp_location"
+
+# Verify that a call to a function that takes an array as a parameter
+# works without problem.
+
+gdb_test "print call_me (\"bonjour\")" \
+ "void" \
+ "print call_me (\"bonjour\")"
+
+# Verify that the array was passed properly by checking the global
+# variables that Call_Me sets as side-effects.
+
+gdb_test "print first" \
+ "98 'b'" \
+ "print first after function call"
+
+gdb_test "print last" \
+ "114 'r'" \
+ "print lasta after function call"
+
+gdb_test "print length" \
+ "7" \
+ "print length after function call"
+
Index: gdb.ada/arrayparam/pck.adb
===================================================================
--- gdb.ada/arrayparam/pck.adb (revision 0)
+++ gdb.ada/arrayparam/pck.adb (revision 100)
@@ -0,0 +1,28 @@
+-- Copyright 2008 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 Call_Me (Str : String) is
+ begin
+ Length := Str'Length;
+ if Length > 0 then
+ First := Str (Str'First);
+ Last := Str (Str'Last);
+ end if;
+ end Call_Me;
+
+end Pck;
+
Index: gdb.ada/arrayparam/pck.ads
===================================================================
--- gdb.ada/arrayparam/pck.ads (revision 0)
+++ gdb.ada/arrayparam/pck.ads (revision 100)
@@ -0,0 +1,25 @@
+-- Copyright 2008 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
+
+ First : Character := ASCII.NUL;
+ Last : Character := ASCII.NUL;
+ Length : Integer := 0;
+
+ procedure Call_Me (Str : String);
+
+end Pck;
+
Index: gdb.ada/arrayparam/foo.adb
===================================================================
--- gdb.ada/arrayparam/foo.adb (revision 0)
+++ gdb.ada/arrayparam/foo.adb (revision 100)
@@ -0,0 +1,26 @@
+-- Copyright 2008 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 is
+ My_String : constant String := "Hello World";
+begin
+ First := ASCII.NUL;
+ Last := ASCII.NUL;
+ Length := -1;
+ Call_Me (My_String); -- STOP
+end Foo;
+
More information about the Gdb-patches
mailing list