From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-14836-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 8390 invoked by alias); 26 Apr 2002 01:30:42 -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 8372 invoked from network); 26 Apr 2002 01:30:39 -0000
Received: from unknown (HELO cygnus.com) (205.180.83.203)
  by sources.redhat.com with SMTP; 26 Apr 2002 01:30:39 -0000
Received: from reddwarf.sfbay.redhat.com (reddwarf.sfbay.redhat.com [172.16.24.50])
	by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id SAA28982;
	Thu, 25 Apr 2002 18:30:33 -0700 (PDT)
Received: (from msnyder@localhost)
	by reddwarf.sfbay.redhat.com (8.11.2/8.11.2) id g3Q1IO319037;
	Thu, 25 Apr 2002 18:18:24 -0700
Date: Thu, 25 Apr 2002 18:30:00 -0000
From: Michael Snyder <msnyder@cygnus.com>
Message-Id: <200204260118.g3Q1IO319037@reddwarf.sfbay.redhat.com>
To: gdb-patches@sources.redhat.com
Subject: [RFA] arm_scan_prologue: accept strh and strb as well as str
Cc: rearnsha@arm.com
X-SW-Source: 2002-04/txt/msg01057.txt.bz2


Hi Richard, 

These are for char and short args, respectively.
The more I play with it, the more I want to merge
arm_scan and arm_skip into one function.  ;-)

Michael

2002-04-25  Michael Snyder  <msnyder@redhat.com>

	* arm-tdep.c (arm_scan_prologue): Accept strb r(0123),[r11,#-nn]
	and strh r(0123),[r11,#-nn] as well as str r(0123),[r11,#-nn].
	(arm_skip_prologue): Ditto.

Index: arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.55
diff -c -3 -p -r1.55 arm-tdep.c
*** arm-tdep.c	24 Apr 2002 21:22:06 -0000	1.55
--- arm-tdep.c	26 Apr 2002 01:28:12 -0000
*************** arm_skip_prologue (CORE_ADDR pc)
*** 468,474 ****
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   if ((inst & 0xfffff800) == 0xe92dd800)	/* stmfd sp!,{fp,ip,lr,pc} */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
--- 468,474 ----
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   if ((inst & 0xfffff800) == 0xe92dd800)	/* stmfd sp!,{...,fp,ip,lr,pc} */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
*************** arm_skip_prologue (CORE_ADDR pc)
*** 507,513 ****
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   while ((inst & 0xffffcfc0) == 0xe50b0000)     /* str r(0123), [r11, #-nn] */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
--- 507,515 ----
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   while ((inst & 0xffffcfff) == 0xe54b0000 ||	/* strb r(0123),[r11,#-nn] */
! 	 (inst & 0xffffc0f0) == 0xe14b00b0 ||	/* strh r(0123),[r11,#-nn] */
! 	 (inst & 0xffffcfc0) == 0xe50b0000)	/* str  r(0123),[r11,#-nn] */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
*************** arm_scan_prologue (struct frame_info *fi
*** 905,911 ****
  		fi->saved_regs[regno] = sp_offset;
  	      }
  	}
!       else if ((insn & 0xffffcfc0) == 0xe50b0000)       /* str rx, [r11, -n] */
  	{
  	  /* No need to add this to saved_regs -- it's just an arg reg.  */
  	  continue;
--- 907,915 ----
  		fi->saved_regs[regno] = sp_offset;
  	      }
  	}
!       else if ((insn & 0xffffcfff) == 0xe54b0000 ||     /* strb rx,[r11,#-n] */
! 	       (insn & 0xffffc0f0) == 0xe14b00b0 ||     /* strh rx,[r11,#-n] */
! 	       (insn & 0xffffcfc0) == 0xe50b0000)       /* str  rx,[r11,#-n] */
  	{
  	  /* No need to add this to saved_regs -- it's just an arg reg.  */
  	  continue;