From patchwork Thu Dec 5 12:39:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 22063 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B2A2323FBA for ; Thu, 5 Dec 2013 12:39:52 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id hu19sf36878213vcb.3 for ; Thu, 05 Dec 2013 04:39:52 -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=RlEvVO5WVkMvLadfzRnwfEXCauqRFNUHEIpzw1NFoJ8=; b=hTp+GsuWfktqR4m42xhj4oPJ2FLavXGkDH8zqtugekTM/CmolNYpMUnAoklsi66R5K jUow0+SBetVgqLC6C9m+n1hgClqGiUc1Kl5fnlAq1U0HDzOpCdMLaMxrSaf3lhlWhp4/ PAsmZ6ELgqsjWetMeP5stfPqcXOBZglMZi1PA4Uao0Qr6OJA8U75LDW5QXDWXdbdos8G pkkNRFTshgJp0pImAa3I8ZNyUVbdzyndxK8r7lz6o5ODe2OVWhVJhaeydg0C0bgCMAR3 W+GOh7jcVWNbrGZiR9TbbxRG58LhI46BzRONEUd1fSdR7ghrXKj1ka0/iGhEm4HZHsiz pYhA== X-Gm-Message-State: ALoCoQlR3pl87tJvyu48tBquZo6lW30vOXCDVukqfWx79b7bPzA0bnKKaMKMekoV2x4S7TaaPQ1b X-Received: by 10.236.92.202 with SMTP id j50mr35926051yhf.26.1386247192566; Thu, 05 Dec 2013 04:39:52 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.138 with SMTP id k10ls718345qek.13.gmail; Thu, 05 Dec 2013 04:39:52 -0800 (PST) X-Received: by 10.58.181.165 with SMTP id dx5mr116403vec.52.1386247192416; Thu, 05 Dec 2013 04:39:52 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id b5si34400378vcf.129.2013.12.05.04.39.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Dec 2013 04:39:52 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id ht10so13208597vcb.1 for ; Thu, 05 Dec 2013 04:39:52 -0800 (PST) X-Received: by 10.221.64.17 with SMTP id xg17mr63085466vcb.5.1386247192264; Thu, 05 Dec 2013 04:39:52 -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 u4csp11823vcz; Thu, 5 Dec 2013 04:39:51 -0800 (PST) X-Received: by 10.112.89.42 with SMTP id bl10mr3687721lbb.18.1386247188884; Thu, 05 Dec 2013 04:39:48 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id bj6si5871711lbc.107.2013.12.05.04.39.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Dec 2013 04:39:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VoYDV-00072N-2z; Thu, 05 Dec 2013 12:39:41 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Michael Matz , C Fontana , Dirk Mueller , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 08/12] target-arm: A64: add support for B and BL insns Date: Thu, 5 Dec 2013 12:39:36 +0000 Message-Id: <1386247180-26994-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386247180-26994-1-git-send-email-peter.maydell@linaro.org> References: <1386247180-26994-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.220.170 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 Reviewed-by: Richard Henderson --- target-arm/translate-a64.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- target-arm/translate.h | 3 +++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 1e2b371..bab890d 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -160,16 +160,71 @@ static void unallocated_encoding(DisasContext *s) unallocated_encoding(s); \ } while (0); +static void init_tmp_a64_array(DisasContext *s) +{ + int i; +#ifdef CONFIG_DEBUG_TCG + for (i = 0; i < ARRAY_SIZE(s->tmp_a64); i++) { + TCGV_UNUSED_I64(s->tmp_a64[i]); + } +#endif + s->tmp_a64_count = 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]); + } + init_tmp_a64_array(s); +} + +static TCGv_i64 new_tmp_a64(DisasContext *s) +{ + assert(s->tmp_a64_count < TMP_A64_MAX); + return s->tmp_a64[s->tmp_a64_count++] = tcg_temp_new_i64(); +} + +static TCGv_i64 new_tmp_a64_zero(DisasContext *s) +{ + TCGv_i64 t = new_tmp_a64(s); + tcg_gen_movi_i64(t, 0); + return t; +} + +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 +706,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, @@ -691,6 +749,8 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu, dc->vec_len = 0; dc->vec_stride = 0; + init_tmp_a64_array(dc); + next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; lj = -1; num_insns = 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;