From patchwork Mon Feb 11 01:08:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157961 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2067741jaa; Sun, 10 Feb 2019 17:29:24 -0800 (PST) X-Google-Smtp-Source: AHgI3IbpjDQNjN6Ek/h2+Yo2e9oiFwtwGT82R7w9WPZ0rk3e7svuP4cmhw+I2p1WJmO1QEqsWJiE X-Received: by 2002:adf:9061:: with SMTP id h88mr24937709wrh.65.1549848564715; Sun, 10 Feb 2019 17:29:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549848564; cv=none; d=google.com; s=arc-20160816; b=M1yx5hJayp1F+016obzBPgvhvE3gPxX2miOmWUUZt+V0ZAIQG+ZVFyCrJjA+6OGLsq ymjJYuZoZilKCKIGpy5JkD66r2I2CrjQw5sYpruWjnRSIg7/xlRFZ1+ZXhOtjdKc5a0k H9RXHULWAHFoddCiAhyT4Q6nDmWpzSs4fu6lORadI0pe5u99aL8CRdvwHQtoWuGRUa+B 3fj6RmbMCnJYob+Nbltze30MyozJ5V4AezdMMfJEkuvCmUdLk+sYngc8j/qYH3+nFb2s vfjq4IHQ8QW5SKO1iqMDqOnzl7PAft3stFY8RBVQQNBY8zDAUe/Y9kQ/nBB7M404Buws 3qQw== 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=WSCoDwSU+P+38revDmJNxYHnEDDbY09xYDeZCaGFSLU=; b=dnrElCrjYpFuPz8Wpbi1iqSiCsPiWzRgElXOENICmUgCB3zv8Y6dGiD5Htry0aeoP/ mTWwdOf/krHiCmSFt0Ual9vebV6hcngyx2TsKfVaglNEUJDRp0jU4+BnJLMF0+p9nhK+ pYjyoI9mxLGUOO2JSA+UbtlTQ9b3F9U0DqxMlVMOnpfshoEAsXxMvy1RlYoTJTooYSNn YbdSKgP8YzFEeuulMQf2WBxjIO4hwmnc86kE/I+pkl0l/SITWNmSIAYOrqLGzQNx87ZG q6WzE/StFsYaMRESYIaAY4m4/bjOH5eLpXugfK7lfMufajZ7jeCSOinGLGernRjwviX5 I/Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mgEUH07+; 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 h6si6328697wre.120.2019.02.10.17.29.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 10 Feb 2019 17:29:24 -0800 (PST) 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=mgEUH07+; 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 ([127.0.0.1]:42372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gt0PT-0003zb-KR for patch@linaro.org; Sun, 10 Feb 2019 20:29:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gt05r-0005se-MU for qemu-devel@nongnu.org; Sun, 10 Feb 2019 20:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gt05q-00005H-Lx for qemu-devel@nongnu.org; Sun, 10 Feb 2019 20:09:07 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:38625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gt05p-0008E1-QP for qemu-devel@nongnu.org; Sun, 10 Feb 2019 20:09:06 -0500 Received: by mail-pl1-x641.google.com with SMTP id e5so4510630plb.5 for ; Sun, 10 Feb 2019 17:08:48 -0800 (PST) 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=WSCoDwSU+P+38revDmJNxYHnEDDbY09xYDeZCaGFSLU=; b=mgEUH07+T6/yfcpLmIiF6eKwKl0sBjjjIKOsAXfQiIkXUtD5F1vHrMSs9WCVe0wKFX M3CAfQNXb9F9Eji9STUyno1L2kEIQipPUjP06t3QOJX5h1RbXlZYo3JxDHYGk1VsWbbP BukK1z/5yJs10SSJj2ViDuDqIhXqMGqEStw02J2T8t9x8oECWU/Wgk3TA5Sws9GZmQwb J9Mrpb+X2ewO4pnkojPO12lymQp/4HSuitK0+tcrJ2RUvL35MyOTJwbGzx3+FAJZXjvb LZTbcEsE4uHF85txTVW1DWU3suJO8aPshvy0a8LYqJQ+0EuRCQ7ktqJ6DXqwYZqqswz5 dccA== 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=WSCoDwSU+P+38revDmJNxYHnEDDbY09xYDeZCaGFSLU=; b=rgeZE+R3mSLb0KmK27veFOgMhI0V8IvGIDuS1R1DT4RfPLPL+IN19c7M9bTHru7GLN RqOiNLEnQzn/pyfKwmX9yQtWGD+Amr4y5T7F8yC/g2jEAXry/tI69lIjfdZuftV6Fl/o S1gRZrlah4ABou0Ito6kgIZxrn/69ELj9kWhl5+5lkKZQ1aer9vImF7fnlVLAxhPngne /QsNMya+J4xv26N9WNhXtUdbkWPIFW23IWcDTKqZwRS3tmrVDZM9BdzjUj1Rp45sm7u1 G8IPuVVRYO6IIj6daDK+gtSsurUXfpdEi+2M3J9JCpANDYiIWks6P2KhFC3rjrtdD7lZ Vwog== X-Gm-Message-State: AHQUAuYt/M+WQhK2z3vdre1IjMqK/HRV8DMe+owC3TW40DECgxbiAjRh Cihq9Qzpca1dpsGRnKQpu8AnT+JhvkU= X-Received: by 2002:a17:902:e090:: with SMTP id cb16mr20567029plb.32.1549847327850; Sun, 10 Feb 2019 17:08:47 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id g14sm17177630pfg.27.2019.02.10.17.08.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Feb 2019 17:08:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 10 Feb 2019 17:08:15 -0800 Message-Id: <20190211010829.29869-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190211010829.29869-1-richard.henderson@linaro.org> References: <20190211010829.29869-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::641 Subject: [Qemu-devel] [PATCH v2 12/26] target/arm: Implement the GMI instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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/helper-a64.h | 1 + target/arm/mte_helper.c | 6 ++++++ target/arm/translate-a64.c | 6 ++++++ 3 files changed, 13 insertions(+) -- 2.17.2 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 47577207b2..ef340cb6f9 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -107,3 +107,4 @@ DEF_HELPER_FLAGS_2(mte_check, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(irg, TCG_CALL_NO_RWG, i64, env, i64, i64) DEF_HELPER_FLAGS_4(addg, TCG_CALL_NO_RWG_SE, i64, env, i64, i32, i32) DEF_HELPER_FLAGS_4(subg, TCG_CALL_NO_RWG_SE, i64, env, i64, i32, i32) +DEF_HELPER_FLAGS_2(gmi, TCG_CALL_NO_RWG_SE, i64, i64, i64) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 3eb5d622fc..fc9e172c95 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -234,3 +234,9 @@ uint64_t HELPER(subg)(CPUARMState *env, uint64_t ptr, return address_with_allocation_tag(ptr - offset, rtag); } + +uint64_t HELPER(gmi)(uint64_t ptr, uint64_t mask) +{ + int tag = allocation_tag_from_addr(ptr); + return mask | (1ULL << tag); +} diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 3d71a9701f..2e0d797294 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5158,6 +5158,12 @@ static void disas_data_proc_2src(DisasContext *s, uint32_t insn) gen_helper_irg(cpu_reg_sp(s, rd), cpu_env, cpu_reg_sp(s, rn), cpu_reg(s, rm)); break; + case 5: /* GMI */ + if (sf == 0 || !dc_isar_feature(aa64_mte_insn_reg, s)) { + goto do_unallocated; + } + gen_helper_gmi(cpu_reg(s, rd), cpu_reg_sp(s, rn), cpu_reg(s, rm)); + break; case 8: /* LSLV */ handle_shift_reg(s, A64_SHIFT_TYPE_LSL, sf, rm, rn, rd); break;