This is the mail archive of the gdb-cvs@sourceware.org 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]

[binutils-gdb] Relax pattern to match the output of "info frame" in gdb.base/savedregs.exp


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8aa08a8dd596758904f1e994057c94bd655dda2e

commit 8aa08a8dd596758904f1e994057c94bd655dda2e
Author: Yao Qi <yao.qi@linaro.org>
Date:   Thu Mar 26 08:16:20 2015 +0000

    Relax pattern to match the output of "info frame" in gdb.base/savedregs.exp
    
    Hi,
    I see the following two fails in gdb.base/savedregs.exp on aarch64-linux,
    
    info frame 2^M
    Stack frame at 0x7ffffffa60:^M
     pc = 0x40085c in thrower (/home/yao/SourceCode/gnu/gdb/git/gdb/testsuite/gdb.base/savedregs.c:49); saved pc = 0x400898^M
     called by frame at 0x7ffffffa70, caller of frame at 0x7fffffe800^M
     source language c.^M
     Arglist at 0x7ffffffa60, args: ^M
     Locals at 0x7ffffffa60, Previous frame's sp is 0x7ffffffa60^M
    (gdb) FAIL: gdb.base/savedregs.exp: Get thrower info frame
    
    info frame 2^M
    Stack frame at 0x7fffffe800:^M
     pc = 0x400840 in catcher (/home/yao/SourceCode/gnu/gdb/git/gdb/testsuite/gdb.base/savedregs.c:42); saved pc = 0x7fb7ffc350^M
     called by frame at 0x7fffffe800, caller of frame at 0x7fffffe7e0^M
     source language c.^M
     Arglist at 0x7fffffe7f0, args: sig=11^M
     Locals at 0x7fffffe7f0, Previous frame's sp is 0x7fffffe800
    (gdb) FAIL: gdb.base/savedregs.exp: Get catcher info frame
    
    looks the test expects to match "Saved registers:" from the output of
    "info frame", but no registers are saved on these two frames, because
    thrower and catcher are simple and leaf functions.
    
    (gdb) disassemble thrower
    Dump of assembler code for function thrower:
       0x0000000000400858 <+0>:	mov	x0, #0x0                   	// #0
       0x000000000040085c <+4>:	strb	wzr, [x0]
       0x0000000000400860 <+8>:	ret
    End of assembler dump.
    (gdb) disassemble catcher
    Dump of assembler code for function catcher:
       0x0000000000400838 <+0>:	sub	sp, sp, #0x10
       0x000000000040083c <+4>:	str	w0, [sp,#12]
       0x0000000000400840 <+8>:	adrp	x0, 0x410000
       0x0000000000400844 <+12>:	add	x0, x0, #0xb9c
       0x0000000000400848 <+16>:	mov	w1, #0x1                   	// #1
       0x000000000040084c <+20>:	str	w1, [x0]
       0x0000000000400850 <+24>:	add	sp, sp, #0x10
       0x0000000000400854 <+28>:	ret
    
    There are two ways to fix these fails, one is to modify functions to
    force some registers saved (for example, doing function call in them),
    and the other one is to relax the pattern to optionally match
    "Saved registers:".  I did both, and feel that the latter is simple,
    so here is it.
    
    gdb/testsuite:
    
    2015-03-26  Yao Qi  <yao.qi@linaro.org>
    
    	* gdb.base/savedregs.exp (process_saved_regs): Make
    	"Saved registers:" optional in the pattern.

Diff:
---
 gdb/testsuite/ChangeLog              | 5 +++++
 gdb/testsuite/gdb.base/savedregs.exp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e501b11..735616e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-26  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.base/savedregs.exp (process_saved_regs): Make
+	"Saved registers:" optional in the pattern.
+
 2015-03-25  Markus Metzger  <markus.t.metzger@intel.com>
 
 	* gdb.btrace/next.exp: Merged into step.exp.
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
index da8d90f..33df407 100644
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ b/gdb/testsuite/gdb.base/savedregs.exp
@@ -77,7 +77,7 @@ proc process_saved_regs { current inner outer } {
 		set pat "Stack frame at .* Saved registers:.*"
 	    }
 	    default {
-		set pat "Stack frame at .* in $func .* Saved registers:.*"
+		set pat "Stack frame at .* in $func .*( Saved registers:.*)?"
 	    }
 	}
 	# If the "info frame" barf, capture the output anyway so that


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]