From patchwork Fri Jul 26 17:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 169897 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp360220ilk; Fri, 26 Jul 2019 10:58:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxM2l4EJE9qvUTI6mSciXkFAhCnAOqX2q3WCB7XxokCSQbmFkMzRRwnkGL4m1QQ/bgnrwZA X-Received: by 2002:a0c:9332:: with SMTP id d47mr67714910qvd.222.1564163888829; Fri, 26 Jul 2019 10:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564163888; cv=none; d=google.com; s=arc-20160816; b=goqnLWJLe2/omeauUE31cyQdqZO2KihAIIHtyL/vv/cbITYEXJCiFW6LAbRr1D/wNB uYtTfNuhDSX24x/fCOnGfY2AeDsrETi43QtzGLgp+a6V9ccPAdIW24i4CWmjsPE1IXh3 LW0XqM1LgjgyFJTkjixebDAuSRAo9KqdnmAivfy1VRXAD8V3Ck75nyEj2W3EyhT42yct y/7yHlpL6hMeSlNO4QOviaYsXSDRhSHBr+1AYlV1X/POLU+X+4sWryrgm1K1tuirSJEb kEKTwAKhJI5mIiljO005AdRm7mXWLSsLne5WgfQdSS8be1toktF+yd5k6IKYjMeSWcuN 9FCg== 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=BTtAZNtC5LEslFth4SXf60p+WzB9yMjQ3jwBVq1HIi4=; b=FymxdagqPQwMAYEet8vHU0q5TqgiICVXf1nuaF6D1V9A94fjJ1KKkNRFqdepUhNIK/ rKldQrkAJrecCMZfo+7cjU9x8s4hL5R6QGBkM7sdqcMR98OwG8uICoZTvJcP0dr0lucZ OOpgLt8isutQbJPAJxl3OZXkT38bVD3nxtHANBd//EyBVK4souA5hBeONaj9oQKV2HTb 2TigJGEtsaMYzqwCc3JTi1IwUkw0e5XbmBryJGrwfsKtXGVLsAMz6sX+0zLycP3R46Kf +m5VdZCaibW8UzmrZWjOEv0gQKKlgxraX5St1xZmyDUwKDZ5AVae+grKGogeYSHfLmuc hoOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P9xCZVJS; 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 a38si34432991qvd.50.2019.07.26.10.58.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jul 2019 10:58:08 -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=P9xCZVJS; 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]:42464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Tm-0007nJ-2I for patch@linaro.org; Fri, 26 Jul 2019 13:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59095) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Nb-0005oT-Dn for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr4NT-0000v4-7M for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:38 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:39540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr4NR-0000qm-Vh for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:35 -0400 Received: by mail-pl1-x643.google.com with SMTP id b7so25061441pls.6 for ; Fri, 26 Jul 2019 10:51:33 -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=BTtAZNtC5LEslFth4SXf60p+WzB9yMjQ3jwBVq1HIi4=; b=P9xCZVJSzzPbFwt0skLMTpo8XnRqYGuhw2eh9OeVGkUmwz70l2P48a8hNEpssL939P cD+1uSa2ZfLb+9AUrt85qbbGF3dQk06EazdGaBc0ekb9rnlyvujhFs157VEQceB7ijdT w8cuD4WpDWzftv3dtWezARrsm04RKbDv94SfS9dEVdgkLGnyuBlb2Xp5TKVLy4SEO0if a+igRl3ht4NxL1Wo2vopl7KFJaYW1cZEakz2h6t0QprPt/uqs802fXE1Qq8RD2kDPkw1 cs35MLeu7axsUcn43OUGOSb8wvwiv2G8zjTpTt8oD1HF8pvClicJx8JJrrP4x3Rr9lhY AjKw== 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=BTtAZNtC5LEslFth4SXf60p+WzB9yMjQ3jwBVq1HIi4=; b=NT8CtqEDA+4dt2STkzCo6mCQ4LxbgrtscadHsB7LVOJnUY4+cnaf8RNnXH1OSrEE/S +6Ve/qIzLV1V0HGekn1L2gi36A0MSWmM6tSwivffMjmn2r3Aj5e/vNhDXO7kWMlG5Oge j41LzXPQNfJeLn57rmmPDhs/Y02Aa6eSWPCzcIF7lR3p7CQKv0xi6F7br0L39wingA2o og15NYwNEzZ6yIOW0wyOx+w4O/11fIfp/yMHp8vwO+Kg81s11Ve9MSTJgyrIfz4vr7EU CaqZB2sADXErglNNQc1btMRX5rzbOzox62N5GDvRP0pUHNXrvP+qT2fndIKEQRpwMQxV gp3Q== X-Gm-Message-State: APjAAAW3FLg4Ok6lMKvR2U+hP1WN9nrHX3LqD7lCfHQRY6y4UVdTQv5x zMnjw36s2wBxytCjkwTDkFBqAY9Mnsk= X-Received: by 2002:a17:902:424:: with SMTP id 33mr17653195ple.151.1564163492748; Fri, 26 Jul 2019 10:51:32 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id o24sm104287919pfp.135.2019.07.26.10.51.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 10:51:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:50:13 -0700 Message-Id: <20190726175032.6769-49-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726175032.6769-1-richard.henderson@linaro.org> References: <20190726175032.6769-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::643 Subject: [Qemu-devel] [PATCH 48/67] 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, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/translate.c | 47 +++++++----------------------------------- target/arm/t16.decode | 8 +++++++ 2 files changed, 16 insertions(+), 39 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index 525276ed13..f551fde3db 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9988,6 +9988,13 @@ static bool trans_LDM(DisasContext *s, arg_ldst_block *a) return true; } +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)); + return trans_LDM(s, a); +} + /* * Branch, branch with link */ @@ -10759,6 +10766,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: @@ -10984,45 +10992,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 568656ecd6..67476b30dc 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