From nobody Thu Apr 25 23:33:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602919009; cv=none; d=zohomail.com; s=zohoarc; b=Bb5DchJfpMsprWlr/s6QQY8dQC//ozc8OIxvYYPgKRbyUbBMN3qi4VeDa445PUy+FoZtcT0+C5AryQ3B4E49Pq0gKBu16kPgC3mxF7X1tG8rIJn/R25HW/uxrgNMFdOzCdCXLxV7iBF5m9o09pnKrcITz8PVMGsOe2SLw37Iznc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602919009; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=aJ0KQb6Ozzm+TKAEStsx77t+LpGGqIZVP5UuxdMy3MY=; b=LhNi6yerqi8BOTytFFbH5Dc+T3XZmlo+XrflILAkhXYl5AQNQjWGD6HBd6l9FaaXv+cR+3p8qQzvfVihDm2Y5FkFNlAjWyLjEpmicpFXbtD5stgaT6GQXBgmsVuPvJJW1Qt8cM8gR9Xl2FIK2TkTJ3A5ut+3KS97rC4BBKc/bl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160291900902281.06663868270505; Sat, 17 Oct 2020 00:16:49 -0700 (PDT) Received: from localhost ([::1]:47980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTgSN-0007Vz-SN for importer@patchew.org; Sat, 17 Oct 2020 03:16:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTgNr-0002Jh-3f; Sat, 17 Oct 2020 03:12:07 -0400 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:43310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTgNm-0003jk-R6; Sat, 17 Oct 2020 03:12:06 -0400 Received: by mail-lf1-x141.google.com with SMTP id l28so6249025lfp.10; Sat, 17 Oct 2020 00:12:01 -0700 (PDT) Received: from neptune.lab ([46.39.229.194]) by smtp.googlemail.com with ESMTPSA id 184sm1626905lfh.232.2020.10.17.00.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aJ0KQb6Ozzm+TKAEStsx77t+LpGGqIZVP5UuxdMy3MY=; b=sz/cSqdRUIo3p9a3ARPyy1gyI3vyqOtzDF28cgOHtAMJPOj5ARvk63VBLmQEqYQLeK pwXyIDCfSX9y7Be0lq6EkSqvNYieh1xkNKfDav5ej7MNFaf69PfXeoG7DJL1tL2hMwH0 E7rEc6LQIHJmWymMzsKEbIFrLvEN/lhJkGazQYJLjPBqLlSKaqqW1WTASODdD07BuqV0 hk9Jc4/nIdWJmXYu0FcPwG+7+RA0AlFpy8LXwxha1f4dz/6KvFK1gw9PxXBvhaZ2Awx+ OFiSEDzA4Dcqj/Vh4U7YdSEY7Zx5W2G4nHwXeukWKUJVsGZdrmdiPf2zYG73gFbwZhwE X0YA== 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=aJ0KQb6Ozzm+TKAEStsx77t+LpGGqIZVP5UuxdMy3MY=; b=PggjKgQIL/JgnWz0lyMsNJSXdgHEZ+9FKIvYqIdzeyIA3sjrF7BdlIsHk3z7TF0FFp mJa3uFJs4DsxhlgXyK2UIUmVcpbgVuzMFvH1Ib89Zjh022VlYbTuiqTusE65oqCSMgUI kT8OYIOEAzZcwcU26SJFZDLo4wzcu0L4w+/8QyG0hTka7JWmICXNvV4tZq/7cDd1QUbH fwdcxXpM6NMtkW7fkAN0EZOM156pDG5JKQucJmE/pnnvYUHEpuxCjMWzrtELCiqv7IQ/ yi9XM5YE4/XGxfxQKT4deSq395H7+rXr2ZdQ8dLjpYYgVI80wBjouiBhJ7sf/P+oK8Dj ciDQ== X-Gm-Message-State: AOAM532C9l02seOjytIMHYeZwhpkVwZdpLI/D86kEqE+PbPGfpOxzJsP Gaqbp95zK86r57aQZIRbT5k= X-Google-Smtp-Source: ABdhPJyqRAdibYwDaLFbWrD5fgNcWEJuhtqfGMQHIDgJHRDawu9OOBVOuDFnLjPjYI6nvur73xYBEA== X-Received: by 2002:a19:e014:: with SMTP id x20mr2566022lfg.444.1602918720007; Sat, 17 Oct 2020 00:12:00 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v4 1/5] [RISCV_PM] Add J-extension into RISC-V Date: Sat, 17 Oct 2020 10:11:50 +0300 Message-Id: <20201017071154.20642-2-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201017071154.20642-1-space.monkey.delivers@gmail.com> References: <20201017071154.20642-1-space.monkey.delivers@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::141; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x141.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 4 ++++ target/riscv/cpu.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 0bbfd7f457..fe6bab4a52 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -438,6 +438,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) if (cpu->cfg.ext_h) { target_misa |=3D RVH; } + if (cpu->cfg.ext_j) { + target_misa |=3D RVJ; + } if (cpu->cfg.ext_v) { target_misa |=3D RVV; if (!is_power_of_2(cpu->cfg.vlen)) { @@ -516,6 +519,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("u", RISCVCPU, cfg.ext_u, true), /* This is experimental so mark with 'x-' */ DEFINE_PROP_BOOL("x-h", RISCVCPU, cfg.ext_h, false), + DEFINE_PROP_BOOL("x-j", RISCVCPU, cfg.ext_j, false), DEFINE_PROP_BOOL("x-v", RISCVCPU, cfg.ext_v, false), DEFINE_PROP_BOOL("Counters", RISCVCPU, cfg.ext_counters, true), DEFINE_PROP_BOOL("Zifencei", RISCVCPU, cfg.ext_ifencei, true), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index de275782e6..eca611a367 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -66,6 +66,7 @@ #define RVS RV('S') #define RVU RV('U') #define RVH RV('H') +#define RVJ RV('J') =20 /* S extension denotes that Supervisor mode exists, however it is possible to have a core that support S mode but does not have an MMU and there @@ -277,6 +278,7 @@ struct RISCVCPU { bool ext_s; bool ext_u; bool ext_h; + bool ext_j; bool ext_v; bool ext_counters; bool ext_ifencei; --=20 2.20.1 From nobody Thu Apr 25 23:33:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602918825; cv=none; d=zohomail.com; s=zohoarc; b=DqownneWo1BXmemhjB/0rVtXmbCOlgNCD9ipmirxTqTU4VGCSkmEMItSEFB+zCwY3x6CIo9Yjfx7VQ2tWkDkP1qkJUSckDgFmn74tIOeC+ogJxjW4JrjiiGQZMsLZlVAr8Hbr3xc8MwAdBbSI6pxrNyXjVZa7NCjVXrirDnpCSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602918825; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=v+T1jwDj6EpGF1XXTpGcB09J9qdMuIym9xcRJxa50DU=; b=Yda6qWJUF1UQKxIdR5oujrIDXolpEF/WjT/PgkwdMxS8H6v+QREXIsSFJozJk+KmfInocGD+SZlvktslWfuMxP+LVMV+1AmcDtJOhg39vNSh4UFwnI5bqICEFdC3i1BWgPFoiSP4Ysc4+Epbi4IIrPPJV1TOsLyFCMZuwtPMq80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602918825320617.5869476124886; Sat, 17 Oct 2020 00:13:45 -0700 (PDT) Received: from localhost ([::1]:39372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTgPQ-000418-0F for importer@patchew.org; Sat, 17 Oct 2020 03:13:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTgNq-0002Ik-Fp; Sat, 17 Oct 2020 03:12:06 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]:38158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTgNn-0003kB-2V; Sat, 17 Oct 2020 03:12:06 -0400 Received: by mail-lj1-x236.google.com with SMTP id m20so5153173ljj.5; Sat, 17 Oct 2020 00:12:02 -0700 (PDT) Received: from neptune.lab ([46.39.229.194]) by smtp.googlemail.com with ESMTPSA id 184sm1626905lfh.232.2020.10.17.00.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v+T1jwDj6EpGF1XXTpGcB09J9qdMuIym9xcRJxa50DU=; b=cGZtld+1gzuaDIXplGLQC8sn6JKSZgsuKpwTyBqHzlpfZImFUqckiSZUDVBu3XYlTV 3bGjRpEjdDAOfG8FIU0DZbDUvNC1Cmo1jBQ7DJPwfB+e54DAzIVfxYY1YDzPzPX0Dbzu 7Buz+FFyuT7dtZgP7XpOH14Y7HO2Fcjuj4vv2+XmzDGhXHrjaqAVzUSmEoLgH9lhpqsp LF4AgKFW3H1+YsUToW6acx4aFY4mgJ5b96EefYaWmOrAMLQAe6n3YeDkB1YTm5rkouck eP/C/aE8XnZ6Trgfm7Lki8mPChI8YdlgQOf8uTpcVdVpVAAL0dxte8Uob2/BE2PcKzT7 oliQ== 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=v+T1jwDj6EpGF1XXTpGcB09J9qdMuIym9xcRJxa50DU=; b=Ks1VgdylbJIx2mfnjLUenB2PepZJ93alE8ml+X4bPrpprl2/NiPPeE9HW931mADoPg 69Vg3skZjdTWbTbJPLAi+3WX6bRKSmBPw/bOYcbpHsBDS48nquFVFFMDW1NFUffgfPf6 kvVRogXSWPZ4poD33IuhXI4Rb8IYXhvdLV2+wbazuXkWRfhiPGFm4VPT3JvIrNpyKyDq V2+6nJKgjPjH/P8QwFfii/ITVcxLbA0L1uOhL03JrUeeLPo2X7Kz9oN9Z73HhjH8cB/P K3fUDfH15KtD1Km09GPQNXOJ1Xt26GQ6GRe9c47W/92TmIsQE8GZsyctXBQMyjMuXpqB ZNbQ== X-Gm-Message-State: AOAM531iUYGnVo05i0Y/OpKA5H8s5gpU7COi6hFV8T26LR8SyISOgD52 FoEmmybrlPxNyDg5B18yfI0= X-Google-Smtp-Source: ABdhPJy/ejERb9j51kbFpb4xmjDI3zeRFZRL84MJyvILT+yzc27rswFb9stDp6BfL8zWIEZ4BFx6gw== X-Received: by 2002:a2e:8706:: with SMTP id m6mr2982941lji.129.1602918721012; Sat, 17 Oct 2020 00:12:01 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v4 2/5] [RISCV_PM] Support CSRs required for RISC-V PM extension except for ones in hypervisor mode Date: Sat, 17 Oct 2020 10:11:51 +0300 Message-Id: <20201017071154.20642-3-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201017071154.20642-1-space.monkey.delivers@gmail.com> References: <20201017071154.20642-1-space.monkey.delivers@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=baturo.alexey@gmail.com; helo=mail-lj1-x236.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 12 ++ target/riscv/cpu_bits.h | 66 ++++++++++ target/riscv/csr.c | 271 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 350 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index fe6bab4a52..d63031eb08 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -440,6 +440,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) } if (cpu->cfg.ext_j) { target_misa |=3D RVJ; + env->mmte |=3D PM_EXT_INITIAL; } if (cpu->cfg.ext_v) { target_misa |=3D RVV; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index eca611a367..c236f01fff 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -226,6 +226,18 @@ struct CPURISCVState { =20 /* True if in debugger mode. */ bool debugger; + + /* + * CSRs for PM + * TODO: move these csr to appropriate groups + */ + target_ulong mmte; + target_ulong mpmmask; + target_ulong mpmbase; + target_ulong spmmask; + target_ulong spmbase; + target_ulong upmmask; + target_ulong upmbase; #endif =20 float_status fp_status; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index bd36062877..84c93c77ae 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -354,6 +354,21 @@ #define CSR_MHPMCOUNTER30H 0xb9e #define CSR_MHPMCOUNTER31H 0xb9f =20 +/* Custom user register */ +#define CSR_UMTE 0x8c0 +#define CSR_UPMMASK 0x8c1 +#define CSR_UPMBASE 0x8c2 + +/* Custom machine register */ +#define CSR_MMTE 0x7c0 +#define CSR_MPMMASK 0x7c1 +#define CSR_MPMBASE 0x7c2 + +/* Custom supervisor register */ +#define CSR_SMTE 0x9c0 +#define CSR_SPMMASK 0x9c1 +#define CSR_SPMBASE 0x9c2 + /* Legacy Machine Protection and Translation (priv v1.9.1) */ #define CSR_MBASE 0x380 #define CSR_MBOUND 0x381 @@ -604,4 +619,55 @@ #define MIE_UTIE (1 << IRQ_U_TIMER) #define MIE_SSIE (1 << IRQ_S_SOFT) #define MIE_USIE (1 << IRQ_U_SOFT) + +/* general mte CSR bits*/ +#define PM_ENABLE 0x00000001ULL +#define PM_CURRENT 0x00000002ULL +#define PM_XS_MASK 0x00000003ULL + +/* PM XS bits values */ +#define PM_EXT_DISABLE 0x00000000ULL +#define PM_EXT_INITIAL 0x00000001ULL +#define PM_EXT_CLEAN 0x00000002ULL +#define PM_EXT_DIRTY 0x00000003ULL + +/* offsets for every pair of control bits per each priv level */ +#define XS_OFFSET 0ULL +#define U_OFFSET 2ULL +#define S_OFFSET 4ULL +#define M_OFFSET 6ULL + +#define PM_XS_BITS (PM_XS_MASK << XS_OFFSET) +#define U_PM_ENABLE (PM_ENABLE << U_OFFSET) +#define U_PM_CURRENT (PM_CURRENT << U_OFFSET) +#define S_PM_ENABLE (PM_ENABLE << S_OFFSET) +#define S_PM_CURRENT (PM_CURRENT << S_OFFSET) +#define M_PM_ENABLE (PM_ENABLE << M_OFFSET) + +/* mmte CSR bits */ +#define MMTE_PM_XS_BITS PM_XS_BITS +#define MMTE_U_PM_ENABLE U_PM_ENABLE +#define MMTE_U_PM_CURRENT U_PM_CURRENT +#define MMTE_S_PM_ENABLE S_PM_ENABLE +#define MMTE_S_PM_CURRENT S_PM_CURRENT +#define MMTE_M_PM_ENABLE M_PM_ENABLE +#define MMTE_MASK (MMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT | \ + MMTE_S_PM_ENABLE | MMTE_S_PM_CURRENT | \ + MMTE_M_PM_ENABLE | MMTE_PM_XS_BITS) + +/* smte CSR bits */ +#define SMTE_PM_XS_BITS PM_XS_BITS +#define SMTE_U_PM_ENABLE U_PM_ENABLE +#define SMTE_U_PM_CURRENT U_PM_CURRENT +#define SMTE_S_PM_ENABLE S_PM_ENABLE +#define SMTE_S_PM_CURRENT S_PM_CURRENT +#define SMTE_MASK (SMTE_U_PM_ENABLE | SMTE_U_PM_CURRENT | \ + SMTE_S_PM_ENABLE | SMTE_S_PM_CURRENT | \ + SMTE_PM_XS_BITS) + +/* umte CSR bits */ +#define UMTE_U_PM_ENABLE U_PM_ENABLE +#define UMTE_U_PM_CURRENT U_PM_CURRENT +#define UMTE_MASK (UMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT) + #endif diff --git a/target/riscv/csr.c b/target/riscv/csr.c index aaef6c6f20..e4839c8fc9 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -140,6 +140,11 @@ static int any(CPURISCVState *env, int csrno) return 0; } =20 +static int umode(CPURISCVState *env, int csrno) +{ + return -!riscv_has_ext(env, RVU); +} + static int smode(CPURISCVState *env, int csrno) { return -!riscv_has_ext(env, RVS); @@ -1250,6 +1255,257 @@ static int write_pmpaddr(CPURISCVState *env, int cs= rno, target_ulong val) return 0; } =20 +/* + * Functions to access Pointer Masking feature registers + * We have to check if current priv lvl could modify + * csr in given mode + */ +static int check_pm_current_disabled(CPURISCVState *env, int csrno) +{ + int csr_priv =3D get_field(csrno, 0xC00); + /* + * If priv lvls differ that means we're accessing csr from higher priv= lvl, + * so allow the access + */ + if (env->priv !=3D csr_priv) { + return 0; + } + int cur_bit_pos; + switch (env->priv) { + case PRV_M: + /* m-mode is always allowed to modify registers, so allow */ + return 0; + case PRV_S: + cur_bit_pos =3D S_PM_CURRENT; + break; + case PRV_U: + cur_bit_pos =3D U_PM_CURRENT; + break; + default: + g_assert_not_reached(); + } + int pm_current =3D get_field(env->mmte, cur_bit_pos); + /* It's same priv lvl, so we allow to modify csr only if pm_current=3D= =3D1 */ + return !pm_current; +} + +static int read_mmte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & MMTE_MASK; + return 0; +} + +static int write_mmte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & MMTE_MASK; + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "MMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + env->mmte =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_smte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & SMTE_MASK; + return 0; +} + +static int write_smte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & SMTE_MASK; + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "SMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + target_ulong new_val =3D val | (env->mmte & ~SMTE_MASK); + write_mmte(env, csrno, new_val); + return 0; +} + +static int read_umte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & UMTE_MASK; + return 0; +} + +static int write_umte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & UMTE_MASK; + assert(val =3D=3D wpri_val); + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "UMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + target_ulong new_val =3D val | (env->mmte & ~UMTE_MASK); + write_mmte(env, csrno, new_val); + return 0; +} + +static int read_mpmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->mpmmask; + return 0; +} + +static int write_mpmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + env->mpmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_spmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->spmmask; + return 0; +} + +static int write_spmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->spmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_upmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->upmmask; + return 0; +} + +static int write_upmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->upmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_mpmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->mpmbase; + return 0; +} + +static int write_mpmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + env->mpmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_spmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->spmbase; + return 0; +} + +static int write_spmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->spmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_upmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->upmbase; + return 0; +} + +static int write_upmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->upmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} #endif =20 /* @@ -1471,6 +1727,21 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = =3D { [CSR_PMPCFG0 ... CSR_PMPCFG3] =3D { pmp, read_pmpcfg, write_pmpc= fg }, [CSR_PMPADDR0 ... CSR_PMPADDR15] =3D { pmp, read_pmpaddr, write_pmpa= ddr }, =20 + /* User Pointer Masking */ + [CSR_UMTE] =3D { umode, read_umte, write_umte = }, + [CSR_UPMMASK] =3D { umode, read_upmmask, write_upmmas= k }, + [CSR_UPMBASE] =3D { umode, read_upmbase, write_upmbas= e }, + + /* Machine Pointer Masking */ + [CSR_MMTE] =3D { any, read_mmte, write_mmte = }, + [CSR_MPMMASK] =3D { any, read_mpmmask, write_mpmmask = }, + [CSR_MPMBASE] =3D { any, read_mpmbase, write_mpmbase = }, + + /* Supervisor Pointer Masking */ + [CSR_SMTE] =3D { smode, read_smte, write_smte = }, + [CSR_SPMMASK] =3D { smode, read_spmmask, write_spmmask= }, + [CSR_SPMBASE] =3D { smode, read_spmbase, write_spmbase= }, + /* Performance Counters */ [CSR_HPMCOUNTER3 ... CSR_HPMCOUNTER31] =3D { ctr, read_zero = }, [CSR_MHPMCOUNTER3 ... CSR_MHPMCOUNTER31] =3D { any, read_zero = }, --=20 2.20.1 From nobody Thu Apr 25 23:33:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602918836; cv=none; d=zohomail.com; s=zohoarc; b=crctOzTuHgmW4poSHyQaxiU/2RacSsM+fqWayDLyAaPTtB/A2OWpk+IasrkKVgPcuyMhO9NTf7fzJ65mmV+I9VpNL3Aw3RK6JZIm2q8QKu2kwd6qQu09Nv8Zb5JYqRQfpxJNmnB7lmG+cTvktn7k85Ezp9M3KcgmE+Utyfw6Ndk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602918836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=qrQtqAjUROe7fmEpS/MuFCEtm0EhCZVesv3G9r8oUO8=; b=EC8Xmte/wa6TVxDc8niXo/o+GrM8rSwCi0HvDsLvjUdH2994UXcn6xqNjJRRZXGoIiKNoMEmTOoAbfoFekvTP1DD5aMF/OZSlv9456ZZWww8mYzCKxBy2EPiDihxjc/wpnbOqGnExMtK8lE1gjmhbzpbd4rerBN1sXfApGRuDqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602918836924580.7145041585665; Sat, 17 Oct 2020 00:13:56 -0700 (PDT) Received: from localhost ([::1]:39712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTgPX-00049R-Ue for importer@patchew.org; Sat, 17 Oct 2020 03:13:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTgNr-0002K4-G9; Sat, 17 Oct 2020 03:12:07 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:44554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTgNn-0003kH-NO; Sat, 17 Oct 2020 03:12:07 -0400 Received: by mail-lf1-x144.google.com with SMTP id b1so6248953lfp.11; Sat, 17 Oct 2020 00:12:03 -0700 (PDT) Received: from neptune.lab ([46.39.229.194]) by smtp.googlemail.com with ESMTPSA id 184sm1626905lfh.232.2020.10.17.00.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qrQtqAjUROe7fmEpS/MuFCEtm0EhCZVesv3G9r8oUO8=; b=TpPNff02TOxLwWO6oL5lNcgUNqKVWKVMUPXF/A7L9FjENEzL0IzywwJb3pYTmsGJDZ FevJbwY5IzTdB6ijeiWxIJaGfs2aWDEqZXitPXq/XGGETf/KNmMl5aaSkFqxSuu+nUx1 OK9lAnwP8QGA626SF3O1u/CfZnotOdb12r+87ITXYLdtlEzQqwgdbZJ9pO2jujxGxVLO e46CH1ts7erQBoNMXp/kXBuHg/FK0PkxJy7AnqMT+5SVR3cBElY9JlUvIXEQ0u3LsPcG JNwMPr7iF9MTtuUIOEjnX0hSNPN8uBnuaxi9VWEvztkx3HzMUWFWIxgwBDm2+PS6sSI+ OueA== 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=qrQtqAjUROe7fmEpS/MuFCEtm0EhCZVesv3G9r8oUO8=; b=qSflEEmrl5UftfcmlPHwwlPAqfIxZgZJnFfp81NXGriLf1ab4R4IzlazwoA5M+HgxH +4JlPXxMcNKPJ2EI6uQ8pGP/7zHudujpEtkh0ikeiaWs4Q5s8iHaJ+UfnKIrlmQsXd0f LWCmEmWVTCsFVShk1HDhuk+ePDBPjnaTlku56y5dyMqyXAHx+BhLufXcX2IpNxbPjVm1 zur8QbHzHx0An2hqYqB52Y8PT3hDpAKxfj03w1ufImaAve0CK+lSzZoFbC/uXZ0baAEt y2Cd7r3vY2HfQZre2Z+RrPx5YQ99fMfxEaJkwS7Y5yKa25msB56jqqUIm0pDj4f0r/zq FKWg== X-Gm-Message-State: AOAM5327H0nqUL8q1J39dOZxtTAYXealqKQaxLraMBrdFve9RrJJaZ/U 74YlS4WUG6d8y9iPtmFzsuk= X-Google-Smtp-Source: ABdhPJw3odaR8vKrk7K5H/ias+iFy1AuJt3spB3r2aOIl8zFfN6BNTCBTq8jdYpK008Y5XJ523a+hg== X-Received: by 2002:a19:8c17:: with SMTP id o23mr2531938lfd.279.1602918722065; Sat, 17 Oct 2020 00:12:02 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v4 3/5] [RISCV_PM] Print new PM CSRs in QEMU logs Date: Sat, 17 Oct 2020 10:11:52 +0300 Message-Id: <20201017071154.20642-4-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201017071154.20642-1-space.monkey.delivers@gmail.com> References: <20201017071154.20642-1-space.monkey.delivers@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::144; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x144.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d63031eb08..5916ebe5c2 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -255,6 +255,31 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f= , int flags) qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "htval ", env->htval); qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mtval2 ", env->mtval2); } + if (riscv_has_ext(env, RVJ)) { + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mmte ", env->mmte); + switch (env->priv) { + case PRV_U: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "upmbase ", + env->upmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "upmmask ", + env->upmmask); + break; + case PRV_S: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "spmbase ", + env->spmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "spmmask ", + env->spmmask); + break; + case PRV_M: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mpmbase ", + env->mpmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mpmmask ", + env->mpmmask); + break; + default: + assert(0 && "Unreachable"); + } + } #endif =20 for (i =3D 0; i < 32; i++) { --=20 2.20.1 From nobody Thu Apr 25 23:33:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602918836; cv=none; d=zohomail.com; s=zohoarc; b=PA9+wi+NAiJiFd/mU+bAM+kBcGSmaHVo7lC130/hjJc1Y0YqsnYchrvWSNTVp/Fi6TkccQ/wQ3+jr9HU/kBVEiGAmH7T9IAbtGu7uiN5UZb8Di7eo4/x+vB5FIxkqzi/eCfT+GbXKEXLdJ2dqSWPcSNmbxbzyYBOGRAcaOU8Kho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602918836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=YSw2I8wtX3tBYbzwC48//hzgWpRbA6nrFWbZ3XB2KoJYfmEHlBI0YvQJIguTPU5kGX+4BgQE264vffbmzH6uS0EpZd68ewiM964YWWFLubM/9MmhHjTDwoSct7Vsno5r2g6vEWncccZTSLHTBB9qbK+PM/LlFo3GGbL7aGc9+h4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602918836790704.8137706823155; Sat, 17 Oct 2020 00:13:56 -0700 (PDT) Received: from localhost ([::1]:39738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTgPb-00049y-LK for importer@patchew.org; Sat, 17 Oct 2020 03:13:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTgNt-0002La-Ct; Sat, 17 Oct 2020 03:12:09 -0400 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:43311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTgNp-0003lF-6i; Sat, 17 Oct 2020 03:12:09 -0400 Received: by mail-lf1-x141.google.com with SMTP id l28so6249126lfp.10; Sat, 17 Oct 2020 00:12:04 -0700 (PDT) Received: from neptune.lab ([46.39.229.194]) by smtp.googlemail.com with ESMTPSA id 184sm1626905lfh.232.2020.10.17.00.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=ji0W6mX2C5dsWJ5Jc4KfU5qN8J6valFn9cIH20BjDlia5PNJjOhrCGrfWeXN5QHwM0 ZhZrdSKr+ZsVzh4jiOtxo6WRzILemChReCige29ftJwybtbT6C5Y19ACH7IL7JvAb0ej LrWC2SsNtmI7PKofJwacknEjjyKjPxf+Gtw5PXxjB/u5OU/11V6TErF2OzhUezv+Vx9p TvcgkIVqNstd2CjjQkMV6IQqu5EsgatZQ4pIF9Wh6PLgHQCW/jXNfgavN9kZ81uCgls2 pysWH9myzUJGLWNZUtxSsNi+Kc2E9qpYtzkiFBH5w96kPYFCr8B0brhDkSklCN5G5Z3+ BZDA== 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=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=mCSM47wAZ1w5r8yzVhVtofM3UM//AZRGexTJklAWhycsmIWYjbN6UdWdK/AgUFnsiq pbRvtSjLt07kvmpnu9gqnlJz8lLJeENcDaSgX9e1TzW5QVVVOE6ZMcE5iW1ND4pYEj1a CBQ4zmsisb/967S7+8n/T/YfqSyo0i369pv3jtohZ/c9v8dfgoNiE0mGwzPtvLa/76Hr 24r6K2JEQzxn0qJP9ivt28V8IuloNocdOU0f+cUA3wlIxwNmHPlizxVU4lBsCtuG+vD1 DrcojiIcAVYu9IIGxH7YQtQ9eJ9at2NHWkaneeImPDveZDI5BqBRriWDs/nPcAZ5IwVP yoPA== X-Gm-Message-State: AOAM533gdOGwj4Ww9dBUR5kcPLiAHQENZjarfrwIlbZkxJbGdSjykL8L ll9g+4TmaOaBg3xMa0c4LpE= X-Google-Smtp-Source: ABdhPJy2tLjS3HqMGLCBUkaekxD/kpuNiL597GYgRQJo9qkhRQQ2ooKLrV/vXc4mIKXsuumPnbBA+Q== X-Received: by 2002:a19:3859:: with SMTP id d25mr3058111lfj.179.1602918723203; Sat, 17 Oct 2020 00:12:03 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v4 4/5] [RISCV_PM] Support pointer masking for RISC-V for i/c/f/d/a types of instructions Date: Sat, 17 Oct 2020 10:11:53 +0300 Message-Id: <20201017071154.20642-5-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201017071154.20642-1-space.monkey.delivers@gmail.com> References: <20201017071154.20642-1-space.monkey.delivers@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::141; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x141.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, GAPPY_SUBJECT=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alexey Baturo --- target/riscv/insn_trans/trans_rva.c.inc | 3 +++ target/riscv/insn_trans/trans_rvd.c.inc | 2 ++ target/riscv/insn_trans/trans_rvf.c.inc | 2 ++ target/riscv/insn_trans/trans_rvi.c.inc | 2 ++ target/riscv/translate.c | 14 ++++++++++++++ 5 files changed, 23 insertions(+) diff --git a/target/riscv/insn_trans/trans_rva.c.inc b/target/riscv/insn_tr= ans/trans_rva.c.inc index be8a9f06dd..5559e347ba 100644 --- a/target/riscv/insn_trans/trans_rva.c.inc +++ b/target/riscv/insn_trans/trans_rva.c.inc @@ -26,6 +26,7 @@ static inline bool gen_lr(DisasContext *ctx, arg_atomic *= a, MemOp mop) if (a->rl) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); } + gen_pm_adjust_address(ctx, src1, src1); tcg_gen_qemu_ld_tl(load_val, src1, ctx->mem_idx, mop); if (a->aq) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_LDAQ); @@ -46,6 +47,7 @@ static inline bool gen_sc(DisasContext *ctx, arg_atomic *= a, MemOp mop) TCGLabel *l2 =3D gen_new_label(); =20 gen_get_gpr(src1, a->rs1); + gen_pm_adjust_address(ctx, src1, src1); tcg_gen_brcond_tl(TCG_COND_NE, load_res, src1, l1); =20 gen_get_gpr(src2, a->rs2); @@ -91,6 +93,7 @@ static bool gen_amo(DisasContext *ctx, arg_atomic *a, gen_get_gpr(src1, a->rs1); gen_get_gpr(src2, a->rs2); =20 + gen_pm_adjust_address(ctx, src1, src1); (*func)(src2, src1, src2, ctx->mem_idx, mop); =20 gen_set_gpr(a->rd, src2); diff --git a/target/riscv/insn_trans/trans_rvd.c.inc b/target/riscv/insn_tr= ans/trans_rvd.c.inc index 4f832637fa..935342f66d 100644 --- a/target/riscv/insn_trans/trans_rvd.c.inc +++ b/target/riscv/insn_trans/trans_rvd.c.inc @@ -25,6 +25,7 @@ static bool trans_fld(DisasContext *ctx, arg_fld *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_i64(cpu_fpr[a->rd], t0, ctx->mem_idx, MO_TEQ); =20 @@ -40,6 +41,7 @@ static bool trans_fsd(DisasContext *ctx, arg_fsd *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_st_i64(cpu_fpr[a->rs2], t0, ctx->mem_idx, MO_TEQ); =20 diff --git a/target/riscv/insn_trans/trans_rvf.c.inc b/target/riscv/insn_tr= ans/trans_rvf.c.inc index 3dfec8211d..04b3c3eb3d 100644 --- a/target/riscv/insn_trans/trans_rvf.c.inc +++ b/target/riscv/insn_trans/trans_rvf.c.inc @@ -30,6 +30,7 @@ static bool trans_flw(DisasContext *ctx, arg_flw *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_i64(cpu_fpr[a->rd], t0, ctx->mem_idx, MO_TEUL); gen_nanbox_s(cpu_fpr[a->rd], cpu_fpr[a->rd]); @@ -47,6 +48,7 @@ static bool trans_fsw(DisasContext *ctx, arg_fsw *a) gen_get_gpr(t0, a->rs1); =20 tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_st_i64(cpu_fpr[a->rs2], t0, ctx->mem_idx, MO_TEUL); =20 diff --git a/target/riscv/insn_trans/trans_rvi.c.inc b/target/riscv/insn_tr= ans/trans_rvi.c.inc index d04ca0394c..bee7f6be46 100644 --- a/target/riscv/insn_trans/trans_rvi.c.inc +++ b/target/riscv/insn_trans/trans_rvi.c.inc @@ -141,6 +141,7 @@ static bool gen_load(DisasContext *ctx, arg_lb *a, MemO= p memop) TCGv t1 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, memop); gen_set_gpr(a->rd, t1); @@ -180,6 +181,7 @@ static bool gen_store(DisasContext *ctx, arg_sb *a, Mem= Op memop) TCGv dat =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); gen_get_gpr(dat, a->rs2); =20 tcg_gen_qemu_st_tl(dat, t0, ctx->mem_idx, memop); diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 79dca2291b..a7cbf909f3 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -101,6 +101,16 @@ static void gen_nanbox_s(TCGv_i64 out, TCGv_i64 in) tcg_gen_ori_i64(out, in, MAKE_64BIT_MASK(32, 32)); } =20 +/* + * Temp stub: generates address adjustment for PointerMasking + */ +static void gen_pm_adjust_address(DisasContext *s, + TCGv_i64 dst, + TCGv_i64 src) +{ + tcg_gen_mov_i64(dst, src); +} + /* * A narrow n-bit operation, where n < FLEN, checks that input operands * are correctly Nan-boxed, i.e., all upper FLEN - n bits are 1. @@ -380,6 +390,7 @@ static void gen_load_c(DisasContext *ctx, uint32_t opc,= int rd, int rs1, TCGv t1 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); int memop =3D tcg_memop_lookup[(opc >> 12) & 0x7]; =20 if (memop < 0) { @@ -400,6 +411,7 @@ static void gen_store_c(DisasContext *ctx, uint32_t opc= , int rs1, int rs2, TCGv dat =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); gen_get_gpr(dat, rs2); int memop =3D tcg_memop_lookup[(opc >> 12) & 0x7]; =20 @@ -459,6 +471,7 @@ static void gen_fp_load(DisasContext *ctx, uint32_t opc= , int rd, t0 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); =20 switch (opc) { case OPC_RISC_FLW: @@ -498,6 +511,7 @@ static void gen_fp_store(DisasContext *ctx, uint32_t op= c, int rs1, t0 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); =20 switch (opc) { case OPC_RISC_FSW: --=20 2.20.1 From nobody Thu Apr 25 23:33:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602918968; cv=none; d=zohomail.com; s=zohoarc; b=Q0QcvClETWdJ9RoiqRmQJ12eXW5xRO+/y/SHz5tbjoa2WpsyBLLiHzMuK5x/Zm4OLY1q14+jrAtObq2TgRSn//hC4YhroduhFXPMn4FdfpJLosK8yaCX0k+ZtBXAN71J9CXpXOwxmKElDBPKIanBryeKRe6R/GA/1Xh2PeeDqhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602918968; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=IxOzTWfUzFZTKryJXTno6XG4PPuzG8NA2Vu7LCGXzFNmKX4hzpCBqohkkZcUcSKIQdkeZFKdSNg5DIO7vymqFsvLDJNjeMPXrSo5fPPmK4ONx3DTgXQ2iSVPhKgo3yWGGQVC2eSCGlEzS3xW/aJ3vwKKMTgfVyTkQzXlbq0XMjY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160291896896479.55608237038007; Sat, 17 Oct 2020 00:16:08 -0700 (PDT) Received: from localhost ([::1]:47758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTgRi-0007PA-3F for importer@patchew.org; Sat, 17 Oct 2020 03:16:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTgNs-0002KM-3Z; Sat, 17 Oct 2020 03:12:08 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:34885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTgNq-0003lR-2b; Sat, 17 Oct 2020 03:12:07 -0400 Received: by mail-lj1-x243.google.com with SMTP id x16so5166552ljh.2; Sat, 17 Oct 2020 00:12:05 -0700 (PDT) Received: from neptune.lab ([46.39.229.194]) by smtp.googlemail.com with ESMTPSA id 184sm1626905lfh.232.2020.10.17.00.12.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=a3l22iRPQ6oXzA026cSMI8sU/iWhgkt99P0JiUCrH0RboFAgNe1/XG0zOe8CthkPtr 7JCQCYFeiBlvAmY6HqcbEwlWU42jWhuUZ/IPZzQo9VVYwq29QCvJqfplycrDG186bDeK b88tlXzAl/3SE5EPfakM1xY+85REsPwSKN1yZZRnf9as4V92SDZ7/aonYuFptl0sKRpi B67FKZRRAld1Mv2yrIfV6o7IkK+RMlrW8qHqD2L37IL13l8/+nXmvAW6oPF+5uvREA38 L/JAFVHejD4cEOUWR039FXUYxlerT5Rxjqz1coTFwUYdEfoTf9YySHEejaxNWtCIXyxX lQyQ== 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=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=UgLM8kC7zvC0c34CEtSN/T6gnMbzUsY7XVNImPdwFv2izeRdg+Thuf03Hnaa9JCN3u tvhscJPW8VQ468A1eP1dh6Gjbakh9d0w211vlbK1HV2f/WTQWn/wZ8GgMrkJwiE9uFlf qyhVHn1TvCzGmq+XewLajVvGqrA7sLFJysq26mOgmEG51OIkMdPcONtQrWhcZXjGHJgI nfvgWILHh1znVBHm4E083Ox8D8wGhZoY7sjD/xe4osiQ6IR90YCyBg0GhlEyBXqK1Nwq rqTScxns22Ple7Zbb1IkFwtRW9qBOIuyNV82A4dakMTO+18CKN0VmZc1jiFvhyi/3FuW gTTQ== X-Gm-Message-State: AOAM533AXPoOtGW5ppFIHvOj8yZ2NiKYhU4bQBA/HMWvwmut3QBq2Poe WtnFkpoNKvqdgG8TlxOAXeM= X-Google-Smtp-Source: ABdhPJzLA4BMK4CkMFUJYsuu7UqAmWXU2GDx3rwzjj2SZNdMoujet7tsnwhxC/d+9nXzOtY3X1V/7Q== X-Received: by 2002:a2e:8e88:: with SMTP id z8mr3120952ljk.13.1602918724250; Sat, 17 Oct 2020 00:12:04 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v4 5/5] [RISCV_PM] Implement address masking functions required for RISC-V Pointer Masking extension Date: Sat, 17 Oct 2020 10:11:54 +0300 Message-Id: <20201017071154.20642-6-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201017071154.20642-1-space.monkey.delivers@gmail.com> References: <20201017071154.20642-1-space.monkey.delivers@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::243; envelope-from=baturo.alexey@gmail.com; helo=mail-lj1-x243.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Anatoly Parshintsev Signed-off-by: Anatoly Parshintsev --- target/riscv/cpu.h | 19 +++++++++++++++++++ target/riscv/translate.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index c236f01fff..13accaa232 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -386,6 +386,7 @@ FIELD(TB_FLAGS, VL_EQ_VLMAX, 2, 1) FIELD(TB_FLAGS, LMUL, 3, 2) FIELD(TB_FLAGS, SEW, 5, 3) FIELD(TB_FLAGS, VILL, 8, 1) +FIELD(TB_FLAGS, PM_ENABLED, 9, 1) =20 /* * A simplification for VLMAX @@ -432,6 +433,24 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState = *env, target_ulong *pc, if (riscv_cpu_fp_enabled(env)) { flags |=3D env->mstatus & MSTATUS_FS; } + if (riscv_has_ext(env, RVJ)) { + int priv =3D cpu_mmu_index(env, false); + bool pm_enabled =3D false; + switch (priv) { + case PRV_U: + pm_enabled =3D env->mmte & U_PM_ENABLE; + break; + case PRV_S: + pm_enabled =3D env->mmte & S_PM_ENABLE; + break; + case PRV_M: + pm_enabled =3D env->mmte & M_PM_ENABLE; + break; + default: + g_assert_not_reached(); + } + flags =3D FIELD_DP32(flags, TB_FLAGS, PM_ENABLED, pm_enabled); + } #endif *pflags =3D flags; } diff --git a/target/riscv/translate.c b/target/riscv/translate.c index a7cbf909f3..b3e7b93bc9 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -36,6 +36,9 @@ static TCGv cpu_gpr[32], cpu_pc, cpu_vl; static TCGv_i64 cpu_fpr[32]; /* assume F and D extensions */ static TCGv load_res; static TCGv load_val; +/* globals for PM CSRs */ +static TCGv pm_mask[4]; +static TCGv pm_base[4]; =20 #include "exec/gen-icount.h" =20 @@ -63,6 +66,10 @@ typedef struct DisasContext { uint16_t vlen; uint16_t mlen; bool vl_eq_vlmax; + /* PointerMasking extension */ + bool pm_enabled; + TCGv pm_mask; + TCGv pm_base; } DisasContext; =20 #ifdef TARGET_RISCV64 @@ -102,13 +109,19 @@ static void gen_nanbox_s(TCGv_i64 out, TCGv_i64 in) } =20 /* - * Temp stub: generates address adjustment for PointerMasking + * Generates address adjustment for PointerMasking */ static void gen_pm_adjust_address(DisasContext *s, TCGv_i64 dst, TCGv_i64 src) { - tcg_gen_mov_i64(dst, src); + if (!s->pm_enabled) { + /* Load unmodified address */ + tcg_gen_mov_i64(dst, src); + } else { + tcg_gen_andc_i64(dst, src, s->pm_mask); + tcg_gen_or_i64(dst, dst, s->pm_base); + } } =20 /* @@ -826,6 +839,10 @@ static void riscv_tr_init_disas_context(DisasContextBa= se *dcbase, CPUState *cs) ctx->lmul =3D FIELD_EX32(tb_flags, TB_FLAGS, LMUL); ctx->mlen =3D 1 << (ctx->sew + 3 - ctx->lmul); ctx->vl_eq_vlmax =3D FIELD_EX32(tb_flags, TB_FLAGS, VL_EQ_VLMAX); + ctx->pm_enabled =3D FIELD_EX32(tb_flags, TB_FLAGS, PM_ENABLED); + int priv =3D cpu_mmu_index(env, false); + ctx->pm_mask =3D pm_mask[priv]; + ctx->pm_base =3D pm_base[priv]; } =20 static void riscv_tr_tb_start(DisasContextBase *db, CPUState *cpu) @@ -945,4 +962,17 @@ void riscv_translate_init(void) "load_res"); load_val =3D tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, load_= val), "load_val"); + /* Assign PM CSRs to tcg globals */ + pm_mask[PRV_U] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, upmmask), "upmma= sk"); + pm_base[PRV_U] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, upmbase), "upmba= se"); + pm_mask[PRV_S] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, spmmask), "spmma= sk"); + pm_base[PRV_S] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, spmbase), "spmba= se"); + pm_mask[PRV_M] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, mpmmask), "mpmma= sk"); + pm_base[PRV_M] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, mpmbase), "mpmba= se"); } --=20 2.20.1