From patchwork Tue Nov 29 14:12:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 18041 Received: (qmail 113064 invoked by alias); 29 Nov 2016 14:12:58 -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 111382 invoked by uid 89); 29 Nov 2016 14:12:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=*gdbarch, sk:trad_fr, 5406, 3976 X-HELO: mail-pf0-f193.google.com Received: from mail-pf0-f193.google.com (HELO mail-pf0-f193.google.com) (209.85.192.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Nov 2016 14:12:48 +0000 Received: by mail-pf0-f193.google.com with SMTP id i88so8432808pfk.2 for ; Tue, 29 Nov 2016 06:12:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8WLbnVEw2qh3zGEMwNrQvCyTZPbQ4jVLpMWn50/zeOU=; b=JE6TnJEjEsn5S5QR2051BhrMJ6AJqEqQCKgEF54UdLPe2pq6iLq9tVAtJtDgB7CvGb +tYiEGXwEd4KCqk8ZEXjLhbQ7S1ljxF08sb3DBCoTemIu3JCsN9H7GRJ9jq4W52TbG6L URfdWkiaWzwclTZjZorcvTKIXLljM8z3Ip5wlEDdxkA0PXN7SEtWajJFte9l/xxxvbDV IdTNcXcQASADKT7gXMUCKWsKj23AmSjAsomAWHITh9d9dhI0VbX93YnTSW0/0sK+NwlY BGRyJGOTCY8y831Yg4kF/SVXqIMmlGGRoUwSG6/P0G/+GHPoPfghe03HuAE6U6ZguC4v o/yg== X-Gm-Message-State: AKaTC01qPtxnpoICOGCp7FVEOCwVkFcGVgVbGdirm8X0rif/XcKLJyzsBMK5JxmrJYSm4Q== X-Received: by 10.98.92.133 with SMTP id q127mr27529408pfb.152.1480428766789; Tue, 29 Nov 2016 06:12:46 -0800 (PST) Received: from E107787-LIN.cambridge.arm.com (power8-aix.osuosl.org. [140.211.9.96]) by smtp.gmail.com with ESMTPSA id s5sm40532922pgj.19.2016.11.29.06.12.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 06:12:46 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 2/2] [AArch64] Recognize STR instruction in prologue Date: Tue, 29 Nov 2016 14:12:38 +0000 Message-Id: <1480428758-2481-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1480428758-2481-1-git-send-email-yao.qi@linaro.org> References: <1480428758-2481-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch teaches GDB AArch64 backend to recognize STR instructions in prologue, like 'str x19, [sp, #-48]!' or 'str w0, [sp, #44]'. The unit test is added too. gdb: 2016-11-28 Yao Qi * aarch64-tdep.c (aarch64_analyze_prologue): Recognize STR instruction. (aarch64_analyze_prologue_test): More tests. --- gdb/aarch64-tdep.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index b10002a..fc68b8a 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -397,6 +397,35 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, regs[rn] = pv_add_constant (regs[rn], imm); } + else if ((inst.opcode->iclass == ldst_imm9 /* Signed immediate. */ + || (inst.opcode->iclass == ldst_pos /* Unsigned immediate. */ + && (inst.opcode->op == OP_STR_POS + || inst.opcode->op == OP_STRF_POS))) + && inst.operands[1].addr.base_regno == AARCH64_SP_REGNUM + && strcmp ("str", inst.opcode->name) == 0) + { + /* STR (immediate) */ + unsigned int rt = inst.operands[0].reg.regno; + int32_t imm = inst.operands[1].addr.offset.imm; + unsigned rn = inst.operands[1].addr.base_regno; + int is64 + = (aarch64_get_qualifier_esize (inst.operands[0].qualifier) == 8); + gdb_assert (inst.operands[0].type == AARCH64_OPND_Rt + || inst.operands[0].type == AARCH64_OPND_Ft); + + if (inst.operands[0].type == AARCH64_OPND_Ft) + { + /* Only bottom 64-bit of each V register (D register) need + to be preserved. */ + gdb_assert (inst.operands[0].qualifier == AARCH64_OPND_QLF_S_D); + rt += AARCH64_X_REGISTER_COUNT; + } + + pv_area_store (stack, pv_add_constant (regs[rn], imm), + is64 ? 8 : 4, regs[rt]); + if (inst.operands[1].addr.writeback) + regs[rn] = pv_add_constant (regs[rn], imm); + } else if (inst.opcode->iclass == testbranch) { /* Stop analysis on branch. */ @@ -540,6 +569,45 @@ aarch64_analyze_prologue_test (void) SELF_CHECK (cache.saved_regs[i + regnum + AARCH64_D0_REGNUM].addr == -1); } + + /* Second test. */ + cache.saved_regs = trad_frame_alloc_saved_regs (gdbarch); + + instruction_reader_test test2 { + 0xf81d0ff3, /* str x19, [sp, #-48]! */ + 0xb9002fe0, /* str w0, [sp, #44] */ + 0xf90013e1, /* str x1, [sp, #32]*/ + 0xfd000fe0, /* str d0, [sp, #24] */ + 0xaa0203f3, /* mov x19, x2 */ + 0xf94013e0, /* ldr x0, [sp, #32] */ + }; + + end = aarch64_analyze_prologue (gdbarch, 0, 128, &cache, test2); + + SELF_CHECK (end == 4 * 5); + + SELF_CHECK (cache.framereg == AARCH64_SP_REGNUM); + SELF_CHECK (cache.framesize == 48); + + for (int i = 0; i < AARCH64_X_REGISTER_COUNT; i++) + { + if (i == 1) + SELF_CHECK (cache.saved_regs[i].addr == -16); + else if (i == 19) + SELF_CHECK (cache.saved_regs[i].addr == -48); + else + SELF_CHECK (cache.saved_regs[i].addr == -1); + } + + for (int i = 0; i < AARCH64_D_REGISTER_COUNT; i++) + { + int regnum = gdbarch_num_regs (gdbarch); + + if (i == 0) + SELF_CHECK (cache.saved_regs[i + regnum + AARCH64_D0_REGNUM].addr == -24); + else + SELF_CHECK (cache.saved_regs[i + regnum + AARCH64_D0_REGNUM].addr == -1); + } } } #endif /* GDB_SELF_TEST */