From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-36848-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 30991 invoked by alias); 11 Nov 2004 01:11:44 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 30888 invoked from network); 11 Nov 2004 01:11:28 -0000
Received: from unknown (HELO sj-iport-2.cisco.com) (171.71.176.71)
  by sourceware.org with SMTP; 11 Nov 2004 01:11:28 -0000
Received: from sj-core-1.cisco.com (171.71.177.237)
  by sj-iport-2.cisco.com with ESMTP; 10 Nov 2004 17:23:21 -0800
Received: from msnyder8600 (dhcp-128-107-165-92.cisco.com [128.107.165.92])
	by sj-core-1.cisco.com (8.12.10/8.12.6) with SMTP id iAB1BHom000562;
	Wed, 10 Nov 2004 17:11:18 -0800 (PST)
Message-ID: <00c901c4c78b$5e1591f0$5ca56b80@msnyder8600>
From: "Michael Snyder" <michsnyd@cisco.com>
To: <gdb-patches@sources.redhat.com>
Cc: <kevinb@redhat.com>
Subject: [RFA] Tweak in skip_prologue for rs6000
Date: Thu, 11 Nov 2004 01:11:00 -0000
MIME-Version: 1.0
Content-Type: text/plain;
	format=flowed;
	charset="iso-8859-1";
	reply-type=original
Content-Transfer-Encoding: 7bit
X-SW-Source: 2004-11/txt/msg00222.txt.bz2

Kevin, 

If I'm right, this will prevent saving lr_offset twice.  It looks like the 
existing code intends to invalidate lr_reg, but setting it to zero is not
an invalid value.

Probably the same is true for cr_reg and cr_offset...

Michael

2004-11-10  msnyder  <msnyder@redhat.com>

 * rs6000-tdep.c (skip_prologue): After saving lr_offset, 
 must invalidate lr_reg (so we don't try to save it again).  

Index: rs6000-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v
retrieving revision 1.230
diff -p -r1.230 rs6000-tdep.c
*** rs6000-tdep.c 13 Oct 2004 16:38:22 -0000 1.230
--- rs6000-tdep.c 11 Nov 2004 01:04:40 -0000
*************** skip_prologue (CORE_ADDR pc, CORE_ADDR l
*** 981,987 ****
     continue;
  
   }
!       else if (lr_reg != -1 &&
          /* std Rx, NUM(r1) || stdu Rx, NUM(r1) */
          (((op & 0xffff0000) == (lr_reg | 0xf8010000)) ||
    /* stw Rx, NUM(r1) */
--- 981,987 ----
     continue;
  
   }
!       else if (lr_reg >= 0 &&
          /* std Rx, NUM(r1) || stdu Rx, NUM(r1) */
          (((op & 0xffff0000) == (lr_reg | 0xf8010000)) ||
    /* stw Rx, NUM(r1) */
*************** skip_prologue (CORE_ADDR pc, CORE_ADDR l
*** 991,997 ****
   { /* where Rx == lr */
     fdata->lr_offset = offset;
     fdata->nosavedpc = 0;
!    lr_reg = 0;
     if ((op & 0xfc000003) == 0xf8000000 || /* std */
         (op & 0xfc000000) == 0x90000000)  /* stw */
       {
--- 991,999 ----
   { /* where Rx == lr */
     fdata->lr_offset = offset;
     fdata->nosavedpc = 0;
!    /* Invalidate lr_reg, but don't set it to -1.
!       That would mean that it had never been set.  */
!    lr_reg = -2;
     if ((op & 0xfc000003) == 0xf8000000 || /* std */
         (op & 0xfc000000) == 0x90000000)  /* stw */
       {