From patchwork Fri Oct 23 08:18:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 9339 Received: (qmail 49469 invoked by alias); 23 Oct 2015 08:18:53 -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 49456 invoked by uid 89); 23 Oct 2015 08:18:51 -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_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f45.google.com Received: from mail-pa0-f45.google.com (HELO mail-pa0-f45.google.com) (209.85.220.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 23 Oct 2015 08:18:50 +0000 Received: by padhk11 with SMTP id hk11so112199235pad.1 for ; Fri, 23 Oct 2015 01:18:48 -0700 (PDT) X-Received: by 10.68.173.133 with SMTP id bk5mr3574660pbc.133.1445588328857; Fri, 23 Oct 2015 01:18:48 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc2-power8.osuosl.org. [140.211.9.43]) by smtp.gmail.com with ESMTPSA id si10sm17658902pab.15.2015.10.23.01.18.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Oct 2015 01:18:48 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH OBV] Initialize field insn_count correctly Date: Fri, 23 Oct 2015 09:18:43 +0100 Message-Id: <1445588323-19453-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch initialize dsd.insn_count, otherwise, it triggers the assert below on testings we did recently. It is obvious. I'll push it in. gdb: 2015-10-23 Yao Qi * aarch64-tdep.c (aarch64_displaced_step_copy_insn): Set dsd.insn_count to zero. --- gdb/ChangeLog | 5 +++++ gdb/aarch64-tdep.c | 1 + 2 files changed, 6 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9e82e2f..295ad96 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-10-23 Yao Qi + + * aarch64-tdep.c (aarch64_displaced_step_copy_insn): Set + dsd.insn_count to zero. + 2015-10-22 Pedro Alves * infrun.c (stop_after_trap): Delete. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 995cbcf..55c5fb8 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -2818,6 +2818,7 @@ aarch64_displaced_step_copy_insn (struct gdbarch *gdbarch, dsd.new_addr = to; dsd.regs = regs; dsd.dsc = dsc; + dsd.insn_count = 0; aarch64_relocate_instruction (insn, &visitor, (struct aarch64_insn_data *) &dsd); gdb_assert (dsd.insn_count <= DISPLACED_MODIFIED_INSNS);