This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[RFA] Fix incorrect use of "until" command in gdb.arch/gdb1431


The gdb.arch/gdb1431 command is using the "until" command incorrectly.
As currently defined, that command ONLY stops at a point within the
current frame or upon return from the current frame.  You have to use
the "advance" command to stop at a frame called by the current frame
or a frame called by a caller of the current frame.

-Fred

2004-02-19  Fred Fish  <fnf@redhat.com>

	* gdb.arch/gdb1431.c: Remove.
	* gdb.arch/gdb1431.exp: Reuse test file from PR 1291 and use
	"advance" correctly instead of "until" incorrectly.

Index: gdb.arch/gdb1431.c
===================================================================
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.
-  
-    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, USA.  
-  
-    Please email any bugs, comments, and/or additions to this file to:
-    bug-gdb@gnu.org
-  
-    This file is part of the gdb testsuite.  */
- 
- void sub1 (void);
- void sub2 (void);
- 
- main()
- {
-         sub1();
-         sub2();
- }
- 
- 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");
- 
- 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
===================================================================
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	20 Feb 2004 02:47:50 -0000
***************
*** 1,4 ****
! # Copyright 2003 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
--- 1,4 ----
! # 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
***************
*** 20,25 ****
--- 20,28 ----
  # This file is part of the gdb testsuite.
  
  # Tests for PR:1431.  Catch gdb not continuing to second function properly.
+ # Note that originally this bug was reported as a problem with the "until"
+ # command, which actually is behaving as currently defined.  What apparently
+ # was expected was the behavior of the newer "advance" command.
  
  if $tracelevel {
      strace $tracelevel
*************** if ![istarget "sh-*-*"] then {
*** 35,44 ****
      return
  }
  
! set testfile "gdb1431"
! set srcfile ${testfile}.c
  set binfile ${objdir}/${subdir}/${testfile}
! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
--- 38,48 ----
      return
  }
  
! # Use the same file as PR 1291
! set testfile "gdb1291"
! set srcfile ${testfile}.s
  set binfile ${objdir}/${subdir}/${testfile}
! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
*************** if ![runto_main] then {
*** 55,66 ****
      gdb_suppress_tests
  }
  
! 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"
! 
! 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 main.*" \
! #	"backtrace in gdb1291"
--- 59,64 ----
      gdb_suppress_tests
  }
  
! 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 Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]