From patchwork Wed Dec 4 19:33:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 22035 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A647F202E0 for ; Wed, 4 Dec 2013 19:33:41 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id uo5sf45781553pbc.6 for ; Wed, 04 Dec 2013 11:33:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=lbx7JbL8Bt+L3PBc0cabO8Ajo6e0HPODbsMpyBWjwRE=; b=FYj0GQP2MpXAtgt+aZ7VYmf6scq9SQLqmxUkFFt3Q+EM46yZporyqVWTHMiAm9/WdP bIKTXCQrxdatV9uU2pu9Gm31UdxN2QAEb7iYOq2UTGXNHITh/phOzadZL/tHnWjrA44o d0xnIDGl5FslIzdh1SvUdh2C7UEkuwNvyIZGsBJXyVwQ5qlBO8CEu+9dctYhJ9SChYR5 bMpwv6cDUN7hN8lkdQRJCJ9mgKq062qDaYvFH4667O4Um03HZhHY+PSmSWHxVCJpCh0b wo5o1IlMhs/YOLfm6XOzrqeF0mayW6BtYT789t8dUfRACXZDjD7x+j8SCQ4UTTfdfaoO e8Tg== X-Gm-Message-State: ALoCoQnu3oVrIYIwU5WiV0jPzudws/ihfNHc2ayretR32xFIrzDJIKR4e10YIe1/CAg5rVgMi9LQ X-Received: by 10.67.2.41 with SMTP id bl9mr30138525pad.16.1386185620871; Wed, 04 Dec 2013 11:33:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.131 with SMTP id 3ls485752qee.70.gmail; Wed, 04 Dec 2013 11:33:40 -0800 (PST) X-Received: by 10.58.248.198 with SMTP id yo6mr1569384vec.40.1386185620709; Wed, 04 Dec 2013 11:33:40 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id op1si33266104vcb.42.2013.12.04.11.33.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 11:33:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so12401490veb.40 for ; Wed, 04 Dec 2013 11:33:40 -0800 (PST) X-Received: by 10.58.108.196 with SMTP id hm4mr2703545veb.28.1386185620388; Wed, 04 Dec 2013 11:33:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp318440vcz; Wed, 4 Dec 2013 11:33:39 -0800 (PST) X-Received: by 10.204.122.137 with SMTP id l9mr8807284bkr.23.1386185615917; Wed, 04 Dec 2013 11:33:35 -0800 (PST) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id cl3si3881332bkc.266.2013.12.04.11.33.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 04 Dec 2013 11:33:35 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VoICP-0006eM-GL; Wed, 04 Dec 2013 19:33:29 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , C Fontana , Dirk Mueller , Michael Matz , Laurent Desnogues , Richard Henderson , kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 08/12] target-arm: A64: add support for B and BL insns Date: Wed, 4 Dec 2013 19:33:25 +0000 Message-Id: <1386185609-25505-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386185609-25505-1-git-send-email-peter.maydell@linaro.org> References: <1386185609-25505-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alexander Graf Implement the B and BL instructions (PC relative branches and calls). For convenience in managing TCG temporaries which might be generated if a source register is the zero-register XZR, we provide a simple mechanism for creating a new temp which is automatically freed at the end of decode of the instruction. Signed-off-by: Alexander Graf [claudio: renamed functions, adapted to new decoder layout] Signed-off-by: Claudio Fontana Signed-off-by: Peter Maydell --- target-arm/translate-a64.c | 45 ++++++++++++++++++++++++++++++++++++++++++-- target-arm/translate.h | 3 +++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 1e2b371..b413966 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -160,16 +160,53 @@ static void unallocated_encoding(DisasContext *s) unallocated_encoding(s); \ } while (0); +static void free_tmp_a64(DisasContext *s) +{ + int i; + for (i = 0; i < s->tmp_a64_count; i++) { + tcg_temp_free_i64(s->tmp_a64[i]); + } + s->tmp_a64_count = 0; +} + +static TCGv_i64 new_tmp_a64_zero(DisasContext *s) +{ + assert(s->tmp_a64_count < TMP_A64_MAX); + return s->tmp_a64[s->tmp_a64_count++] = tcg_const_i64(0); +} + +static TCGv_i64 cpu_reg(DisasContext *s, int reg) +{ + if (reg == 31) { + return new_tmp_a64_zero(s); + } else { + return cpu_X[reg]; + } +} + /* * the instruction disassembly implemented here matches * the instruction encoding classifications in chapter 3 (C3) * of the ARM Architecture Reference Manual (DDI0487A_a) */ -/* Unconditional branch (immediate) */ +/* C3.2.7 Unconditional branch (immediate) + * 31 30 26 25 0 + * +----+-----------+-------------------------------------+ + * | op | 0 0 1 0 1 | imm26 | + * +----+-----------+-------------------------------------+ + */ static void disas_uncond_b_imm(DisasContext *s, uint32_t insn) { - unsupported_encoding(s, insn); + uint64_t addr = s->pc + sextract32(insn, 0, 26) * 4 - 4; + + if (insn & (1 << 31)) { + /* C5.6.26 BL Branch with link */ + tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); + } + + /* C5.6.20 B Branch / C5.6.26 BL Branch with link */ + gen_goto_tb(s, 0, addr); } /* Compare & branch (immediate) */ @@ -651,6 +688,9 @@ static void disas_a64_insn(CPUARMState *env, DisasContext *s) assert(FALSE); /* all 15 cases should be handled above */ break; } + + /* if we allocated any temporaries, free them here */ + free_tmp_a64(s); } void gen_intermediate_code_internal_a64(ARMCPU *cpu, @@ -680,6 +720,7 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu, dc->condjmp = 0; dc->aarch64 = 1; + dc->tmp_a64_count = 0; dc->thumb = 0; dc->bswap_code = 0; dc->condexec_mask = 0; diff --git a/target-arm/translate.h b/target-arm/translate.h index 8789181..23a45da 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -24,6 +24,9 @@ typedef struct DisasContext { int vec_len; int vec_stride; int aarch64; +#define TMP_A64_MAX 16 + int tmp_a64_count; + TCGv_i64 tmp_a64[TMP_A64_MAX]; } DisasContext; extern TCGv_ptr cpu_env;