From patchwork Wed Aug 28 19:03:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172418 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1179860ily; Wed, 28 Aug 2019 12:14:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7PDmoHAdy5ApQICTbPqgeF83v9LNX3qxjvTXQ6Ld4Ez1qWdjT+319jqclSqrRDunN09cX X-Received: by 2002:a0c:d1d3:: with SMTP id k19mr4214386qvh.6.1567019674762; Wed, 28 Aug 2019 12:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567019674; cv=none; d=google.com; s=arc-20160816; b=0FCZLPCgFiv7in6hLckLDAZ5qAV+803gxlzYVxwMGDMMVflSHw0+wy+v4skAzDD3vS vOelWs/ucWBUQAQOfZec9Fp+qTBP0uofb5xIjNLv2ZRdhXXBexAMEggET44PLGXHbh3V nslI5bawsyL8mqjfOzQcqQPYhQUax0P63hjsoBLcPMrrRsxMkERRJi5MQ483voiMB1Ez x/7lDnp/GkxNUBD46v5lr6wgNPLBMMsH89gq51cTXMMhP+DQ0+x4TeAOcAJMUYXghyb5 AbUhL8URvVO+VE8N4qaiQWpDLfnyLQwHd4SXsH5/GqQviFyCpt6J1ys7OKc/JSxy4fRV 5Pjg== 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=b8pLyu80ByK5bjQKITtTY/uW/k9pGohqmOEr3RJeigk=; b=Rf8ubVb5rEo2e5lRW/oeH//kPt6lbOonLYKYXVJLGusRrTxzLkjs3BloYGdSq5rzcX XjAoFtYQgol349EF89NhYkEePivTFqcJ8kAc1edcabNVqrZ4nWb3dTlhSJy/6CJbnHvC 3jvBHRxAfcuq+yjwGy+pNn8Am3Yh47I81b69mfHDzn2wCBjNKLtldWBlAcxDLmRoMjDB hlqB9qSJ6XI1yWXiT2zZjoZyBVRFgQrci0/rbpuFLBEcoVUiJg4Qdw8ywUgC5gX1dQA5 dc6O23Len+0fj+EKmLKeYgKRyQvni4Wyfmt+ZTyF/DzwD2FrkRhcF/Wzp9+U774F6486 SQhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FK+sZt64; 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 l52si40461qtl.141.2019.08.28.12.14.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 12:14: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=FK+sZt64; 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]:41000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Or-0003dK-JX for patch@linaro.org; Wed, 28 Aug 2019 15:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37700) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Fy-0003HZ-ON for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33Fs-0008LO-PG for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:22 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:35769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33Fs-0008Kq-Bn for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:16 -0400 Received: by mail-pf1-x442.google.com with SMTP id d85so404543pfd.2 for ; Wed, 28 Aug 2019 12:05:16 -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=b8pLyu80ByK5bjQKITtTY/uW/k9pGohqmOEr3RJeigk=; b=FK+sZt64dEgio/3pfoLpi9DL1F7YWE2P0LT0q7GfMrJcc65LpUG8DrZY6oaTE/fGzn aEmhpu5MdgiiioBXKwHWmqDPAIJCQK1gtGZkpLEb7kqWx7Spx/1GOpFOZIgDj3vLHrEB eXVJB3QihgfgB81V7RIHdHIHXDg4SNHkRCzzEpOM2JlguN0dlFspFc2T0XhUf3glOHKl iA6m43zFnFbIgPTgN0BUcNYHBqYbTrKR/CY7lJer0Mz7YE835Hy3UGCIqHhQZAr0qfHk oA43UyOHhXPCtDV1StI4126QAkquj8b4N/94L0DHrWhfhC5OuAI/OfXlqhSwYxdRkuEd wChw== 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=b8pLyu80ByK5bjQKITtTY/uW/k9pGohqmOEr3RJeigk=; b=qsg6EHgQeNrjJxkdjKZkGHwPH69k8euYRv4XvPSpmomY/pXQ2SJcce7urI1FOvI6Qa uDZzmzK+RqUtWUQVGaYNQ2edFfeOmQkKCTuJolv0tpXchXKXJ26XusgphB/psD/SIgDy oyi3lhSpyHNE5U8DxHRw7+baxJi1Vp+bN7bcjm8WN3AEm6ElMhDaxSmaaoBI+oGaUNAf gKnEfYgSe0PcXqqrR/RE1UcAEr7Vn9u+/c0lo44lT5GzpfQvANcfI+wzEsJsDfRjo/26 HdtXP4kMyno0tZWNizZiK41aYaOv95xEXD4ZrqM9yeiFIvmd3cafTEZ9r3+s7TR0kObA RlaA== X-Gm-Message-State: APjAAAW6LRifG9WV0oAgvOFyUZzbNBiYbPISjSjshQ17zxj6/AiA7aT0 EM4QyTmEf4Yfqa/7hfLuN+NAsxGt5ec= X-Received: by 2002:a63:5945:: with SMTP id j5mr4740469pgm.452.1567019114863; Wed, 28 Aug 2019 12:05:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:03:59 -0700 Message-Id: <20190828190456.30315-13-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::442 Subject: [Qemu-devel] [PATCH v3 12/69] target/arm: Convert MSR (immediate) and hints 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 | 60 +++++++++++++++++++++++++++++------------- target/arm/a32.decode | 25 ++++++++++++++++++ target/arm/t32.decode | 17 ++++++++++++ 3 files changed, 84 insertions(+), 18 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index fad07499d2..d1599db2df 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8256,6 +8256,44 @@ DO_SMLAWX(SMLAWT, 1, 1) #undef DO_SMLAWX +/* + * MSR (immediate) and hints + */ + +static bool trans_YIELD(DisasContext *s, arg_YIELD *a) +{ + gen_nop_hint(s, 1); + return true; +} + +static bool trans_WFE(DisasContext *s, arg_WFE *a) +{ + gen_nop_hint(s, 2); + return true; +} + +static bool trans_WFI(DisasContext *s, arg_WFI *a) +{ + gen_nop_hint(s, 3); + return true; +} + +static bool trans_NOP(DisasContext *s, arg_NOP *a) +{ + return true; +} + +static bool trans_MSR_imm(DisasContext *s, arg_MSR_imm *a) +{ + uint32_t val = ror32(a->imm, a->rot * 2); + uint32_t mask = msr_mask(s, a->mask, a->r); + + if (gen_set_psr_im(s, mask, a->r, val)) { + unallocated_encoding(s); + } + return true; +} + /* * Legacy decoder. */ @@ -8529,21 +8567,9 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } store_reg(s, rd, tmp); } else { - if (((insn >> 12) & 0xf) != 0xf) - goto illegal_op; - if (((insn >> 16) & 0xf) == 0) { - gen_nop_hint(s, insn & 0xff); - } else { - /* CPSR = immediate */ - val = insn & 0xff; - shift = ((insn >> 8) & 0xf) * 2; - val = ror32(val, shift); - i = ((insn & (1 << 22)) != 0); - if (gen_set_psr_im(s, msr_mask(s, (insn >> 16) & 0xf, i), - i, val)) { - goto illegal_op; - } - } + /* MSR (immediate) and hints */ + /* All done in decodetree. Illegal ops already signalled. */ + g_assert_not_reached(); } } else if ((insn & 0x0f900000) == 0x01000000 && (insn & 0x00000090) != 0x00000090) { @@ -10480,9 +10506,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) goto illegal_op; break; case 2: /* cps, nop-hint. */ - if (((insn >> 8) & 7) == 0) { - gen_nop_hint(s, insn & 0xff); - } + /* nop hints in decodetree */ /* Implemented as NOP in user mode. */ if (IS_USER(s)) break; diff --git a/target/arm/a32.decode b/target/arm/a32.decode index 19d12e726b..3d5c5408f9 100644 --- a/target/arm/a32.decode +++ b/target/arm/a32.decode @@ -22,6 +22,7 @@ # All insns that have 0xf in insn[31:28] are in a32-uncond.decode. # +&empty &s_rrr_shi s rd rn rm shim shty &s_rrr_shr s rn rd rm rs shty &s_rri_rot s rn rd imm rot @@ -152,3 +153,27 @@ SMULBB .... 0001 0110 .... 0000 .... 1000 .... @rd0mn SMULBT .... 0001 0110 .... 0000 .... 1100 .... @rd0mn SMULTB .... 0001 0110 .... 0000 .... 1010 .... @rd0mn SMULTT .... 0001 0110 .... 0000 .... 1110 .... @rd0mn + +# MSR (immediate) and hints + +&msr_i r mask rot imm +@msr_i ---- .... .... mask:4 .... rot:4 imm:8 &msr_i + +{ + { + YIELD ---- 0011 0010 0000 1111 ---- 0000 0001 + WFE ---- 0011 0010 0000 1111 ---- 0000 0010 + WFI ---- 0011 0010 0000 1111 ---- 0000 0011 + + # TODO: Implement SEV, SEVL; may help SMP performance. + # SEV ---- 0011 0010 0000 1111 ---- 0000 0100 + # SEVL ---- 0011 0010 0000 1111 ---- 0000 0101 + + # The canonical nop ends in 00000000, but the whole of the + # rest of the space executes as nop if otherwise unsupported. + NOP ---- 0011 0010 0000 1111 ---- ---- ---- + } + # Note mask = 0 is covered by NOP + MSR_imm .... 0011 0010 .... 1111 .... .... .... @msr_i r=0 +} +MSR_imm .... 0011 0110 .... 1111 .... .... .... @msr_i r=1 diff --git a/target/arm/t32.decode b/target/arm/t32.decode index 122a0537ed..ccb7cdd4ef 100644 --- a/target/arm/t32.decode +++ b/target/arm/t32.decode @@ -19,6 +19,7 @@ # This file is processed by scripts/decodetree.py # +&empty !extern &s_rrr_shi !extern s rd rn rm shim shty &s_rrr_shr !extern s rn rd rm rs shty &s_rri_rot !extern s rn rd imm rot @@ -166,3 +167,19 @@ QADD 1111 1010 1000 .... 1111 .... 1000 .... @rndm QSUB 1111 1010 1000 .... 1111 .... 1010 .... @rndm QDADD 1111 1010 1000 .... 1111 .... 1001 .... @rndm QDSUB 1111 1010 1000 .... 1111 .... 1011 .... @rndm + +# Branches and miscellaneous control + +{ + YIELD 1111 0011 1010 1111 1000 0000 0000 0001 + WFE 1111 0011 1010 1111 1000 0000 0000 0010 + WFI 1111 0011 1010 1111 1000 0000 0000 0011 + + # TODO: Implement SEV, SEVL; may help SMP performance. + # SEV 1111 0011 1010 1111 1000 0000 0000 0100 + # SEVL 1111 0011 1010 1111 1000 0000 0000 0101 + + # The canonical nop ends in 0000 0000, but the whole rest + # of the space is "reserved hint, behaves as nop". + NOP 1111 0011 1010 1111 1000 0000 ---- ---- +}