From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-14595-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 26197 invoked by alias); 23 Apr 2002 00:05:10 -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 26186 invoked from network); 23 Apr 2002 00:05:08 -0000
Received: from unknown (HELO cygnus.com) (205.180.83.203)
  by sources.redhat.com with SMTP; 23 Apr 2002 00:05:08 -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 RAA11352;
	Mon, 22 Apr 2002 17:05:05 -0700 (PDT)
Received: (from msnyder@localhost)
	by reddwarf.sfbay.redhat.com (8.11.2/8.11.2) id g3MNrAD11515;
	Mon, 22 Apr 2002 16:53:10 -0700
Date: Mon, 22 Apr 2002 17:05:00 -0000
From: Michael Snyder <msnyder@cygnus.com>
Message-Id: <200204222353.g3MNrAD11515@reddwarf.sfbay.redhat.com>
To: gdb-patches@sources.redhat.com
Subject: [RFA] More tweaks to arm_skip_prologue
Cc: cagney@redhat.com, rearnsha@arm.com
X-SW-Source: 2002-04/txt/msg00816.txt.bz2


I know that some of these tweaks to arm_skip_prologue will also
suggest similar tweaks to arm_scan_prologue.  I'll do those next.
Wouldn't it be nice if the two shared code?    ;-)

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

	* arm-tdep.c (arm_skip_prologue): Better handling for frameless 
	functions.  Treat "mov ip, sp" as optional.  Recognize 
	"str lr, [sp, #-nn]".

Index: arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.51
diff -p -r1.51 arm-tdep.c
*** arm-tdep.c	22 Apr 2002 23:22:04 -0000	1.51
--- arm-tdep.c	23 Apr 2002 00:00:30 -0000
*************** arm_skip_prologue (CORE_ADDR pc)
*** 446,467 ****
       by disassembling the instructions. */
    skip_pc = pc;
    inst = read_memory_integer (skip_pc, 4);
!   if (inst != 0xe1a0c00d)	/* mov ip, sp */
!     return pc;
  
!   skip_pc += 4;
!   inst = read_memory_integer (skip_pc, 4);
!   if ((inst & 0xfffffff0) == 0xe92d0000)	/* stmfd sp!,{a1,a2,a3,a4}  */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   if ((inst & 0xfffff800) != 0xe92dd800)	/* stmfd sp!,{...,fp,ip,lr,pc} */
!     return pc;
  
!   skip_pc += 4;
!   inst = read_memory_integer (skip_pc, 4);
  
    /* Any insns after this point may float into the code, if it makes
       for better instruction scheduling, so we skip them only if we
--- 446,475 ----
       by disassembling the instructions. */
    skip_pc = pc;
    inst = read_memory_integer (skip_pc, 4);
!   if (inst == 0xe1a0c00d)       /* mov ip, sp */
!     {
!       skip_pc += 4;
!       inst = read_memory_integer (skip_pc, 4);
!     }
  
!   /* Some prologues begin with "str lr, [sp, #-nn]".  */
!   if ((inst & 0xffffff00) == 0xe52de000)        /* str lr, [sp, #-nn] */
      {
        skip_pc += 4;
        inst = read_memory_integer (skip_pc, 4);
      }
  
!   if ((inst & 0xfffffff0) == 0xe92d0000)	/* stmfd sp!,{a1,a2,a3,a4}  */
!     {
!       skip_pc += 4;
!       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);
!     }
  
    /* Any insns after this point may float into the code, if it makes
       for better instruction scheduling, so we skip them only if we