From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14581 invoked by alias); 22 Jul 2003 11:47:17 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 14573 invoked from network); 22 Jul 2003 11:47:15 -0000 Received: from unknown (HELO dublin.act-europe.fr) (212.157.227.154) by sources.redhat.com with SMTP; 22 Jul 2003 11:47:15 -0000 Received: from localhost (localhost [127.0.0.1]) by amavis.act-europe.fr (Postfix) with ESMTP id 5A694229F2E for ; Tue, 22 Jul 2003 13:47:13 +0200 (MET DST) Received: from dublin.act-europe.fr ([127.0.0.1]) by localhost (dublin.act-europe.fr [127.0.0.1:10024]) (amavisd-new) with ESMTP id 24376-02 for ; Tue, 22 Jul 2003 13:47:10 +0200 (MET DST) Received: from cardiff.ACT-Europe.FR (cardiff.act-europe.fr [10.10.0.169]) by dublin.act-europe.fr (Postfix) with ESMTP id 481D1229F20 for ; Tue, 22 Jul 2003 13:47:10 +0200 (MET DST) Received: by cardiff.ACT-Europe.FR (Postfix, from userid 560) id E04E82E4BBB; Tue, 22 Jul 2003 13:47:09 +0200 (CEST) Date: Tue, 22 Jul 2003 11:47:00 -0000 From: Jerome Guitton To: gdb-patches@sources.redhat.com Subject: Re: [RFA] ARM : prologue scan Message-ID: <20030722114709.GB3100@act-europe.fr> References: <20030721142742.GA3621@act-europe.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo" Content-Disposition: inline In-Reply-To: <20030721142742.GA3621@act-europe.fr> User-Agent: Mutt/1.4i X-Virus-Scanned: by amavisd-new X-SW-Source: 2003-07/txt/msg00388.txt.bz2 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 141 I have done some minor corrections on the previous patch, discard it. In attachment, the new version. No regression, no fixed. -- Jerome. --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="arm_bt.dif" Content-length: 2775 2003-07-21 J. Guitton * arm-tdep.c (arm_skip_prologue): Add the handling of "sub ip, sp #n" and "add ip, sp #n", as these instructions can be found in a ATPCS compliant prologue. (arm_scan_prologue): Ditto. Index: arm-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/arm-tdep.c,v retrieving revision 1.143 diff -u -3 -p -r1.143 arm-tdep.c --- arm-tdep.c 13 Jun 2003 14:15:51 -0000 1.143 +++ arm-tdep.c 22 Jul 2003 11:43:10 -0000 @@ -449,6 +449,12 @@ arm_skip_prologue (CORE_ADDR pc) if (inst == 0xe1a0c00d) /* mov ip, sp */ continue; + if ((inst & 0xfffff000) == 0xe28dc000) /* add ip, sp #n */ + continue; + + if ((inst & 0xfffff000) == 0xe24dc000) /* sub ip, sp #n */ + continue; + /* Some prologues begin with "str lr, [sp, #-4]!". */ if (inst == 0xe52de004) /* str lr, [sp, #-4]! */ continue; @@ -708,7 +714,7 @@ thumb_scan_prologue (struct frame_info * static void arm_scan_prologue (struct frame_info *fi) { - int regno, sp_offset, fp_offset; + int regno, sp_offset, fp_offset, ip_offset; LONGEST return_value; CORE_ADDR prologue_start, prologue_end, current_pc; @@ -799,7 +805,7 @@ arm_scan_prologue (struct frame_info *fi in which case it is often (but not always) replaced by "str lr, [sp, #-4]!". - Michael Snyder, 2002-04-23] */ - sp_offset = fp_offset = 0; + sp_offset = fp_offset = ip_offset = 0; for (current_pc = prologue_start; current_pc < prologue_end; @@ -809,6 +815,23 @@ arm_scan_prologue (struct frame_info *fi if (insn == 0xe1a0c00d) /* mov ip, sp */ { + ip_offset = 0; + continue; + } + else if ((insn & 0xfffff000) == 0xe28dc000) /* add ip, sp #n */ + { + unsigned imm = insn & 0xff; /* immediate value */ + unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */ + imm = (imm >> rot) | (imm << (32 - rot)); + ip_offset = imm; + continue; + } + else if ((insn & 0xfffff000) == 0xe24dc000) /* sub ip, sp #n */ + { + unsigned imm = insn & 0xff; /* immediate value */ + unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */ + imm = (imm >> rot) | (imm << (32 - rot)); + ip_offset = -imm; continue; } else if (insn == 0xe52de004) /* str lr, [sp, #-4]! */ @@ -850,7 +873,7 @@ arm_scan_prologue (struct frame_info *fi unsigned imm = insn & 0xff; /* immediate value */ unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */ imm = (imm >> rot) | (imm << (32 - rot)); - fp_offset = -imm; + fp_offset = -imm + ip_offset; get_frame_extra_info (fi)->framereg = ARM_FP_REGNUM; } else if ((insn & 0xfffff000) == 0xe24dd000) /* sub sp, sp #n */ --envbJBWh7q8WU6mo--