From patchwork Wed Oct 20 03:16:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515978 Delivered-To: patch@linaro.org Received: by 2002:adf:a11e:0:0:0:0:0 with SMTP id o30csp1317621wro; Tue, 19 Oct 2021 20:18:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXB3d2aOt2mFmA/x5MOCHMZ5WzVfCKmwJLLbwONti38lBf2URDTfmiIEWq507zj53lzgfz X-Received: by 2002:a67:e28a:: with SMTP id g10mr40848363vsf.5.1634699928132; Tue, 19 Oct 2021 20:18:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634699928; cv=none; d=google.com; s=arc-20160816; b=jvahKflzlsoFZkxPbcB5UkTmvpp7oW6cupyu6rukvWZp6/0JRNuv8saK34RRo6kY/T Vx+W5rXq4VqTVZR1UGhkJIyTyElNnzox7Smuk2VzqfELO55F7dvh/Wdhbh+E9YbbZuFZ e4jkAPfocQA2vHy2T0+uxYJY3rDWGz/euHkODfSW+8r4YnShbAZvP1FRCV6UJ46i1nom gBavWV7xkQJ+LQvuaDy2IyT61GnuyCHd+cZXPJYLqDUZoYVP2VAUqIITDvwo60/FCuLS /konqlE734++HkpU3LI+d+9jPPobX5ivTntZ62T/JzqM2y3jv320u/25s2GKaQuDl2Jn I7+w== 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=qtBU67E2VBBOP7+0Zsl17oOFCJ6wQGkRCeveFWurByw=; b=sqTlZT7f1LTAdOmMiAZzeDKKF8IwlVO6YugTW5BcEdNqb1v3vc/+A+Iz/1D8CsJ5o0 G+9Ys/6/YUtp+9TcE1lWWrG0VJRti86Op2gfasZBH/jgLH3jv/TNTImbi1LFD7kOGqfW /rcfSayk2Odt3FNAST9Vuk7PIjRCKXQwssJWHVo8ep/gMHBFEz2xeAdtrhwSI7ziA1IM gLUe52uI0Mq6nN1YgQP+eWPkAR9IE1Xa8eyaF6nkdJDS54iWvoxNK+JZKI+M4LmzkSoN SJwGF0MiYK47gdgXhFN9nrAyrsqjujMxsmtYiCB2OqsXdI33IRdajUv2ckncnUiKhCwn e9Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t0+RLheN; 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 h11si1524183vsf.34.2021.10.19.20.18.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 20:18:48 -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=t0+RLheN; 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]:52370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1md27r-0006p9-8V for patch@linaro.org; Tue, 19 Oct 2021 23:18:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1md26R-0006lK-Vk for qemu-devel@nongnu.org; Tue, 19 Oct 2021 23:17:19 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:40467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1md26O-00011C-P8 for qemu-devel@nongnu.org; Tue, 19 Oct 2021 23:17:19 -0400 Received: by mail-pl1-x62d.google.com with SMTP id v20so15117120plo.7 for ; Tue, 19 Oct 2021 20:17:15 -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=qtBU67E2VBBOP7+0Zsl17oOFCJ6wQGkRCeveFWurByw=; b=t0+RLheNgJASdHntBzIPgiMHe8xuoErTJNIVTY/d/s5PKm0EPpkl0pbIXuAaQEfyMK lFcMqeHjohCyXOFAVBomuSOnpDpt1uo0KuOfBblmUy5zjA7Hq0gaHzIX73rHR4aAzNzY svHAuoVmI+LoCGcovh387+SrvfGm3DYli3DBe1P0pQLp3PGIMQ1QEqH15kGkfP5Eoi04 Gpb3+EFi0bPDDKI5KxqnlKHJyOOLK59jQAJBf+kce3uUy32X96RlV4LmlwryYheGkMK1 y4zXH6wEPOKxJlG5fE5n6U8ND/QkE/xTqi0BjHcRi0q6VKEhLUxCNxI8rFL0CiOh63O+ Y+sA== 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=qtBU67E2VBBOP7+0Zsl17oOFCJ6wQGkRCeveFWurByw=; b=PMUDtNIWgoqT5j1p+B0HXNTfZdmLfhqUO66pStaUPufT8JLO462l7oGs9se/k8383O Qifvlx0f/TsW8lPJWw67ryXNiXHht0bWNS+WtEq8ujQC+pzcqt1xqzEA8/6xbO6Ib4R4 rBxIeJ6Y4z2JkLIizzlhX/lEot0HL98OKskg2PymreF04ioRu6L7MWgeoMRNqwkJEXD6 cw3SNrzAoWf+6DnSUwOZJHe6iSRuJZd8D6CarFH3KomcTjMn1Xd2ynknladTCjPDuHIT wvEypBOqQzho6HNe4N4E1uQPBlpe/+GUdtW964XPZ3cnyfCfJUGIryziXAGq9PcgjiHS Vl4w== X-Gm-Message-State: AOAM532Gmj/2LKJI504gHjAN4iX4ZjLuCW71By3TYWo/vPRCs8IKT2DB 9URSN1iqXcHd2E8IcSahg32rrY5nWXA= X-Received: by 2002:a17:90a:b783:: with SMTP id m3mr4405103pjr.183.1634699834613; Tue, 19 Oct 2021 20:17:14 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id c8sm505364pjr.38.2021.10.19.20.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 20:17:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 05/15] target/riscv: Add MXL/SXL/UXL to TB_FLAGS Date: Tue, 19 Oct 2021 20:16:59 -0700 Message-Id: <20211020031709.359469-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211020031709.359469-1-richard.henderson@linaro.org> References: <20211020031709.359469-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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=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: alistair.francis@wdc.com, qemu-riscv@nongnu.org, 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: LIU Zhiwei 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 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 bce8fe7ebb..babe271e53 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;