From patchwork Wed Aug 28 19:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172476 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1240255ily; Wed, 28 Aug 2019 13:10:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRPJOLavsE6zJhcdZMDUjOBXpH25gir1j0uXEMaAjS+uLc93gE5871ncUAw/rnqBtcDB7i X-Received: by 2002:aed:3a82:: with SMTP id o2mr6301764qte.3.1567023054658; Wed, 28 Aug 2019 13:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567023054; cv=none; d=google.com; s=arc-20160816; b=qndihJnkFmndICD/OV3o5SW/d1Q4/7P9myXAHvKowAamfXMEQ2FO8gU6VgAHS35z0l jE8DTNOD4f2CHlBqwiT46Vaj5Fa6z1vOMo71b2osiBDRBDSSVQTLxFzTkYoC8Glld2+/ AJ7c5HofFK8/SmI9u+9LpsKGPu1phiA9RpAnHjtSdfdvzOvswYM4sIeBIZBdwAeG+jd/ Zlkmw0CeO1sNrid9ew2nTbKjIJczd/SggZydcIo1EaV7A/0hNNJXxdGAyTypwTOx1BBC 36rMEzkX+FkLzgf2onLmnc452WPMBZ4V1ghKlnXLLVfc7fLXZoMy+M9HFXKTbJSzWLaO v8BQ== 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=o8JoQg7nIgQDPaTkLH+nSqJkD4bKhobBAH7LTYEZxrk=; b=fTmxFlZ2j+ifdESMJ+VnlCqCP6ExqF5kAZ3duIs6iVWt+IyKHYYgjo7CgwRIRCArlR y3yqW2Ftpjpk7lp5BrcH0VlQaShu+PkG4eaBILfYjcrXrPtS8nci/Eb0yHkPUUBbSvCX FRQXY/Nz67B3rwxYPe3S/5BJVxOJ9fJQRmO6G+3ek/H+8MbVswzssEiEtSxfBOD/73NA EkrGbQGfDz68w77V8Np4flMAI5tfGizGZlPrvX0CnlFR/B4Jihxyvsr2hmHj9tit8bXi SB8ytYEOHLY/l42CeZJCU6ZCr+63wOMpr84kpWxi8tEoBvR5yCPTpvsEOGf+mySo2XeY mGnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NHC7+M6m; 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 f24si269786qve.127.2019.08.28.13.10.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 13:10:54 -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=NHC7+M6m; 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]:42054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i34HN-0002LH-5n for patch@linaro.org; Wed, 28 Aug 2019 16:10:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39078) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33H6-00048w-J4 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33H2-0000qN-He for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:30 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33H1-0000nl-3P for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:27 -0400 Received: by mail-pl1-x62e.google.com with SMTP id 4so388729pld.10 for ; Wed, 28 Aug 2019 12:06:26 -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=o8JoQg7nIgQDPaTkLH+nSqJkD4bKhobBAH7LTYEZxrk=; b=NHC7+M6myA6feaow8W9JrU4sOasU5/M9Ry6++rHR3Qf2joDZZAjOlrwyHxNHmGOMhw WNpO5yEpH3/12OCcdFHNKTuPZdcvxM9TP52jsj+YUTYWVI951jWAPwUt1QJVT6wkUQBu DedXtsqLqvuNGjvvHsZBZPpa6vCIIwIoyHO+41fJb8UmcN3qq/2ePJHPD8l6q7Jvgb/s ATXL1mpcdzfVBtaP+HkIECCUhAEcAq2odX87EaYmUmEnrmjOpyt1JVycVpuZ/kprGvE0 Ksl75NvWiOr4btIGizZ2zvtPQkuw5zn4GK2mBN1K+8wCD44/PyWVy9FUfzbrFoRXx4WV c74Q== 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=o8JoQg7nIgQDPaTkLH+nSqJkD4bKhobBAH7LTYEZxrk=; b=dDzLsi3psci/IY/TA1rqxN4ufB/WiKKoTV11JHfrtgkuzkK6VzHKVHk4leXZ5g8zj/ YFLEg24pRKp6CwUeAzHDBuKsYOX0RKb+1bVbpNPkPGEfVDdIuJtmAXFiJnGUlFsjS0IV FCTGzE6yE2nV82l0H6F3R3US4OvakDTVnGp83YtlMOvh702l7VnNsvgDqBRat9Qsw7QF x1vEEI+nnEBLZd5Ce4mHHsWoMOLIr2jrn+yVoMxQ8Yb4YZr82Z+ZTHz0SOst1Ni8gEQ5 UTGOpq1O5h5TrRPvTFXBf6et2iXtzJ2sbckw6vr2lWih3YP07ifBOellZrEfLdvebmMV +Lmg== X-Gm-Message-State: APjAAAVtHuCkq9yGPRTXCx0+hp+LvLJV+w+PRQs8Wai2NNtCA10MeskT iVUixVX38iO7VPdI4vSfkli1ly2pwdw= X-Received: by 2002:a17:902:eb:: with SMTP id a98mr5544096pla.75.1567019184572; Wed, 28 Aug 2019 12:06:24 -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.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:06:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:54 -0700 Message-Id: <20190828190456.30315-68-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::62e Subject: [Qemu-devel] [PATCH v3 67/69] target/arm: Convert T16, long branches 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 | 85 ++++++++++++++++++------------------------ target/arm/t16.decode | 7 ++++ 2 files changed, 43 insertions(+), 49 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index 574a791461..424a8354c1 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10114,6 +10114,40 @@ static bool trans_BLX_i(DisasContext *s, arg_BLX_i *a) return true; } +static bool trans_BL_BLX_prefix(DisasContext *s, arg_BL_BLX_prefix *a) +{ + assert(!arm_dc_feature(s, ARM_FEATURE_THUMB2)); + tcg_gen_movi_i32(cpu_R[14], read_pc(s) + (a->imm << 12)); + return true; +} + +static bool trans_BL_suffix(DisasContext *s, arg_BL_suffix *a) +{ + TCGv_i32 tmp = tcg_temp_new_i32(); + + assert(!arm_dc_feature(s, ARM_FEATURE_THUMB2)); + tcg_gen_addi_i32(tmp, cpu_R[14], (a->imm << 1) | 1); + tcg_gen_movi_i32(cpu_R[14], s->base.pc_next | 1); + gen_bx(s, tmp); + return true; +} + +static bool trans_BLX_suffix(DisasContext *s, arg_BLX_suffix *a) +{ + TCGv_i32 tmp; + + assert(!arm_dc_feature(s, ARM_FEATURE_THUMB2)); + if (!ENABLE_ARCH_5) { + return false; + } + tmp = tcg_temp_new_i32(); + tcg_gen_addi_i32(tmp, cpu_R[14], a->imm << 1); + tcg_gen_andi_i32(tmp, tmp, 0xfffffffc); + tcg_gen_movi_i32(cpu_R[14], s->base.pc_next | 1); + gen_bx(s, tmp); + return true; +} + static bool op_tbranch(DisasContext *s, arg_tbranch *a, bool half) { TCGv_i32 addr, tmp; @@ -10713,10 +10747,6 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) static void disas_thumb_insn(DisasContext *s, uint32_t insn) { - int32_t offset; - TCGv_i32 tmp; - TCGv_i32 tmp2; - if (disas_t16(s, insn)) { return; } @@ -10735,53 +10765,10 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) case 11: /* misc, in decodetree */ case 12: /* load/store multiple, in decodetree */ case 13: /* conditional branch or swi, in decodetree */ - goto illegal_op; - case 14: - if (insn & (1 << 11)) { - /* thumb_insn_is_16bit() ensures we can't get here for - * a Thumb2 CPU, so this must be a thumb1 split BL/BLX: - * 0b1110_1xxx_xxxx_xxxx : BLX suffix (or UNDEF) - */ - assert(!arm_dc_feature(s, ARM_FEATURE_THUMB2)); - ARCH(5); - offset = ((insn & 0x7ff) << 1); - tmp = load_reg(s, 14); - tcg_gen_addi_i32(tmp, tmp, offset); - tcg_gen_andi_i32(tmp, tmp, 0xfffffffc); - - tmp2 = tcg_temp_new_i32(); - tcg_gen_movi_i32(tmp2, s->base.pc_next | 1); - store_reg(s, 14, tmp2); - gen_bx(s, tmp); - break; - } - /* unconditional branch, in decodetree */ - goto illegal_op; - case 15: - /* thumb_insn_is_16bit() ensures we can't get here for - * a Thumb2 CPU, so this must be a thumb1 split BL/BLX. - */ - assert(!arm_dc_feature(s, ARM_FEATURE_THUMB2)); - - if (insn & (1 << 11)) { - /* 0b1111_1xxx_xxxx_xxxx : BL suffix */ - offset = ((insn & 0x7ff) << 1) | 1; - tmp = load_reg(s, 14); - tcg_gen_addi_i32(tmp, tmp, offset); - - tmp2 = tcg_temp_new_i32(); - tcg_gen_movi_i32(tmp2, s->base.pc_next | 1); - store_reg(s, 14, tmp2); - gen_bx(s, tmp); - } else { - /* 0b1111_0xxx_xxxx_xxxx : BL/BLX prefix */ - uint32_t uoffset = ((int32_t)insn << 21) >> 9; - - tcg_gen_movi_i32(cpu_R[14], read_pc(s) + uoffset); - } - break; + /* branches, in decodetree */ + goto illegal_op; } return; illegal_op: diff --git a/target/arm/t16.decode b/target/arm/t16.decode index a4c89dba61..43b9a267a1 100644 --- a/target/arm/t16.decode +++ b/target/arm/t16.decode @@ -272,3 +272,10 @@ LDM_t16 1011 110 ......... \ %imm11_0x2 0:s11 !function=times_2 B 11100 ........... &i imm=%imm11_0x2 + +# thumb_insn_is_16bit() ensures we won't be decoding these as +# T16 instructions for a Thumb2 CPU, so these patterns must be +# a Thumb1 split BL/BLX. +BLX_suffix 11101 imm:11 &i +BL_BLX_prefix 11110 imm:s11 &i +BL_suffix 11111 imm:11 &i