gdb/:

* printcmd.c (do_one_display): If display/i, start with an initial
line feed to avoid bad layout if there is a branch delay slot.

gdb/testsuite/:
* gdb.base/display.exp: Allow a newline after display/i.
* gdb.base/pc-fp.exp: Likewise.
* gdb.base/sigbpt.exp: Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dbe57a91f4ede0328ca38fad677c191d76dfa54b..088bececedef269de396c658b8d46288a15e41b6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-21  Chris Dearman  <chris@mips.com>
+
+       * printcmd.c (do_one_display): If display/i, start with an initial
+       line feed to avoid bad layout if there is a branch delay slot.
+
 2007-06-21  Nigel Stephens  <nigel@mips.com>
             Maciej W. Rozycki  <macro@mips.com>
 

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 45d7e8afd0359fed9ebe45a5a27d76ad08b17405..98d284898e2200942031021037fc98fb3803d71e 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1520,7 +1520,7 @@ do_one_display (struct display *d)
       print_expression (d->exp, gdb_stdout);
       annotate_display_expression_end ();
 
-      if (d->format.count != 1)
+      if (d->format.count != 1 || d->format.format == 'i')
        printf_filtered ("\n");
       else
        printf_filtered ("  ");

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d1b22a43bab088fb631a54452ca403bdc59df4a9..fc4c764ebf39494ce0a423b89f96df1506cc6131 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-21  Chris Dearman  <chris@mips.com>
+            Maciej W. Rozycki  <macro@mips.com>
+
+       * gdb.base/display.exp: Allow a newline after display/i.
+       * gdb.base/pc-fp.exp: Likewise.
+       * gdb.base/sigbpt.exp: Likewise.
+
 2007-06-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdb.xml/tdesc-regs.exp: Add MIPS support.  Allow multiple

diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index af579cb0b17cbd9771d8539def09548625fe9803..41180eecd2be62d8a6f669f2a504ccab7195efce 100644 (file)
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -95,7 +95,7 @@ gdb_test "break 19"     ".*Breakpoint 4.*" "break 19"
 gdb_test "info disp" ".*There are no auto-display expressions now..*" "inf disp"
 gdb_test "disp i" ".*1: i = 0.*" "display i"
 gdb_test "disp/x j" ".*2: /x j = 0x0.*" "display j"
-gdb_test "disp/i &k" ".*3: x/i &k  $hex:.*" "display &k"
+gdb_test "disp/i &k" ".*3: x/i &k(\r\n|  )$hex:.*" "display &k"
 gdb_test "disp/f f" ".*4: /f f = 3.1415*" "display/f f"
 gdb_test "disp/s &sum" ".*5: x/s &sum  $hex.*sum.:.*" "display/s &sum"
 

diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
index ac5b1c050a138345fdf9ce01f5017070c1bf1808..0ebce9dc5de66860bb2ae2a36a81ca0a17c06bc8 100644 (file)
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ b/gdb/testsuite/gdb.base/pc-fp.exp
@@ -82,7 +82,7 @@ set valueof_fp [get_valueofx "/x" "\$fp" "0"]
 # display since that encodes and then decodes the expression parameter
 # (and hence uses the mechanisms we're trying to test).
 
-gdb_test "display/i \$pc" "1: x/i +\\\$pc +${valueof_pc}.*"
+gdb_test "display/i \$pc" "1: x/i +\\\$pc( +|\r\n)${valueof_pc}.*"
 gdb_test "display/w \$fp" "2: x/xw +\\\$fp +${valueof_fp}.*"
 
 # FIXME: cagney/2002-09-04: Should also check that ``info registers

diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index a7f54ad2f9e05d7f10380644db46e2322c78ecb8..64c7f0ff4c174328ee258b42e7a57f7e85a10e31 100644 (file)
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -91,12 +91,12 @@ gdb_test {display/i $pc}
 gdb_test "advance *bowler" "bowler.*" "advance to the bowler"
 set test "stepping to SIGSEGV"
 gdb_test_multiple "stepi" "$test" {
-    -re "Program received signal SIGSEGV.*pc *(0x\[0-9a-f\]*).*$gdb_prompt $" {
-       set segv_addr $expect_out(1,string)
+    -re "Program received signal SIGSEGV.*pc(\r\n| *) *(0x\[0-9a-f\]*).*$gdb_prompt $" {
+       set segv_addr $expect_out(2,string)
        pass "$test"
     }
-    -re " .*pc *(0x\[0-9a-f\]*).*bowler.*$gdb_prompt $" {
-       set bowler_addrs [concat $expect_out(1,string) $bowler_addrs]
+    -re " .*pc(\r\n| *)(0x\[0-9a-f\]*).*bowler.*$gdb_prompt $" {
+       set bowler_addrs [concat $expect_out(2,string) $bowler_addrs]
        send_gdb "stepi\n"
        exp_continue
     }
@@ -183,19 +183,19 @@ proc stepi_out { name args } {
        -re "Program received signal SIGSEGV.*$gdb_prompt $" {
            kfail gdb/1702 "$test (executed fault insn)"
        }
-       -re "Breakpoint.*pc *[at_segv] .*bowler.*$gdb_prompt $" {
+       -re "Breakpoint.*pc(\r\n| *)[at_segv] .*bowler.*$gdb_prompt $" {
            pass "$test (at breakpoint)"
        }
-       -re "Breakpoint.*pc *[after_segv] .*bowler.*$gdb_prompt $" {
+       -re "Breakpoint.*pc(\r\n| *)[after_segv] .*bowler.*$gdb_prompt $" {
            kfail gdb/1702 "$test (executed breakpoint)"
        }
-       -re "pc *[at_segv] .*bowler.*$gdb_prompt $" {
+       -re "pc(\r\n| *)[at_segv] .*bowler.*$gdb_prompt $" {
            pass "$test"
        }
-       -re "pc *[after_segv] .*bowler.*$gdb_prompt $" {
+       -re "pc(\r\n| *)[after_segv] .*bowler.*$gdb_prompt $" {
            kfail gdb/1702 "$test (skipped fault insn)"
        }
-       -re "pc *0x\[a-z0-9\]* .*bowler.*$gdb_prompt $" {
+       -re "pc(\r\n| *)0x\[a-z0-9\]* .*bowler.*$gdb_prompt $" {
            kfail gdb/1702 "$test (corrupt pc)"
        }
     }
@@ -239,12 +239,12 @@ proc cont_out { name args } {
     # inserted at the faulting instruction.  Note that the breakpoint
     # instruction wasn't executed, rather the inferior was SIGTRAPed
     # with the PC at the breakpoint.
-    gdb_test "continue" "Breakpoint.*pc *[at_segv] .*" \
+    gdb_test "continue" "Breakpoint.*pc(\r\n| *)[at_segv] .*" \
        "${name}; continue to breakpoint at fault"
 
     # Now single step the faulted instrction at that breakpoint.
     gdb_test "stepi" \
-       "Program received signal SIGSEGV.*pc *[at_segv] .*" \
+       "Program received signal SIGSEGV.*pc(\r\n| *)[at_segv] .*" \
        "${name}; stepi fault"    
 
     # Clear any breakpoints