From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-32155-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 6548 invoked by alias); 7 Apr 2004 16:46:39 -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 6435 invoked from network); 7 Apr 2004 16:46:32 -0000
Received: from unknown (HELO mx1.redhat.com) (66.187.233.31)
  by sources.redhat.com with SMTP; 7 Apr 2004 16:46:32 -0000
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i37GkWWB028469
	for <gdb-patches@sources.redhat.com>; Wed, 7 Apr 2004 12:46:32 -0400
Received: from zenia.home.redhat.com (porkchop.devel.redhat.com [172.16.58.2])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i37GkOj29065;
	Wed, 7 Apr 2004 12:46:29 -0400
To: Mark Kettenis <kettenis@chello.nl>
Cc: ford@vss.fsi.com, eliz@gnu.org, gdb-patches@sources.redhat.com
Subject: Re: [PATCH] i386_stab_reg_to_regnum (4 <-> 5, ebp <-> esp)
References: <8011-Fri02Apr2004094123+0300-eliz@gnu.org> <Pine dot GSO dot 4
	dot 58 dot 0404021000390 dot 21204 at thing1-200>
	<2719-Fri02Apr2004213907+0300-eliz at gnu dot org> <Pine dot GSO dot 4
	dot 58 dot 0404021648050 dot 21204 at thing1-200>
	<vt2ptam2gg1.fsf@zenia.home>
	<200404062322.i36NMqiE000976@elgar.kettenis.dyndns.org>
From: Jim Blandy <jimb@redhat.com>
Date: Wed, 07 Apr 2004 16:46:00 -0000
In-Reply-To: <200404062322.i36NMqiE000976@elgar.kettenis.dyndns.org>
Message-ID: <vt2u0zvbuvj.fsf@zenia.home>
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2004-04/txt/msg00170.txt.bz2


Mark Kettenis <kettenis@chello.nl> writes:
> Jim, please apply this patch, with the proper ChangeLog of course.

Committed, thanks.

2004-04-07  Jim Blandy  <jimb@redhat.com>

	* i386-tdep.c (i386_stab_reg_to_regnum): Correct numbering for
	%esp and %ebp

Index: gdb/i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.182
diff -c -r1.182 i386-tdep.c
*** gdb/i386-tdep.c	1 Apr 2004 18:14:03 -0000	1.182
--- gdb/i386-tdep.c	7 Apr 2004 16:42:08 -0000
***************
*** 211,218 ****
    /* This implements what GCC calls the "default" register map.  */
    if (reg >= 0 && reg <= 7)
      {
!       /* General-purpose registers.  */
!       return reg;
      }
    else if (reg >= 12 && reg <= 19)
      {
--- 211,223 ----
    /* This implements what GCC calls the "default" register map.  */
    if (reg >= 0 && reg <= 7)
      {
!       /* General-purpose registers.  The debug info calls %ebp
!          register 4, and %esp register 5.  */
!       if (reg == 4)
!         return 5;
!       else if (reg == 5)
!         return 4;
!       else return reg;
      }
    else if (reg >= 12 && reg <= 19)
      {