From patchwork Fri Apr 11 09:34:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 498 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 4E4C336007C for ; Fri, 11 Apr 2014 02:34:39 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id 9BC7E4992115; Fri, 11 Apr 2014 02:34:38 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id 6D867499210F for ; Fri, 11 Apr 2014 02:34:38 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; q=dns; s=default; b=uWI tu542wi+7p6fYxHvy0NMbQso8Su/0OR68q2+wQWb7WNbc0gRhvjWt1oRra14qXu/ w734/qQKJimsef2ztT83w9gwDhv3q1BUlDFkTc0R2XpI2bUbgb8u9tKG8Hgv1hgL vwBShtcTkVfgHm0Jl6Am/AaiBc1PNvkSJe5ixP40= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; s=default; bh=cDj9I0JuV gMK0lQ6Dw9p75uebyA=; b=p2IOS7D9SXsjJUbKiIxRx7qajeje/lleOaS9ZFjlB pgzd/rvB9B+7vcO+Wow0QYINBGx0TjxhaIY7e+Ajrfxgzp4nJssn6ObZON/nOcyR KTu9g1Q9rOSnpN+X9wAEE7Z3vQjiX0hFF/o8d+8RhXaEv8jFgivZKMcUp3C35WY4 Jc= Received: (qmail 17012 invoked by alias); 11 Apr 2014 09:34:36 -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 17000 invoked by uid 89); 11 Apr 2014 09:34:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-wg0-f47.google.com Received: from mail-wg0-f47.google.com (HELO mail-wg0-f47.google.com) (74.125.82.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 11 Apr 2014 09:34:34 +0000 Received: by mail-wg0-f47.google.com with SMTP id x12so5091004wgg.6 for ; Fri, 11 Apr 2014 02:34:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; bh=2yMBmgZO/LutgK9Zf6g66fuQVprlEN+PgnLinZF67c0=; b=lfsB+FEvb9xApncSxrivtb2/cCg83LDb6509+sFNsy0R/3JV5NrOMqYG9/ejv03hWj FoSiNLsxiRlg0sdWVI7+nvK/L8EUTMbDJuhJfDAeuaj/nszQFD2gnOYcbo9JEULT38GS /abjnci3NJaxciuzXT7HDQqlXxAknnbziQST3MqKiO350RjX+AborxvN8lID1QoO8NOT rIThtSiEcLBz8X1pELQnQrenm5rZ8L/Qr+Bs8BbXZAwhndK5Xe3hrIcn/mdRGtrIKXjA 28QMMU/yxFV35PSQuSJX+h9ewFu10EencNf/j8En4kQoRrq/Q2SEfXkhVdGpBSEJqFGW F6lw== X-Gm-Message-State: ALoCoQmitvE8ynvRiKps1z0JXVmIX9spPLKnAQiG/mU7nXhnSLuEtfwxE/lHFldH2j9QMEbbEjvH X-Received: by 10.180.91.114 with SMTP id cd18mr2567065wib.28.1397208870887; Fri, 11 Apr 2014 02:34:30 -0700 (PDT) Received: from [192.168.0.134] (cust64-dsl91-135-5.idnet.net. [91.135.5.64]) by mx.google.com with ESMTPSA id y20sm95135wiv.14.2014.04.11.02.34.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 02:34:30 -0700 (PDT) Message-ID: <5347B725.8050609@embecosm.com> Date: Fri, 11 Apr 2014 10:34:29 +0100 From: Pierre Langlois User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: [COMMITTED PATCH] Erroneous backtrace on AVR/avrxmega backported X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in Hello, I have just backported this patch for 7.7.1 https://sourceware.org/ml/gdb-patches/2014-04/msg00097.html https://sourceware.org/ml/gdb-patches/2014-03/msg00425.html Best, Pierre 2014-04-11 Pierre Langlois PR backtrace/16721 PR backtrace/16832 * avr-tdep.c (struct gdbarch_tdep): Mention avrxmega in the comment. (avr_gdbarch_init): Add xmega architectures given by bfd_architecture when setting the size of call_length. (avr_scan_prologue): Accept push r1 instruction for small stack allocation. * MAINTAINERS (Write After Approval): Add "Pierre Langlois". --- gdb/MAINTAINERS | 1 + gdb/avr-tdep.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS index ffd310b..c0297c1 100644 --- a/gdb/MAINTAINERS +++ b/gdb/MAINTAINERS @@ -546,6 +546,7 @@ Jim Kingdon kingdon@panix.com Paul Koning paul_koning@dell.com Jan Kratochvil jan.kratochvil@redhat.com Maxim Kuvyrkov maxim@kugelworks.com +Pierre Langlois pierre.langlois@embecosm.com Jonathan Larmour jifl@ecoscentric.com Jeff Law law@redhat.com Justin Lebar justin.lebar@gmail.com diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index cb330ea..1be9e7d 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -179,7 +179,7 @@ struct avr_unwind_cache struct gdbarch_tdep { /* Number of bytes stored to the stack by call instructions. - 2 bytes for avr1-5, 3 bytes for avr6. */ + 2 bytes for avr1-5 and avrxmega1-5, 3 bytes for avr6 and avrxmega6-7. */ int call_length; /* Type for void. */ @@ -719,7 +719,7 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, info->size += gdbarch_tdep (gdbarch)->call_length; vpc += 2; } - else if (insn == 0x920f) /* push r0 */ + else if (insn == 0x920f || insn == 0x921f) /* push r0 or push r1 */ { info->size += 1; vpc += 2; @@ -1355,14 +1355,21 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) switch (info.bfd_arch_info->mach) { case bfd_mach_avr1: + case bfd_mach_avrxmega1: case bfd_mach_avr2: + case bfd_mach_avrxmega2: case bfd_mach_avr3: + case bfd_mach_avrxmega3: case bfd_mach_avr4: + case bfd_mach_avrxmega4: case bfd_mach_avr5: + case bfd_mach_avrxmega5: default: call_length = 2; break; case bfd_mach_avr6: + case bfd_mach_avrxmega6: + case bfd_mach_avrxmega7: call_length = 3; break; }