From patchwork Thu Sep 4 14:31:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 2649 Received: (qmail 26363 invoked by alias); 4 Sep 2014 14:31: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 26287 invoked by uid 89); 4 Sep 2014 14:31:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 04 Sep 2014 14:31:55 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s84EVpAl014867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Sep 2014 10:31:51 -0400 Received: from localhost (dhcp-10-15-16-169.yyz.redhat.com [10.15.16.169]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s84EVoEm002465 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Thu, 4 Sep 2014 10:31:51 -0400 From: Sergio Durigan Junior To: Joel Brobecker Cc: GDB Patches Subject: Re: [PATCH] Fix PR fortran/17237: bug in f-valprint.c References: <1409680902-22975-1-git-send-email-sergiodj@redhat.com> <20140903062835.GA9152@adacore.com> X-URL: http://www.redhat.com Date: Thu, 04 Sep 2014 10:31:50 -0400 In-Reply-To: <20140903062835.GA9152@adacore.com> (Joel Brobecker's message of "Wed, 3 Sep 2014 08:28:35 +0200") Message-ID: <87oauvcv8p.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes On Wednesday, September 03 2014, Joel Brobecker wrote: >> +gdb_test "print ii" " = 0xa" "print ii" > > You don't really need the second "print ii" in the call to gdb_test, > I think. By default, the name of the test is the same as the test > itself. OK with me either way. Thanks, Joel :-). Here is what I pushed. Cheers, diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 62316bb..201a8c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-09-04 Sergio Durigan Junior + + PR fortran/17237 + * f-valprint.c (f_val_print): Specify the correct print option to + use when printing integer values. + 2014-09-04 Gary Benson * x86-linux-nat.c (x86_linux_dr_get, x86_linux_dr_set): diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index c7581a8..9a43cf3 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -349,7 +349,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, opts.format = (options->format ? options->format : options->output_format); val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, options, 0, stream); + original_value, &opts, 0, stream); } else { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 10d27b3..50c69ae 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-09-04 Sergio Durigan Junior + + PR fortran/17237 + * gdb.fortran/print-formatted.exp: New file. + * gdb.fortran/print-formatted.f90: Likewise. + 2014-09-03 Sasha Smundak * gdb.python/py-frame.exp: Test Frame.read_register. diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp new file mode 100644 index 0000000..b0f6d36 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/print-formatted.exp @@ -0,0 +1,39 @@ +# Copyright (C) 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 "fortran.exp" + +if { [skip_fortran_tests] } { + continue +} + +standard_testfile .f90 + +if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } { + return -1 +} + +if { ![runto MAIN__] } { + fail "runto MAIN__" + return -1 +} + +gdb_test "next" ".*" "go to the end of the program" + +gdb_test "set output-radix 16" \ + "Output radix now set to decimal 16, hex 10, octal 20." \ + "setting the output-radix to 16" + +gdb_test "print ii" " = 0xa" "print ii in hex" diff --git a/gdb/testsuite/gdb.fortran/print-formatted.f90 b/gdb/testsuite/gdb.fortran/print-formatted.f90 new file mode 100644 index 0000000..1c6c8d4 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/print-formatted.f90 @@ -0,0 +1,20 @@ +! 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 . + +program printformatted + integer :: ii + + ii = 10 +end program printformatted