From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-65404-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 5819 invoked by alias); 14 Jul 2009 20:22:27 -0000
Received: (qmail 5811 invoked by uid 22791); 14 Jul 2009 20:22:26 -0000
X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 	tests=AWL,BAYES_00
X-Spam-Check-By: sourceware.org
Received: from smtp-outbound-1.vmware.com (HELO smtp-outbound-1.vmware.com) (65.115.85.69)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 14 Jul 2009 20:22:18 +0000
Received: from mailhost2.vmware.com (mailhost2.vmware.com [10.16.67.167]) 	by smtp-outbound-1.vmware.com (Postfix) with ESMTP id D29C832002; 	Tue, 14 Jul 2009 13:22:16 -0700 (PDT)
Received: from [10.20.94.141] (msnyder-server.eng.vmware.com [10.20.94.141]) 	by mailhost2.vmware.com (Postfix) with ESMTP id B98158EBCA; 	Tue, 14 Jul 2009 13:22:16 -0700 (PDT)
Message-ID: <4A5CE7DB.5090501@vmware.com>
Date: Tue, 14 Jul 2009 22:55:00 -0000
From: Michael Snyder <msnyder@vmware.com>
User-Agent: Thunderbird 1.5.0.12 (X11/20080411)
MIME-Version: 1.0
To: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
CC: Hui Zhu <teawater@gmail.com>
Subject: [patch] fix for step-reverse.exp
Content-Type: multipart/mixed;  boundary="------------050702060200040609080109"
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2009-07/txt/msg00383.txt.bz2

This is a multi-part message in MIME format.
--------------050702060200040609080109
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-length: 192

Hui's amd64 patch was failing this test, because the test
neglects to allow for the possibility that the call instruction
is not the first instruction on the line.

Hui, try it now.

Michael


--------------050702060200040609080109
Content-Type: text/plain;
 name="step.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="step.txt"
Content-length: 1499

2009-07-14  Michael Snyder  <msnyder@vmware.com>

	* gdb.reverse/step-reverse.exp (stepi into function call):
	Call instruction may not be first instruction in the line.
	(reverse stepi from a function call): Used wrong line number.

Index: gdb.reverse/step-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/step-reverse.exp,v
retrieving revision 1.1
diff -u -p -r1.1 step-reverse.exp
--- gdb.reverse/step-reverse.exp	27 Jun 2009 18:49:20 -0000	1.1
+++ gdb.reverse/step-reverse.exp	14 Jul 2009 20:16:42 -0000
@@ -104,6 +104,10 @@ gdb_test_multiple "stepi" "$test_message
 	send_gdb "stepi\n"
 	exp_continue
     }
+    -re "STEPI TEST.*$gdb_prompt $" {
+	send_gdb "stepi\n"
+	exp_continue
+    }
 }
 
 # stepi thru return of a function call
@@ -168,7 +172,7 @@ gdb_test_multiple "stepi" "$test_message
 
 # stepi backward out of a function call
 
-set stepi_location  [gdb_get_line_number "FINISH TEST" "$srcfile"]
+set stepi_location  [gdb_get_line_number "STEPI TEST" "$srcfile"]
 set test_message "reverse stepi from a function call"
 gdb_test_multiple "stepi" "$test_message" {
     -re "ARRIVED IN CALLEE.*$gdb_prompt $" {
@@ -178,7 +182,7 @@ gdb_test_multiple "stepi" "$test_message
 	send_gdb "stepi\n" 
 	exp_continue
     }
-    -re "${hex}\[ \t\]*$stepi_location.*STEPI TEST.*$gdb_prompt $" {
+    -re "${hex} in main .*:$stepi_location.*STEPI TEST.*$gdb_prompt $" {
 	send_gdb "stepi\n"
 	exp_continue
     }

--------------050702060200040609080109--