From patchwork Sat Oct 16 17:14:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515861 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp88340imp; Sat, 16 Oct 2021 10:17:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3U5m3CwlR1KoloJktKc0KMtDSf2QT/kdhHGArJ5UwNdMKzUcsOOccsWSCSB2M5a+WIkCE X-Received: by 2002:a05:6e02:4ca:: with SMTP id f10mr8522841ils.316.1634404653286; Sat, 16 Oct 2021 10:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634404653; cv=none; d=google.com; s=arc-20160816; b=bYrJZd/RWLWKnZ89YD4jgV61ysqUal19HMJ/GxWagWUntqUQO50/gNdNuNmxe05ShP YsyTQgsrXPxZjJdAW6BwHNuiZyk4Cxv6vIiQluLJE7fCsDUsYu6CkFj8EQ3pOrYI2Rsv YXwLvcKcCKSejwKhHFRg8E/JzeUZJI1TYQRp+OrX1Zqx9/fyLMwqoo9S7W1jiSyUqK1e LDFuakdWbVKGp2sEDiWz87LwOYa5WvtJ2w2IkcKT3Al9w6LH8TTy1eFGP6OnAlla0CTy ak8BmJ9q0bcmht/qQRC7ZbHjjpA1V+d2FLNh9BWrblIMMcoxRCQRLXhZNj65ytZcFOfc Y/5A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=HfhIYs6BYtJZrJhyDqdjqFsTT/I7BM3RSYSu00CViw4=; b=cG9zeNEaJIrxIUnTzgTC0BWmhfAB7EpP9TXnntGskpCSJGQe6oK/BmtF1v7Ye6YQJl rjhw4wvF03KV8muIvyfJEaCLWKZnNE019nqUUtO0zsnL2d2Ttc7NXIfKxo1EticB8tv0 fNmeTVn1TIOEl9wY0FKGznFLrUsVVJXke5ci2/DpwlYBRYP/fyX6OZ0z80tse6q6ciuq PaBR+FBtxqLnHn5dmMnmG1OG9/4EWUeO4r2F65g8NAhd2w1pz3EyDrfzHfQe5pI3DXaQ 4qVLW/K3/9fQu8vr/ocIO59UzG3g/FE2Zfn8xh+ICcXRlQRhtR7c4gzXC//0CiLWV+L4 5Tzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kZ73zNZF; 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 q25si9775795jac.111.2021.10.16.10.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Oct 2021 10:17:33 -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=kZ73zNZF; 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]:37580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbnJM-0001wd-OC for patch@linaro.org; Sat, 16 Oct 2021 13:17:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbnGL-00012R-HA for qemu-devel@nongnu.org; Sat, 16 Oct 2021 13:14:27 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:38886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbnGG-0006AS-DJ for qemu-devel@nongnu.org; Sat, 16 Oct 2021 13:14:25 -0400 Received: by mail-pg1-x529.google.com with SMTP id e65so9286539pgc.5 for ; Sat, 16 Oct 2021 10:14:19 -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=HfhIYs6BYtJZrJhyDqdjqFsTT/I7BM3RSYSu00CViw4=; b=kZ73zNZFvXuOLh9u9aSdPoK7MVceaAKYSlzm0vrGdXwQh/eYBaYqi6f+8B0ibuda1m 84iy2tv4EYaj/yYi/MKGbKSaJn8PK4DEeAafddraJrQX/n2bIOuBGgUmuieFdKxJFxXV w5KcXY6sIOycGLZw0QitfenNRA10BcBfJ+21mBt9E9NtaZz6eQUlvP27kQZBMS7dL8au LbQVazNFNtmjuHctPLdFr56oDcxOLoXhIVj1pZ+vQzSi+dm0pI6X+6gcTmLwXzZHBBRV OCpAvkJ0glQmaVaqh/8/0TjAj2Ckkq/u7EP39ylFdqUYRv8jLv6PUs127H7a2T8diZw3 X2pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HfhIYs6BYtJZrJhyDqdjqFsTT/I7BM3RSYSu00CViw4=; b=1TpB/myz4qOqPGAtzmSYTaIvM5NmJxVvpJt6oY7vdQqTIjPNj/d2+Af9B/cBeDDniB RU0Nqu0VeYwhW52/s31cO2V86kP4rdW4KFHEg9dV/ebId4NqMDvpWGW8HfcSkJRwq4qd d1PuxOlg8LPzqZ11q5nuqoDvz92k0UCwmrKkgNy0D8pIGYxb8eST8GJxHIWQyZh+AzDw VTz3wQbhjdnwyOEQVjrM/5Owb0XQFirLlBxY1N9cStcIlMEsFtbvt5juohie+rMJuveX rBu51B+BhNnQXiG0Uq/xCJknKBD7iui1TrVVAtBxZ+EXMOpluJRKW19taK4cjW+PTCZn 01yQ== X-Gm-Message-State: AOAM5321VT2srqxiJE/DZ2eXn5aiN0454J6W/YyKDgt8PvxoWr3ykiNE WvoB6E79OqF41/0nsR4ukFJJ4mTCexT14A== X-Received: by 2002:a63:a80c:: with SMTP id o12mr14553211pgf.422.1634404459051; Sat, 16 Oct 2021 10:14:19 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id l4sm2330281pfc.121.2021.10.16.10.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Oct 2021 10:14:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 05/14] target/riscv: Add MXL/SXL/UXL to TB_FLAGS Date: Sat, 16 Oct 2021 10:14:03 -0700 Message-Id: <20211016171412.3163784-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211016171412.3163784-1-richard.henderson@linaro.org> References: <20211016171412.3163784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: qemu-riscv@nongnu.org, frank.chang@sifive.com, alistair.francis@wdc.com, fabien.portas@grenoble-inp.org, frederic.petrot@univ-grenoble-alpes.fr, zhiwei_liu@c-sky.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Begin adding support for switching XLEN at runtime. Extract the effective XLEN from MISA and MSTATUS and store for use during translation. Reviewed-by: Alistair Francis Signed-off-by: Richard Henderson --- target/riscv/cpu.h | 2 ++ target/riscv/cpu.c | 8 ++++++++ target/riscv/cpu_helper.c | 33 +++++++++++++++++++++++++++++++++ target/riscv/csr.c | 3 +++ target/riscv/translate.c | 2 +- 5 files changed, 47 insertions(+), 1 deletion(-) -- 2.25.1 Reviewed-by: LIU Zhiwei diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index d0e82135a9..c24bc9a039 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -395,6 +395,8 @@ FIELD(TB_FLAGS, VILL, 8, 1) /* Is a Hypervisor instruction load/store allowed? */ FIELD(TB_FLAGS, HLSX, 9, 1) FIELD(TB_FLAGS, MSTATUS_HS_FS, 10, 2) +/* The combination of MXL/SXL/UXL that applies to the current cpu mode. */ +FIELD(TB_FLAGS, XL, 12, 2) #ifdef TARGET_RISCV32 #define riscv_cpu_mxl(env) ((void)(env), MXL_RV32) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1857670a69..4e1920d5f0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -355,6 +355,14 @@ static void riscv_cpu_reset(DeviceState *dev) env->misa_mxl = env->misa_mxl_max; env->priv = PRV_M; env->mstatus &= ~(MSTATUS_MIE | MSTATUS_MPRV); + if (env->misa_mxl > MXL_RV32) { + /* + * The reset status of SXL/UXL is undefined, but mstatus is WARL + * and we must ensure that the value after init is valid for read. + */ + env->mstatus = set_field(env->mstatus, MSTATUS64_SXL, env->misa_mxl); + env->mstatus = set_field(env->mstatus, MSTATUS64_UXL, env->misa_mxl); + } env->mcause = 0; env->pc = env->resetvec; env->two_stage_lookup = false; diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 403f54171d..429afd1f48 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -35,6 +35,37 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch) #endif } +static RISCVMXL cpu_get_xl(CPURISCVState *env) +{ +#if defined(TARGET_RISCV32) + return MXL_RV32; +#elif defined(CONFIG_USER_ONLY) + return MXL_RV64; +#else + RISCVMXL xl = riscv_cpu_mxl(env); + + /* + * When emulating a 32-bit-only cpu, use RV32. + * When emulating a 64-bit cpu, and MXL has been reduced to RV32, + * MSTATUSH doesn't have UXL/SXL, therefore XLEN cannot be widened + * back to RV64 for lower privs. + */ + if (xl != MXL_RV32) { + switch (env->priv) { + case PRV_M: + break; + case PRV_U: + xl = get_field(env->mstatus, MSTATUS64_UXL); + break; + default: /* PRV_S | PRV_H */ + xl = get_field(env->mstatus, MSTATUS64_SXL); + break; + } + } + return xl; +#endif +} + void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) { @@ -78,6 +109,8 @@ void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, } #endif + flags = FIELD_DP32(flags, TB_FLAGS, XL, cpu_get_xl(env)); + *pflags = flags; } diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 9c0753bc8b..c4a479ddd2 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -526,6 +526,9 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, mstatus = set_field(mstatus, MSTATUS32_SD, dirty); } else { mstatus = set_field(mstatus, MSTATUS64_SD, dirty); + /* SXL and UXL fields are for now read only */ + mstatus = set_field(mstatus, MSTATUS64_SXL, MXL_RV64); + mstatus = set_field(mstatus, MSTATUS64_UXL, MXL_RV64); } env->mstatus = mstatus; diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 422f8ab8d0..7e7bb67d15 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -539,7 +539,6 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) #else ctx->virt_enabled = false; #endif - ctx->xl = env->misa_mxl; ctx->misa_ext = env->misa_ext; ctx->frm = -1; /* unknown rounding mode */ ctx->ext_ifencei = cpu->cfg.ext_ifencei; @@ -551,6 +550,7 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->lmul = FIELD_EX32(tb_flags, TB_FLAGS, LMUL); ctx->mlen = 1 << (ctx->sew + 3 - ctx->lmul); ctx->vl_eq_vlmax = FIELD_EX32(tb_flags, TB_FLAGS, VL_EQ_VLMAX); + ctx->xl = FIELD_EX32(tb_flags, TB_FLAGS, XL); ctx->cs = cs; ctx->w = false; ctx->ntemp = 0;