From patchwork Wed Aug 28 19:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172450 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1210865ily; Wed, 28 Aug 2019 12:43:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqw13Ja86t3wdrk8dRL75WwINCjWu3Gk1l3FgTtr/NbPX4ssXihl03qRjluE90rbYng2+ndc X-Received: by 2002:ac8:5383:: with SMTP id x3mr4845285qtp.344.1567021425752; Wed, 28 Aug 2019 12:43:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567021425; cv=none; d=google.com; s=arc-20160816; b=hv5nKZ+5kEtEEtmeq8hmAClDdwP98FKIjHQ/v+NNwAYVS95aB6Nlax10+BUUhMubLZ mMwSabbOLrwn8990Y6WBLKU2Ey0MWu5NMBQiZ0psQ1qgmC4Z+O+uIXjZeiHAlks6dgmI QpzxloMf3dCqYawBQV8N/+qF2kkVSAjyhToCfxdr8iHIBeMoy7Uj8VbZCS1pO9QGqLGI 02QaeATEGLFeDdgLGME5qVygnTgDagpAggZ51FPhsqPpdvTXzCp/bO9xntSQUTCFNt3x eU1WJv6b6Ztmq+YgmIUxTjBRNlhshb5ZbPo5s4FeCMaxlYXUPznknqGvYhXsIqj2jRzO ecrA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=U00Zb093z+hXOMnaNizAdzZJk8lMkRiGoOKwHfvrSvk=; b=LdL+Bvly+9ejIsq2Zjc3T2N8lQeKLIKRQ8UHOvGiEhzlVi9tVgJLn30VCX525zeLdk 6VevPu3Ceu+KbNPWpdsEdwa+dehB6qft3+m9l/Qd9SzrE+Yn6cgxanrD9rcv0gAfCJtt xVWUR0hc6ygoQmwXv+0YMf1xagdk/Xn1xmvUd+6hpS/GL3j06i1B7HkBoELVCyLEyXoy /viG+zsBwufj44Uqgnk3+3MN2pEouJN6ocM5R+0OJXetcjAOXQihoIwDGW0zqrIlzh50 iGo/MS49YPq7Q5cwyV6PDrUHOGjPm4X9r5qdP+N8QXpBivBhc/+4Fpu5iYOuTDKgGq62 muaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OyOOI8lX; 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 x125si239160qke.216.2019.08.28.12.43.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 12:43:45 -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=OyOOI8lX; 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]:41538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33r6-0006d4-Rh for patch@linaro.org; Wed, 28 Aug 2019 15:43:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38263) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33GV-0003oG-03 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33GS-0000P1-Vp for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:54 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:38454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33GS-0000Ms-GI for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:52 -0400 Received: by mail-pf1-x442.google.com with SMTP id o70so392768pfg.5 for ; Wed, 28 Aug 2019 12:05:50 -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 :mime-version:content-transfer-encoding; bh=U00Zb093z+hXOMnaNizAdzZJk8lMkRiGoOKwHfvrSvk=; b=OyOOI8lXMBHwRm2Akw2bT40UBK9uvuraCgICZ2ejQoxP1HWKfw4W+9+YhQKKRBNgrS RukDgSM3RI8Lg4TW4WqhbO69lv6URPRPtlG57CHgeyiyR2weaonlx7eiOzUlO7fdcqnr 3qIiN7x+fhpdCiP5HDBr/drzH4QRRKfihta2+iYeHpP0rP93cmmZuPfG2auf8yP/E2N8 4MJFqUTL5/RPN7jbFDbH527THyMZt2VeCemXgZTl714h3kj4rpjpHgPf+HCtF8i/c537 fzqc9jrsZRAgzsekFTz9JmE+iE/UFPCVzIGYaT7aJK3blR5yjphoYdjeEaPw32pTkep1 e3DA== 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:mime-version:content-transfer-encoding; bh=U00Zb093z+hXOMnaNizAdzZJk8lMkRiGoOKwHfvrSvk=; b=hi21YRmLrq0W1fF7KUXrYeO9cOExNlNrp5ovAWaLrsMLdWTh/4kxQv9lzgwczjbSJ4 7yhIsmiOMWHACi+kh3xxpTgDrJOkccUzanMIK6JV2QadwPUu7Ua0ftGe9lF2kDY4nqez ioKGLuaPTTjkxgVJSx2qAJ7nTKB0d9cwBr1IzfhJ2gJs5uxNpIMrneR5xCtYhUn6x3zz 9NhIrH1XkG8i4ruMBGmIyYr9iJ5DDUYSW9pyKiTJUKFPqwBwh2Tcz81CeWQDx4puywDb R/zk9SMBBi05i816PNw1uoZX4B9dgGRdVfm93mXwJ/h2/UvAV+55yB2o/suRN7G6brzb dg0Q== X-Gm-Message-State: APjAAAUkfUqWPdN5s4zrij7Yh2KKdX0LXJjPQEnJZxyyqOzjPqP+T8FB HdIe5EajvAUdblGq7OYFvMpN08r55vg= X-Received: by 2002:a17:90a:f995:: with SMTP id cq21mr5895568pjb.27.1567019148754; Wed, 28 Aug 2019 12:05:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:25 -0700 Message-Id: <20190828190456.30315-39-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> MIME-Version: 1.0 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 38/69] target/arm: Convert PLI, PLD, PLDW 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: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/translate.c | 37 +++++++++++++++++++----------------- target/arm/a32-uncond.decode | 10 ++++++++++ 2 files changed, 30 insertions(+), 17 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index f81f369544..c55bd1e563 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10229,6 +10229,26 @@ static bool trans_SETEND(DisasContext *s, arg_SETEND *a) return true; } +/* + * Preload instructions + * All are nops, contingent on the appropriate arch level. + */ + +static bool trans_PLD(DisasContext *s, arg_PLD *a) +{ + return ENABLE_ARCH_5TE; +} + +static bool trans_PLDW(DisasContext *s, arg_PLD *a) +{ + return arm_dc_feature(s, ARM_FEATURE_V7MP); +} + +static bool trans_PLI(DisasContext *s, arg_PLD *a) +{ + return ENABLE_ARCH_7; +} + /* * Legacy decoder. */ @@ -10289,23 +10309,6 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } return; } - if (((insn & 0x0f30f000) == 0x0510f000) || - ((insn & 0x0f30f010) == 0x0710f000)) { - if ((insn & (1 << 22)) == 0) { - /* PLDW; v7MP */ - if (!arm_dc_feature(s, ARM_FEATURE_V7MP)) { - goto illegal_op; - } - } - /* Otherwise PLD; v5TE+ */ - ARCH(5TE); - return; - } - if (((insn & 0x0f70f000) == 0x0450f000) || - ((insn & 0x0f70f010) == 0x0650f000)) { - ARCH(7); - return; /* PLI; V7 */ - } if (((insn & 0x0f700000) == 0x04100000) || ((insn & 0x0f700010) == 0x06100000)) { if (!arm_dc_feature(s, ARM_FEATURE_V7MP)) { diff --git a/target/arm/a32-uncond.decode b/target/arm/a32-uncond.decode index 32253b4f9a..ddc5edfa5e 100644 --- a/target/arm/a32-uncond.decode +++ b/target/arm/a32-uncond.decode @@ -54,3 +54,13 @@ SB 1111 0101 0111 1111 1111 0000 0111 0000 # Set Endianness SETEND 1111 0001 0000 0001 0000 00 E:1 0 0000 0000 &setend + +# Preload instructions + +PLD 1111 0101 -101 ---- 1111 ---- ---- ---- # (imm, lit) 5te +PLDW 1111 0101 -001 ---- 1111 ---- ---- ---- # (imm, lit) 7mp +PLI 1111 0100 -101 ---- 1111 ---- ---- ---- # (imm, lit) 7 + +PLD 1111 0111 -101 ---- 1111 ----- -- 0 ---- # (register) 5te +PLDW 1111 0111 -001 ---- 1111 ----- -- 0 ---- # (register) 7mp +PLI 1111 0110 -101 ---- 1111 ----- -- 0 ---- # (register) 7