From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1179 invoked by alias); 26 Feb 2004 22:29:11 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 1161 invoked from network); 26 Feb 2004 22:29:07 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 26 Feb 2004 22:29:07 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu-dmz.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i1QMT6b07869 for ; Thu, 26 Feb 2004 17:29:06 -0500 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i1QMT5M27271; Thu, 26 Feb 2004 17:29:05 -0500 Received: from 192.168.1.129 (vpn50-54.rdu.redhat.com [172.16.50.54]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id i1QMT3X26437; Thu, 26 Feb 2004 14:29:03 -0800 From: Fred Fish Reply-To: fnf@redhat.com To: Andrew Cagney , fnf@redhat.com Subject: Re: [RFA] Fix incorrect use of "until" command in gdb.arch/gdb1431 Date: Thu, 26 Feb 2004 22:29:00 -0000 User-Agent: KMail/1.5.4 Cc: gdb-patches@sources.redhat.com References: <200402192003.08113.fnf@ninemoons.com> <403E5F6C.4050001@gnu.org> In-Reply-To: <403E5F6C.4050001@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200402261529.01301.fnf@ninemoons.com> X-SW-Source: 2004-02/txt/msg00782.txt.bz2 On Thursday 26 February 2004 14:04, Andrew Cagney wrote: > Hmm, "How did it ever work"? :-) =46rom what I could tell, at one time "until" did work like "advance". There is a pretty long thread about it on the gdb or gdb-patches list, though I can't seem to find it again with a quick search. > I guess so, but keep the 1431.c specific test file OK, I kept a distinct file for this test, but one that is cloned from the 1291 test to be all assembly instead of mixed C/assembly. There is a previously reported gcc bug that causes line numbers to be botched in the mix C/assembly case, obscuring what we are trying to test for here. I committed the following patch. -Fred 2004-02-26 Fred Fish =20=20 * gdb.arch/gdb1431.c: Remove. * gdb.arch/gdb1431.s: New file, copy of gdb1291.s * gdb.arch/gdb1431.exp: Use "advance" correctly instead of "until" incorrectly. =20 Index: gdb.arch/gdb1431.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: gdb.arch/gdb1431.c diff -N gdb.arch/gdb1431.c *** gdb.arch/gdb1431.c 4 Feb 2004 14:41:20 -0000 1.2 --- /dev/null 1 Jan 1970 00:00:00 -0000 *************** *** 1,65 **** - /* Copyright 2003, 2004 Free Software Foundation, Inc. -=20=20 - 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 2 of the License, or - (at your option) any later version. -=20=20 - 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. -=20=20 - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, = USA.=20=20 -=20=20 - Please email any bugs, comments, and/or additions to this file to: - bug-gdb@gnu.org -=20=20 - This file is part of the gdb testsuite. */ -=20 - void sub1 (void); - void sub2 (void); -=20 - main() - { - sub1(); - sub2(); - } -=20 - asm(".text\n" - " .align 5\n" - "sub1:\n" - "_sub1:\n" - " mov.l r14,@-r15\n" - " add #-128,r15\n" - " add #-128,r15\n" - " mov r15,r14\n" - " mov.w .STACK1,r7\n" - " add r7,r14\n" - " mov r14,r15\n" - " mov.l @r15+,r14\n" - " rts\n" - " nop\n" - " .align 1\n" - ".STACK1:\n" - " .short 256\n"); -=20 - asm(".text\n" - " .align 5\n" - "sub2:\n" - "_sub2:\n" - " mov.l r14,@-r15\n" - " mov.w .STACK2,r3\n" - " sub r3,r15\n" - " mov r15,r14\n" - " mov.w .STACK2,r7\n" - " add r7,r14\n" - " mov r14,r15\n" - " mov.l @r15+,r14\n" - " rts\n" - " nop\n" - " .align 1\n" - ".STACK2:\n" - " .short 260\n"); --- 0 ---- Index: gdb.arch/gdb1431.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/testsuite/gdb.arch/gdb1431.exp,v retrieving revision 1.1 diff -c -p -r1.1 gdb1431.exp *** gdb.arch/gdb1431.exp 3 Nov 2003 17:42:52 -0000 1.1 --- gdb.arch/gdb1431.exp 26 Feb 2004 22:18:25 -0000 *************** *** 1,4 **** ! # Copyright 2003 Free Software Foundation, Inc. =20=20 # 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 --- 1,4 ---- ! # Copyright 2003, 2004 Free Software Foundation, Inc. =20=20 # 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 *************** *** 20,25 **** --- 20,28 ---- # This file is part of the gdb testsuite. =20=20 # Tests for PR:1431. Catch gdb not continuing to second function properl= y. + # Note that originally this bug was reported as a problem with the "until" + # command, which actually is behaving as currently defined. What apparen= tly + # was expected was the behavior of the newer "advance" command. =20=20 if $tracelevel { strace $tracelevel *************** if ![istarget "sh-*-*"] then { *** 36,44 **** } =20=20 set testfile "gdb1431" ! set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executabl= e {debug}] !=3D "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in th= is file will automatically fail." } =20=20 --- 39,47 ---- } =20=20 set testfile "gdb1431" ! set srcfile ${testfile}.s set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executabl= e ""] !=3D "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in th= is file will automatically fail." } =20=20 *************** if ![runto_main] then { *** 55,66 **** gdb_suppress_tests } =20=20 ! gdb_test "u sub1" "sub1*" "get to sub1" ! gdb_test "bt" "#0\[ \t\]*$hex \\(\\) at sh-bt.*\r\n#1\[ \t\]*$hex in main= .*" \ ! "backtrace in gdb1291" !=20 ! kfail "gdb/1431" "u sub2" ! # This is what we would expect to be able to do: ! #gdb_test "u sub2" "sub2*" "get to sub2" ! #gdb_test "bt" "#0\[ \t\]*$hex \\(\\) at sh-bt.*\r\n#1\[ \t\]*$hex in mai= n.*" \ ! # "backtrace in gdb1291" --- 58,63 ---- gdb_suppress_tests } =20=20 ! gdb_test "advance sub1" "hello world\r\n$hex in sub1 \\(\\)" "get to sub1" ! gdb_test "advance sub2" "$hex in main \\(\\)" "advance returns from sub1 = frame" ! gdb_test "advance sub2" "$hex in sub2 \\(\\)" "get to sub2" Index: gdb.arch/gdb1431.s =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: gdb.arch/gdb1431.s diff -N gdb.arch/gdb1431.s *** /dev/null 1 Jan 1970 00:00:00 -0000 --- gdb.arch/gdb1431.s 26 Feb 2004 22:18:25 -0000 *************** *** 0 **** --- 1,129 ---- + ! Copyright 2004 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 2 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, write to the Free Software + ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U= SA.=20=20 + ! + ! Please email any bugs, comments, and/or additions to this file to: + ! bug-gdb@gnu.org + ! + ! This file is part of the gdb testsuite. + ! + ! It was generated using "sh-elf-gcc -S gdb1431.c", using the following + ! source file: + ! + ! #include + !=09 + ! main() + ! { + ! printf("hello world\n"); + ! sub1(); + ! sub2(); + ! } + ! sub1() + ! { + ! int buf[64]; + !=09 + ! } + !=09 + ! sub2() + ! { + ! int buf[65]; + !=09 + ! } + ! + ! We use a pregenerated assembly file as the test input to avoid possible + ! problems with future versions of gcc generating different code. +=20 + .file "gdb1431.c" + .text + .section .rodata + .align 2 + .LC0: + .string "hello world\n" + .text + .align 1 + .global _main + .type _main, @function + _main: + mov.l r14,@-r15 + sts.l pr,@-r15 + mov r15,r14 + mov.l .L2,r1 + mov r1,r4 + mov.l .L3,r1 + jsr @r1 + nop + mov.l .L4,r1 + jsr @r1 + nop + mov.l .L5,r1 + jsr @r1 + nop + mov r14,r15 + lds.l @r15+,pr + mov.l @r15+,r14 + rts=09 + nop + .L6: + .align 2 + .L2: + .long .LC0 + .L3: + .long _printf + .L4: + .long _sub1 + .L5: + .long _sub2 + .size _main, .-_main + .align 1 + .global _sub1 + .type _sub1, @function + _sub1: + mov.l r14,@-r15 + sts.l pr,@-r15 + add #-128,r15 + add #-128,r15 + mov r15,r14 + mov.w .L8,r7 + add r7,r14 + mov r14,r15 + lds.l @r15+,pr + mov.l @r15+,r14 + rts=09 + nop + .align 1 + .L8: + .short 256 + .size _sub1, .-_sub1 + .align 1 + .global _sub2 + .type _sub2, @function + _sub2: + mov.l r14,@-r15 + sts.l pr,@-r15 + mov.w .L11,r1 + sub r1,r15 + mov r15,r14 + mov.w .L11,r7 + add r7,r14 + mov r14,r15 + lds.l @r15+,pr + mov.l @r15+,r14 + rts=09 + nop + .align 1 + .L11: + .short 260 + .size _sub2, .-_sub2 + .ident "GCC: (GNU) 3.5.0 20040204 (experimental)"