From patchwork Tue Sep 29 16:38:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bowman X-Patchwork-Id: 8880 Received: (qmail 74154 invoked by alias); 29 Sep 2015 16:40:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 74040 invoked by uid 89); 29 Sep 2015 16:40:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=2.3 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: smtp-out4.electric.net Received: from smtp-out4.electric.net (HELO smtp-out4.electric.net) (192.162.216.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 29 Sep 2015 16:40:12 +0000 Received: from 1Zgxwn-0000lZ-Ty by out4d.electric.net with emc1-ok (Exim 4.85) (envelope-from ) id 1Zgxwn-0000m3-Uk for gdb-patches@sourceware.org; Tue, 29 Sep 2015 09:40:09 -0700 Received: by emcmailer; Tue, 29 Sep 2015 09:40:09 -0700 Received: from [188.39.184.227] (helo=GLAEXCH3.ftdi.local) by out4d.electric.net with esmtps (TLSv1:AES128-SHA:128) (Exim 4.85) (envelope-from ) id 1Zgxwn-0000lZ-Ty for gdb-patches@sourceware.org; Tue, 29 Sep 2015 09:40:09 -0700 Received: from GLAEXCH1.ftdi.local ([172.16.0.121]) by glaexch3 ([172.16.0.161]) with mapi id 14.01.0438.000; Tue, 29 Sep 2015 17:38:57 +0100 From: James Bowman To: "gdb-patches@sourceware.org" Subject: [PATCH, FT32] Correctly interpret function prologs Date: Tue, 29 Sep 2015 16:38:57 +0000 Message-ID: MIME-Version: 1.0 X-Outbound-IP: 188.39.184.227 X-Env-From: james.bowman@ftdichip.com X-PolicySMART: 3094660 The stack unwinder did not understand the function prologs generated by gcc with -Os. Add code to recognize and interpret the prolog calls. OK to apply? 2015-09-29 James Bowman * ft32-tdep.c (ft32_analyze_prologue): Add function prolog subroutine handling. diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c index 00cf847..0b51af3 100644 --- a/gdb/ft32-tdep.c +++ b/gdb/ft32-tdep.c @@ -164,33 +164,66 @@ ft32_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr, CORE_ADDR next_addr; ULONGEST inst, inst2; LONGEST offset; - int regnum; + int regnum, pushreg; + struct bound_minimal_symbol msymbol; + unsigned prologs[32]; cache->saved_regs[FT32_PC_REGNUM] = 0; cache->framesize = 0; + for (regnum = 0; regnum < 32; regnum++) + { + char prolog_symbol[32]; + + snprintf (prolog_symbol, sizeof (prolog_symbol), "__prolog_$r%02d", + regnum); + msymbol = lookup_minimal_symbol (prolog_symbol, NULL, NULL); + if (msymbol.minsym) + prologs[regnum] = BMSYMBOL_VALUE_ADDRESS (msymbol); + else + prologs[regnum] = 0; + } + if (start_addr >= end_addr) - return end_addr; + return end_addr; cache->established = 0; - for (next_addr = start_addr; next_addr < end_addr; ) + for (next_addr = start_addr; next_addr < end_addr;) { inst = read_memory_unsigned_integer (next_addr, 4, byte_order); if (FT32_IS_PUSH (inst)) { - regnum = FT32_R0_REGNUM + FT32_PUSH_REG (inst); + pushreg = FT32_PUSH_REG (inst); cache->framesize += 4; - cache->saved_regs[regnum] = cache->framesize; + cache->saved_regs[FT32_R0_REGNUM + pushreg] = cache->framesize; next_addr += 4; } + else if (FT32_IS_CALL (inst)) + { + for (regnum = 0; regnum < 32; regnum++) + { + if ((4 * (inst & 0x3ffff)) == prologs[regnum]) + { + for (pushreg = 13; pushreg <= regnum; pushreg++) + { + cache->framesize += 4; + cache->saved_regs[FT32_R0_REGNUM + pushreg] = + cache->framesize; + } + next_addr += 4; + } + } + break; + } else break; } for (regnum = FT32_R0_REGNUM; regnum < FT32_PC_REGNUM; regnum++) { if (cache->saved_regs[regnum] != REG_UNAVAIL) - cache->saved_regs[regnum] = cache->framesize - cache->saved_regs[regnum]; + cache->saved_regs[regnum] = + cache->framesize - cache->saved_regs[regnum]; } cache->saved_regs[FT32_PC_REGNUM] = cache->framesize;