From patchwork Wed Aug 28 19:04:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172475 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1238775ily; Wed, 28 Aug 2019 13:09:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXXrCvBqqnibqe8Va6UveLkHOCMxfxNniW65reWiaXd/ZdbZgaJiI7FSLZp+W+GGrgMM2B X-Received: by 2002:a05:620a:12ca:: with SMTP id e10mr5825616qkl.125.1567022974303; Wed, 28 Aug 2019 13:09:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567022974; cv=none; d=google.com; s=arc-20160816; b=t0WwB7miGYJTc35PQCmEnewf1ufPo83gXVW/xvrgdNVPAvN7QomblhMBXyGwrNizTO d/nYKW8bxZbU4g5aMWKY6dXdBMuM7qoAUj2W8hHHN8KhuA1HA6Y4NJcoDNg1/cfSXGTp Xt35XqhTe5OgmA5x9vQeNhKcFbyV832OHRNel0Xe2Gr6hI8IEnZhH2YVhpUPHDhdD9Th HoYXM6KNnVspJWyQoK51IoNy+um4hcsvJ+s6SMmNxq5KjrxAyHajofOuNlCnCSlWXxWQ KkSELzpw1AE7E1vbtZkKB0k7ZdRSx6fahHoncXG9Wb95DY2DcNlD58EIAa3J1LqWbyWq 4tGg== 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=6MCGFTmei0/LomQ5kSqH0JJCmj9qk8EmtY5FJ9APNto=; b=EZEuN2MhPTo5AyCcSDd8FVc1ozxirQ51krB1iQUGxAUSTuV9h7Yi35k3ZQkFLOC03O CkShM7JaCU4qxnCpQy/FqW3laT+fkTB4whschzcbkIF8MiMEuBrP3YEw3rYqmT7BFw92 4GVCClOfyUGDCUfkqh6IvmBMItPNZ6m9Qq7d/gSKJhNrx4CepArNqYOSiKoyhhOE2Qez /prwUhpkwnBsg4xW00ZCWeneNOJGRNYg6KIszqtnH/gcDXaCs705+MoaSoi204IrHS+I LADbkdm/IX0Z7ABhBFz8pEpXWKBGp+NptCW8Epg0+tO2IDJJyf6WMTzg16gS2S63/G7d CKUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=erxTp27y; 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 42si297506qvm.111.2019.08.28.13.09.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 13:09:34 -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=erxTp27y; 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]:42030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i34G5-0008IY-IY for patch@linaro.org; Wed, 28 Aug 2019 16:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38595) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Gl-0003tx-4t for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33Gi-0000bE-Q3 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:10 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:43540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33Gg-0000XV-Oe for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:07 -0400 Received: by mail-pf1-x444.google.com with SMTP id v12so375599pfn.10 for ; Wed, 28 Aug 2019 12:06:05 -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=6MCGFTmei0/LomQ5kSqH0JJCmj9qk8EmtY5FJ9APNto=; b=erxTp27yilKFTy0BE4fI3n4xYC6VEA9GgNc62jBB4wz8rvfhJVisEGTZkdKL4yWr04 IRf0W6tJaeTvppRPHulBluNwX9LsstOyDoZtKmhFOpa4RQvJ6NFULZIJKPXnHhw+wHyw iNhLwG0HbndKrWSpeYork+qk4vMDYhvcIHvz59A7b+DPHuHSsn79DIxyCC9CYOfDHT97 mDo7JTIW3P22xKkBo/LSVgGcgTM4+vzntLqaPVT48LAGKRxtgzAblbWSrQj0gzrHazWN +jM14njb5N3s1DNHUv/tKc9UNQSEVzVTLyYFK5SFGjxeRLKkN9Niyf2UBuXZ24awk72Y LDrw== 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=6MCGFTmei0/LomQ5kSqH0JJCmj9qk8EmtY5FJ9APNto=; b=nnRwS+PSHMc3iIEEBEAqwvau/Dg4nE46kWUD0aly5Fw0aibz603oUpab3kr1fVzEVV yRVWzgB/x3CKMIuB6ROHIfHkYvInBR2C3qgQ2Q60D66ZOwhlPxLUgYL0t/0crBTTEbEJ gVaS7gRXRe0ytzxDzIwHmKCqqrM22HykVjc8v0FzH3SFYeCbgzysEq6I/wzExGf2KsHY ID3rYtS0EL16jW7X9XvkOQqnVQZCsgpIS850uwbG04LxmQZ7evDnJ7mg1LBBGHaDTUB0 iiYSuD2nOvtmJfw7qwpuDE3Vy1ACOq1UyqCDzlSvBUBFk4aWd3Cliof6nEartQq7zh4J f78g== X-Gm-Message-State: APjAAAWV1wdaIuAs+DGI5cAc/B2/BWlVi0NZI43Q3NubqCF3PY81O7Wl l1uMP4FGg+0s0A5I2Ik7RMY/qc0k/6o= X-Received: by 2002:a63:de4c:: with SMTP id y12mr4873135pgi.264.1567019163712; Wed, 28 Aug 2019 12:06:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:06:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:37 -0700 Message-Id: <20190828190456.30315-51-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::444 Subject: [Qemu-devel] [PATCH v3 50/69] target/arm: Convert T16 load/store multiple 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 | 48 ++++++++---------------------------------- target/arm/t16.decode | 8 +++++++ 2 files changed, 17 insertions(+), 39 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index d8dfddaea3..b6ee123bf5 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10059,6 +10059,14 @@ static bool trans_LDM_t32(DisasContext *s, arg_ldst_block *a) return do_ldm(s, a, 2); } +static bool trans_LDM_t16(DisasContext *s, arg_ldst_block *a) +{ + /* Writeback is conditional on the base register not being loaded. */ + a->w = !(a->list & (1 << a->rn)); + /* BitCount(list) < 1 is UNPREDICTABLE */ + return do_ldm(s, a, 1); +} + /* * Branch, branch with link */ @@ -10846,6 +10854,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) case 8: /* load/store halfword immediate offset, in decodetree */ case 9: /* load/store from stack, in decodetree */ case 10: /* add PC/SP (immediate), in decodetree */ + case 12: /* load/store multiple, in decodetree */ goto illegal_op; case 11: @@ -11069,45 +11078,6 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) } break; - case 12: - { - /* load/store multiple */ - TCGv_i32 loaded_var = NULL; - rn = (insn >> 8) & 0x7; - addr = load_reg(s, rn); - for (i = 0; i < 8; i++) { - if (insn & (1 << i)) { - if (insn & (1 << 11)) { - /* load */ - tmp = tcg_temp_new_i32(); - gen_aa32_ld32u(s, tmp, addr, get_mem_index(s)); - if (i == rn) { - loaded_var = tmp; - } else { - store_reg(s, i, tmp); - } - } else { - /* store */ - tmp = load_reg(s, i); - gen_aa32_st32(s, tmp, addr, get_mem_index(s)); - tcg_temp_free_i32(tmp); - } - /* advance to the next address */ - tcg_gen_addi_i32(addr, addr, 4); - } - } - if ((insn & (1 << rn)) == 0) { - /* base reg not in list: base register writeback */ - store_reg(s, rn, addr); - } else { - /* base reg in list: if load, complete it now */ - if (insn & (1 << 11)) { - store_reg(s, rn, loaded_var); - } - tcg_temp_free_i32(addr); - } - break; - } case 13: /* conditional branch or swi */ cond = (insn >> 8) & 0xf; diff --git a/target/arm/t16.decode b/target/arm/t16.decode index 71b3e8f02e..a7a437f930 100644 --- a/target/arm/t16.decode +++ b/target/arm/t16.decode @@ -26,6 +26,7 @@ &ri !extern rd imm &ldst_rr !extern p w u rn rt rm shimm shtype &ldst_ri !extern p w u rn rt imm +&ldst_block !extern rn i b u w list # Set S if the instruction is outside of an IT block. %s !function=t16_setflags @@ -109,3 +110,10 @@ LDR_ri 10011 ... ........ @ldst_spec_i rn=13 ADR 10100 rd:3 ........ imm=%imm8_0x4 ADD_rri 10101 rd:3 ........ \ &s_rri_rot rn=13 s=0 rot=0 imm=%imm8_0x4 # SP + +# Load/store multiple + +@ldstm ..... rn:3 list:8 &ldst_block i=1 b=0 u=0 w=1 + +STM 11000 ... ........ @ldstm +LDM_t16 11001 ... ........ @ldstm