From patchwork Wed Aug 28 19:04:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172462 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1222835ily; Wed, 28 Aug 2019 12:55:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaFrM0L4WnFGlaZBxaNfXLp+06eT7DB+kTLZ2q4u2VWVdwtOrhD2qeHo6Tpt4mZ108TRW/ X-Received: by 2002:ac8:739a:: with SMTP id t26mr6235582qtp.65.1567022158437; Wed, 28 Aug 2019 12:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567022158; cv=none; d=google.com; s=arc-20160816; b=jRSVmj+BbXV6vmdn3ARaLLjBWLUf16eEnpzZ00rxp6W52O2OJqPCHwzkjynRiIFN2r sHpSM2zjppVuNSgN5scTyZeg7CXvyYgV3/dTHTiHkm/L3711Qmw3K2ifdpHvJHdaw0jK aXxv0TUerFSSBPrKxEA2COqmcxSHBFQ4PuPfs+NGsLu8ZDIWQSwblOgMK8yOMw1qYQ22 iZEuc0DmrBH1ATAs3di7HOjZ6Azej4wQqXBmyg/GgJkhniy0t8JOQlo80LPfhnDKJ8l4 moku2N318hxaYXOVJdA3xnR5sz5z0aSqePcU9MEnOX6FXKZ2MDuerUfEeSihaMKjeImf xz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=wIySDhGsNWmiBe1mxSZk+IQzzrYDWNTA5+8A0wQT8Vc=; b=w0rQI4pVLjykloWMslTZgXuB2gxJQh4Fe97vFtOY+/4Wy+Sbn1aRIYi/oXo+NRePsP H6ghngGEMXucgRHWOWrpV6/Ea0TCH6mt8ZMr4TDRpK9Y0kuFcWj2Pcih7qfGCIvOnV5y iup2lc+1b5U80dTpPXSaLybAOZiEWqXCDWg7Xehep2BXoxCXkWIssij6+LHvHosyXX1y Vy/BlGXRt5ZXgE6zWfpEI8HCQbDxvNvhhg/vk8mA9cQtORcY66Pdn8jOQYM5fxGCR4wF YVBxMJDsbT+dAvQStdAkzTr+GHJcM1q+2K2rE8Hn0L+ircF0CfAmSYHAyTCqtrktAFF1 u/Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gPvYayY6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y9si119212qtj.183.2019.08.28.12.55.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 12:55:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gPvYayY6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i342v-0002XI-9z for patch@linaro.org; Wed, 28 Aug 2019 15:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38371) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33GX-0003q4-Su for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33GT-0000Pl-B9 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:57 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:41791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33GS-0000O4-Ty for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:53 -0400 Received: by mail-pl1-x62a.google.com with SMTP id m9so391048pls.8 for ; Wed, 28 Aug 2019 12:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wIySDhGsNWmiBe1mxSZk+IQzzrYDWNTA5+8A0wQT8Vc=; b=gPvYayY6eKCqOn1gIybOGYzSOEUhbEcFWyeUhcQZbLA642f4bJp+or/HNpe7+CtDU4 3hFuNxEwK4dBV5dGADHN3A1UaUzM39Nzj7Clks0DDebgqp55KrjA0QWWw9MleF2Nn5w4 CoFkfm4bEVE2HUCY5tgQslImqmLPADbpRHyA22oVmn0gmurk6OWGCjypi6UQctrfucVx zzRAeoaMGD0uSaaVCOO4dhyeNb8KhIRR+OIfJQ5THnsayQSRcU8oEd17DTcfbDSuuJkV IArw2QXR5zVGBB8bhKvftz1HA51OHWMySBpIxyLLG09/BnCV+YjwjNRlcuZNDOJVhPP2 ADvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wIySDhGsNWmiBe1mxSZk+IQzzrYDWNTA5+8A0wQT8Vc=; b=uW+uK1AB3toU7tfAEkhH3p+9ccje2L1vzqgyeOO3w5+wYK/hIk+4e2BmCe7igFYpCg yoRv466i8wDGlCjA83hEQXSDMNPHC+Xq/2oqxCEu9dWE23SHYjstqpMZDHq2NFzHGy5B cBbi8OKeK8O8UoJzy6eFHySUfor0gsFZyq4UOLRd/f03UT8or+1E1iC9RBCtGAHl3pY0 LU4keJYF9vtq9Ry+Iejr71aqABBy1lpBD0FI5pTrNLxTKtN1vHH15RfAaIIPM0/0SuDO eJphcDiohn6T09aRearb494cwbLUcikY1Zq9A3M0+yiyVAFKt7PC1UcMjOYKs2LfrKtN uLiQ== X-Gm-Message-State: APjAAAVmFTwY+yh2LgQdRFJQkawelQ5L3ZdYoenLackLXvSZCFe8Zmrr NVuAcBl7M+IP0Jf4Iu21KemvDHlVUW8= X-Received: by 2002:a17:902:ff02:: with SMTP id f2mr5392599plj.99.1567019151318; Wed, 28 Aug 2019 12:05:51 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f27sm2967944pgm.60.2019.08.28.12.05.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:27 -0700 Message-Id: <20190828190456.30315-41-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828190456.30315-1-richard.henderson@linaro.org> References: <20190828190456.30315-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62a Subject: [Qemu-devel] [PATCH v3 40/69] target/arm: Convert Table Branch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 57 +++++++++++++++++++++++++----------------- target/arm/t32.decode | 8 +++++- 2 files changed, 41 insertions(+), 24 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index 07547f7b6c..92b3a66e05 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10048,6 +10048,37 @@ static bool trans_BLX_i(DisasContext *s, arg_BLX_i *a) return true; } +static bool op_tbranch(DisasContext *s, arg_tbranch *a, bool half) +{ + TCGv_i32 addr, tmp; + + tmp = load_reg(s, a->rm); + if (half) { + tcg_gen_add_i32(tmp, tmp, tmp); + } + addr = load_reg(s, a->rn); + tcg_gen_add_i32(addr, addr, tmp); + + gen_aa32_ld_i32(s, tmp, addr, get_mem_index(s), + half ? MO_UW | s->be_data : MO_UB); + tcg_temp_free_i32(addr); + + tcg_gen_add_i32(tmp, tmp, tmp); + tcg_gen_addi_i32(tmp, tmp, read_pc(s)); + store_reg(s, 15, tmp); + return true; +} + +static bool trans_TBB(DisasContext *s, arg_tbranch *a) +{ + return op_tbranch(s, a, false); +} + +static bool trans_TBH(DisasContext *s, arg_tbranch *a) +{ + return op_tbranch(s, a, true); +} + /* * Supervisor call */ @@ -10443,9 +10474,7 @@ static bool thumb_insn_is_16bit(DisasContext *s, uint32_t pc, uint32_t insn) /* Translate a 32-bit thumb instruction. */ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) { - uint32_t rd, rn, rm, rs; - TCGv_i32 tmp; - TCGv_i32 addr; + uint32_t rd, rn, rs; int op; /* @@ -10491,7 +10520,6 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) rn = (insn >> 16) & 0xf; rs = (insn >> 12) & 0xf; rd = (insn >> 8) & 0xf; - rm = insn & 0xf; switch ((insn >> 25) & 0xf) { case 0: case 1: case 2: case 3: /* 16-bit instructions. Should never happen. */ @@ -10564,25 +10592,8 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) /* Load/store exclusive, in decodetree */ goto illegal_op; } else if ((insn & (7 << 5)) == 0) { - /* Table Branch. */ - addr = load_reg(s, rn); - tmp = load_reg(s, rm); - tcg_gen_add_i32(addr, addr, tmp); - if (insn & (1 << 4)) { - /* tbh */ - tcg_gen_add_i32(addr, addr, tmp); - tcg_temp_free_i32(tmp); - tmp = tcg_temp_new_i32(); - gen_aa32_ld16u(s, tmp, addr, get_mem_index(s)); - } else { /* tbb */ - tcg_temp_free_i32(tmp); - tmp = tcg_temp_new_i32(); - gen_aa32_ld8u(s, tmp, addr, get_mem_index(s)); - } - tcg_temp_free_i32(addr); - tcg_gen_shli_i32(tmp, tmp, 1); - tcg_gen_addi_i32(tmp, tmp, read_pc(s)); - store_reg(s, 15, tmp); + /* Table Branch, in decodetree */ + goto illegal_op; } else { /* Load/store exclusive, load-acq/store-rel, in decodetree */ goto illegal_op; diff --git a/target/arm/t32.decode b/target/arm/t32.decode index fc3e7db4b5..24482e0eeb 100644 --- a/target/arm/t32.decode +++ b/target/arm/t32.decode @@ -489,7 +489,7 @@ LDRD_ri_t32 1110 1001 .101 .... .... .... ........ @ldstd_ri8 w=0 p=1 STRD_ri_t32 1110 1001 .110 .... .... .... ........ @ldstd_ri8 w=1 p=1 LDRD_ri_t32 1110 1001 .111 .... .... .... ........ @ldstd_ri8 w=1 p=1 -# Load/Store Exclusive and Load-Acquire/Store-Release +# Load/Store Exclusive, Load-Acquire/Store-Release, and Table Branch @strex_i .... .... .... rn:4 rt:4 rd:4 .... .... \ &strex rt2=15 imm=%imm8x4 @@ -533,6 +533,12 @@ LDA 1110 1000 1101 .... .... 1111 1010 1111 @ldrex_0 LDAB 1110 1000 1101 .... .... 1111 1000 1111 @ldrex_0 LDAH 1110 1000 1101 .... .... 1111 1001 1111 @ldrex_0 +&tbranch rn rm +@tbranch .... .... .... rn:4 .... .... .... rm:4 &tbranch + +TBB 1110 1000 1101 .... 1111 0000 0000 .... @tbranch +TBH 1110 1000 1101 .... 1111 0000 0001 .... @tbranch + # Parallel addition and subtraction SADD8 1111 1010 1000 .... 1111 .... 0000 .... @rndm