From patchwork Thu Mar 1 10:04:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roirand X-Patchwork-Id: 26126 Received: (qmail 33012 invoked by alias); 1 Mar 2018 10:04:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 32996 invoked by uid 89); 1 Mar 2018 10:04:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: mail-wm0-f68.google.com Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Mar 2018 10:04:46 +0000 Received: by mail-wm0-f68.google.com with SMTP id 188so10408886wme.1 for ; Thu, 01 Mar 2018 02:04:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kDp+ipSiLGT1vI12SMkKze9wDWuNt6DOX8iZwWXYL6Q=; b=Dn+U0wkvwmP2zX5k2b1lLrdE7F4KXmTlE9LsSyKJ7yp1GUjf1cHJRIcC71/1ttRklw 4kSMj2KQORDUQd+5XWmc1WDK/+KTu4c55eFuOT+8UfkHCfnwRfxGe/urZx79w4nHPolT enjLbc+oPOKwEiudscy+OgHb+mppdPxAVV4FM54zJDuvF5oF6q9ZybVXYMuwV+w0AYcX xwMvSe3A1k0rldfEvIrxjldMQyLTQRNyuYOWMiX9awqhqzrCrw9c8wVMIGnoima2UfYb IHHx8s0l8bUccDrCWTTr/UU3R8kEdHP6wLo7CCaiGh9U8WIMTcOg5zv+QaUnxjVUgpNj 28bQ== X-Gm-Message-State: APf1xPAzjzMd8EER9qMAEjgCCjDmjzAJ+G4S9wF7GsJnnyjSNTI3AibV ckXuRO1SBvG9xTJpKbeBxwM0SwKh X-Google-Smtp-Source: AG47ELtzwqu7BKxlgtc1tP1Ajh0bDIVUqdwOX5zxKG6/6n9znF2z/uaHcHutOkSvJCwXAgtzVIAQdQ== X-Received: by 10.28.1.14 with SMTP id 14mr1191032wmb.40.1519898683331; Thu, 01 Mar 2018 02:04:43 -0800 (PST) Received: from adacore.com ([46.18.100.10]) by smtp.gmail.com with ESMTPSA id 8sm5624425wmf.13.2018.03.01.02.04.41 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Mar 2018 02:04:42 -0800 (PST) Received: by adacore.com (sSMTP sendmail emulation); Thu, 01 Mar 2018 11:04:39 +0100 From: Xavier Roirand To: gdb-patches@sourceware.org Cc: brobecker@adacore.com, Xavier Roirand Subject: [RFA v6] (Ada) Fix frame argument printing when using auto language mode Date: Thu, 1 Mar 2018 11:04:36 +0100 Message-Id: <1519898676-2410-1-git-send-email-roirand@adacore.com> X-IsSubscribed: yes When debugging a mixed Ada/C program using this scenario: - set print frame-arguements all - an Ada function named pck.call_me calls a C function named break_me - you put a breakpoint in break_me and the program reaches this breakpoint. Now display the backtrace: (gdb) bt #0 break_me () at [...] #1 0x000000000040243e in pck.call_me ( s={P_ARRAY = 0x7fffffffe21c, P_BOUNDS = 0x41e6e8}) at [...] whereas we should expect: (gdb) bt #0 break_me () at [...] #1 0x000000000040243e in pck.call_me (s="test") at [...] The problem is that GDB prints the S parameter in the pck.call_me Ada function using the current language, so the C one, because the program is stopped in a C function, whereas it should use the pck.call_me frame one. This behavior is ok when user manually changes the language but it's not the right one when language is auto. This patch fixes this problem so now when using auto language, all Ada frame arguments are printed using Ada like syntax when the frame is part of Ada code, even if the program is stopped in a frame using a different language. If the user explicitly sets a language (using "set language ...") then no change here, all the Ada frame arguments are printed using this language. gdb/ChangeLog: * ada-valprint.c (ada_val_print_gnat_array): Remove language parameter and use Ada language definition instead. (ada_val_print_ptr): Remove unused language parameter. (ada_val_print_num): Remove language parameter and use Ada language definition instead. (ada_val_print_enum, ada_val_print_flt): Remove unused language parameter. (ada_val_print_struct_union, ada_val_print_ref): Remove language parameter and use Ada language definition instead. (ada_val_print_1): Remove unused language parameter. Update all ada_val_print_xxx calls. (ada_val_print): Update ada_val_print_1 call. gdb/testsuite/ChangeLog: * gdb.ada/frame_arg_lang.exp: New testcase. * gdb.ada/frame_arg_lang/bla.adb: New file. * gdb.ada/frame_arg_lang/pck.ads: New file. * gdb.ada/frame_arg_lang/pck.adb: New file. * gdb.ada/frame_arg_lang/foo.c: New file. Tested on x86_64-linux --- gdb/ada-valprint.c | 56 +++++++++----------- gdb/testsuite/gdb.ada/frame_arg_lang.exp | 79 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb | 22 ++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/foo.c | 22 ++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb | 30 +++++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads | 18 +++++++ 6 files changed, 196 insertions(+), 31 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang.exp create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/foo.c create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index a486919..f1062db 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -766,8 +766,7 @@ ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr, int offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { struct value *mark = value_mark (); struct value *val; @@ -789,7 +788,8 @@ ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr, else val_print (value_type (val), value_embedded_offset (val), value_address (val), - stream, recurse, val, options, language); + stream, recurse, val, options, + language_def (language_ada)); value_free_to_mark (mark); } @@ -801,8 +801,7 @@ ada_val_print_ptr (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { val_print (type, offset, address, stream, recurse, original_value, options, language_def (language_c)); @@ -828,8 +827,7 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { if (ada_is_fixed_point_type (type)) { @@ -860,12 +858,13 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, val_print (target_type, value_embedded_offset (v), 0, stream, - recurse + 1, v, options, language); + recurse + 1, v, options, + language_def (language_ada)); } else val_print (TYPE_TARGET_TYPE (type), offset, address, stream, recurse, original_value, - options, language); + options, language_def (language_ada)); return; } else @@ -924,8 +923,7 @@ ada_val_print_enum (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { int i; unsigned int len; @@ -968,8 +966,7 @@ ada_val_print_flt (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { if (options->format) { @@ -989,8 +986,7 @@ ada_val_print_struct_union (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { if (ada_is_bogus_array_descriptor (type)) { @@ -1002,7 +998,8 @@ ada_val_print_struct_union if (print_field_values (type, valaddr, offset_aligned, stream, recurse, original_value, options, - 0, type, offset_aligned, language) != 0 + 0, type, offset_aligned, + language_def (language_ada)) != 0 && options->prettyformat) { fprintf_filtered (stream, "\n"); @@ -1053,8 +1050,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, int offset, int offset_aligned, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { /* For references, the debugger is expected to print the value as an address if DEREF_REF is null. But printing an address in place @@ -1078,7 +1074,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, deref_val = ada_tag_value_at_base_address (deref_val); common_val_print (deref_val, stream, recurse + 1, options, - language); + language_def (language_ada)); return; } @@ -1107,7 +1103,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr, val_print (value_type (deref_val), value_embedded_offset (deref_val), value_address (deref_val), stream, recurse + 1, - deref_val, options, language); + deref_val, options, language_def (language_ada)); } /* See the comment on ada_val_print. This function differs in that it @@ -1118,8 +1114,7 @@ ada_val_print_1 (struct type *type, int offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *original_value, - const struct value_print_options *options, - const struct language_defn *language) + const struct value_print_options *options) { int offset_aligned; const gdb_byte *valaddr = value_contents_for_printing (original_value); @@ -1132,7 +1127,7 @@ ada_val_print_1 (struct type *type, { ada_val_print_gnat_array (type, valaddr, offset, address, stream, recurse, original_value, - options, language); + options); return; } @@ -1151,33 +1146,33 @@ ada_val_print_1 (struct type *type, case TYPE_CODE_PTR: ada_val_print_ptr (type, valaddr, offset, offset_aligned, address, stream, recurse, original_value, - options, language); + options); break; case TYPE_CODE_INT: case TYPE_CODE_RANGE: ada_val_print_num (type, valaddr, offset, offset_aligned, address, stream, recurse, original_value, - options, language); + options); break; case TYPE_CODE_ENUM: ada_val_print_enum (type, valaddr, offset, offset_aligned, address, stream, recurse, original_value, - options, language); + options); break; case TYPE_CODE_FLT: ada_val_print_flt (type, valaddr, offset, offset_aligned, address, stream, recurse, original_value, - options, language); + options); break; case TYPE_CODE_UNION: case TYPE_CODE_STRUCT: ada_val_print_struct_union (type, valaddr, offset, offset_aligned, address, stream, recurse, - original_value, options, language); + original_value, options); break; case TYPE_CODE_ARRAY: @@ -1189,7 +1184,7 @@ ada_val_print_1 (struct type *type, case TYPE_CODE_REF: ada_val_print_ref (type, valaddr, offset, offset_aligned, address, stream, recurse, original_value, - options, language); + options); break; } } @@ -1207,8 +1202,7 @@ ada_val_print (struct type *type, TRY { ada_val_print_1 (type, embedded_offset, address, - stream, recurse, val, options, - current_language); + stream, recurse, val, options); } CATCH (except, RETURN_MASK_ERROR) { diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang.exp b/gdb/testsuite/gdb.ada/frame_arg_lang.exp new file mode 100644 index 0000000..3acb57b --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang.exp @@ -0,0 +1,79 @@ +# Copyright 2018 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 bla +set cfile "foo" +set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c +set cobject [standard_output_file ${cfile}.o] + +gdb_compile "${csrcfile}" "${cobject}" object [list debug] +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.c] +runto "foo.c:$bp_location" + +gdb_test_no_output "set print frame-arguments all" + +# Here is the scenario: +# - Once stopped in a C function, with language_mode set to auto, print +# backtrace, we should see the Ada frame arguments printed using Ada +# syntax. +# - Set language to C, then check that printing backtrace shows the Ada +# frame arguments using C syntax. +# - Set language back to auto and check language mode value. +# - Continue and stop in Ada function, print backtrace, we should see Ada +# frame arguments printed with Ada syntax. + +gdb_test "show lang" \ + "The current source language is \"auto; currently c\"." \ + "show language #1" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s=\"test\"\\).*" \ + "backtrace with auto: c" + +gdb_test_no_output "set language c" \ + "Set current source language to \"manual; currently c\"." + +gdb_test "show lang" \ + "The current source language is \"c\"." \ + "show language #2" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s={P_ARRAY = $hex, P_BOUNDS = $hex}\\).*" \ + "backtrace with manual: c" + +gdb_test_no_output "set language auto" \ + "Set current source language to \"auto; currently c\"." + +gdb_test "show lang" \ + "The current source language is \"auto; currently c\"." \ + "show language #3" + +gdb_breakpoint "pck.stop_ada" + +gdb_test "continue" \ + ".*Breakpoint $decimal, pck.stop_ada \\(\\).*" \ + "continue to Ada breakpoint" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s=\"test\"\\).*" \ + "backtrace with auto: ada" diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb b/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb new file mode 100644 index 0000000..dc772d6 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb @@ -0,0 +1,22 @@ +-- Copyright 2018 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 Bla is + S : String := "test"; +begin + Call_Me (S); +end Bla; diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c b/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c new file mode 100644 index 0000000..859d23c --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c @@ -0,0 +1,22 @@ +/* Copyright 2018 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 . */ + +int +break_me (void) +{ + return 0; /* STOP */ +} diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb new file mode 100644 index 0000000..1a766ab --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb @@ -0,0 +1,30 @@ +-- Copyright 2018 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 C_Break_Me; + pragma Import (C, C_Break_Me, "break_me"); + + procedure Stop_Ada is + begin + null; + end Stop_Ada; + + procedure Call_Me (S: in out String) is + begin + C_Break_Me; + Stop_Ada; + end Call_Me; +end Pck; diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads new file mode 100644 index 0000000..2f6ee60 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads @@ -0,0 +1,18 @@ +-- Copyright 2018 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 + procedure Call_Me (S: in out String); +end Pck;