From: LIU Zhiwei <zhiwei_liu@c-sky.com> To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: palmer@dabbelt.com, richard.henderson@linaro.org, bin.meng@windriver.com, Alistair.Francis@wdc.com, LIU Zhiwei <zhiwei_liu@c-sky.com> Subject: [RFC PATCH 13/13] target/riscv: Changing the width of U-mode CSR Date: Thu, 5 Aug 2021 10:53:12 +0800 [thread overview] Message-ID: <20210805025312.15720-14-zhiwei_liu@c-sky.com> (raw) In-Reply-To: <20210805025312.15720-1-zhiwei_liu@c-sky.com> Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com> --- target/riscv/csr.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 9a4ed18ac5..dc9807c0ff 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -297,7 +297,7 @@ static RISCVException read_vxrm(CPURISCVState *env, int csrno, static RISCVException write_vxrm(CPURISCVState *env, int csrno, target_ulong val) { - env->vxrm = val; + env->vxrm = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -311,7 +311,7 @@ static RISCVException read_vxsat(CPURISCVState *env, int csrno, static RISCVException write_vxsat(CPURISCVState *env, int csrno, target_ulong val) { - env->vxsat = val; + env->vxsat = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -325,7 +325,7 @@ static RISCVException read_vstart(CPURISCVState *env, int csrno, static RISCVException write_vstart(CPURISCVState *env, int csrno, target_ulong val) { - env->vstart = val; + env->vstart = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -493,6 +493,36 @@ static int validate_vm(CPURISCVState *env, target_ulong vm) } } +static void uxl32_switch(CPURISCVState *env, target_ulong val) +{ + uint32_t old = get_field(env->mstatus, MSTATUS64_UXL); + uint32_t new = get_field(val, MSTATUS64_UXL); + + if (old == new) { + return; + } + + /* + * For the read-only bits of the previous-width CSR, the bits at the + * same positions in the temporary register are set to zeros. + */ + if (env->misa & RVV) { + env->vl = 0; + env->vtype = 0; + } + + /* + * If the new width W is narrower than the previous width, the + * least-significant W bits of the temporary register are retained and + * the more-significant bits are discarded. + */ + if ((old == 2) && (new == 1)) { + if (env->misa & RVV) { + env->vtype &= UINT32_MAX; + } + } +} + static RISCVException write_mstatus(CPURISCVState *env, int csrno, target_ulong val) { @@ -502,13 +532,13 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, /* flush tlb on mstatus fields that affect VM */ if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP | MSTATUS_MPV | - MSTATUS_MPRV | MSTATUS_SUM)) { + MSTATUS_MPRV | MSTATUS_SUM | MSTATUS64_UXL)) { tlb_flush(env_cpu(env)); } mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE | MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM | MSTATUS_MPP | MSTATUS_MXR | MSTATUS_TVM | MSTATUS_TSR | - MSTATUS_TW; + MSTATUS_TW | MSTATUS64_UXL; if (!riscv_cpu_is_32bit(env)) { /* @@ -518,6 +548,8 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, mask |= MSTATUS_MPV | MSTATUS_GVA; } + uxl32_switch(env, val); + mstatus = (mstatus & ~mask) | (val & mask); dirty = ((mstatus & MSTATUS_FS) == MSTATUS_FS) | -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: LIU Zhiwei <zhiwei_liu@c-sky.com> To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Alistair.Francis@wdc.com, palmer@dabbelt.com, bin.meng@windriver.com, richard.henderson@linaro.org, LIU Zhiwei <zhiwei_liu@c-sky.com> Subject: [RFC PATCH 13/13] target/riscv: Changing the width of U-mode CSR Date: Thu, 5 Aug 2021 10:53:12 +0800 [thread overview] Message-ID: <20210805025312.15720-14-zhiwei_liu@c-sky.com> (raw) In-Reply-To: <20210805025312.15720-1-zhiwei_liu@c-sky.com> Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com> --- target/riscv/csr.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 9a4ed18ac5..dc9807c0ff 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -297,7 +297,7 @@ static RISCVException read_vxrm(CPURISCVState *env, int csrno, static RISCVException write_vxrm(CPURISCVState *env, int csrno, target_ulong val) { - env->vxrm = val; + env->vxrm = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -311,7 +311,7 @@ static RISCVException read_vxsat(CPURISCVState *env, int csrno, static RISCVException write_vxsat(CPURISCVState *env, int csrno, target_ulong val) { - env->vxsat = val; + env->vxsat = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -325,7 +325,7 @@ static RISCVException read_vstart(CPURISCVState *env, int csrno, static RISCVException write_vstart(CPURISCVState *env, int csrno, target_ulong val) { - env->vstart = val; + env->vstart = riscv_cpu_is_uxl32(env) ? val & UINT32_MAX : val; return RISCV_EXCP_NONE; } @@ -493,6 +493,36 @@ static int validate_vm(CPURISCVState *env, target_ulong vm) } } +static void uxl32_switch(CPURISCVState *env, target_ulong val) +{ + uint32_t old = get_field(env->mstatus, MSTATUS64_UXL); + uint32_t new = get_field(val, MSTATUS64_UXL); + + if (old == new) { + return; + } + + /* + * For the read-only bits of the previous-width CSR, the bits at the + * same positions in the temporary register are set to zeros. + */ + if (env->misa & RVV) { + env->vl = 0; + env->vtype = 0; + } + + /* + * If the new width W is narrower than the previous width, the + * least-significant W bits of the temporary register are retained and + * the more-significant bits are discarded. + */ + if ((old == 2) && (new == 1)) { + if (env->misa & RVV) { + env->vtype &= UINT32_MAX; + } + } +} + static RISCVException write_mstatus(CPURISCVState *env, int csrno, target_ulong val) { @@ -502,13 +532,13 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, /* flush tlb on mstatus fields that affect VM */ if ((val ^ mstatus) & (MSTATUS_MXR | MSTATUS_MPP | MSTATUS_MPV | - MSTATUS_MPRV | MSTATUS_SUM)) { + MSTATUS_MPRV | MSTATUS_SUM | MSTATUS64_UXL)) { tlb_flush(env_cpu(env)); } mask = MSTATUS_SIE | MSTATUS_SPIE | MSTATUS_MIE | MSTATUS_MPIE | MSTATUS_SPP | MSTATUS_FS | MSTATUS_MPRV | MSTATUS_SUM | MSTATUS_MPP | MSTATUS_MXR | MSTATUS_TVM | MSTATUS_TSR | - MSTATUS_TW; + MSTATUS_TW | MSTATUS64_UXL; if (!riscv_cpu_is_32bit(env)) { /* @@ -518,6 +548,8 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, mask |= MSTATUS_MPV | MSTATUS_GVA; } + uxl32_switch(env, val); + mstatus = (mstatus & ~mask) | (val & mask); dirty = ((mstatus & MSTATUS_FS) == MSTATUS_FS) | -- 2.17.1
next prev parent reply other threads:[~2021-08-05 3:02 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-05 2:52 [RFC PATCH 00/13] Support UXL field in mstatus LIU Zhiwei 2021-08-05 2:52 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 01/13] target/riscv: Add UXL to tb flags LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 6:00 ` Alistair Francis 2021-08-05 6:00 ` Alistair Francis 2021-08-05 19:01 ` Richard Henderson 2021-08-05 19:01 ` Richard Henderson 2021-08-06 2:49 ` LIU Zhiwei 2021-08-06 2:49 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 02/13] target/riscv: Support UXL32 for branch instructions LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 19:06 ` Richard Henderson 2021-08-05 19:06 ` Richard Henderson 2021-08-09 1:45 ` LIU Zhiwei 2021-08-09 1:45 ` LIU Zhiwei 2021-08-09 19:34 ` Richard Henderson 2021-08-09 19:34 ` Richard Henderson 2021-08-11 14:57 ` LIU Zhiwei 2021-08-11 14:57 ` LIU Zhiwei 2021-08-11 17:56 ` Richard Henderson 2021-08-11 17:56 ` Richard Henderson 2021-08-11 22:40 ` LIU Zhiwei 2021-08-11 22:40 ` LIU Zhiwei 2021-08-12 4:42 ` Richard Henderson 2021-08-12 4:42 ` Richard Henderson 2021-08-12 5:03 ` LIU Zhiwei 2021-08-12 5:03 ` LIU Zhiwei 2021-08-12 6:12 ` Richard Henderson 2021-08-12 6:12 ` Richard Henderson 2021-08-12 7:20 ` LIU Zhiwei 2021-08-12 7:20 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 03/13] target/riscv: Support UXL32 on 64-bit cpu for load/store LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 19:08 ` Richard Henderson 2021-08-05 19:08 ` Richard Henderson 2021-08-09 1:50 ` LIU Zhiwei 2021-08-09 1:50 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 04/13] target/riscv: Support UXL32 for slit/sltiu LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 19:09 ` Richard Henderson 2021-08-05 19:09 ` Richard Henderson 2021-08-09 7:28 ` LIU Zhiwei 2021-08-09 7:28 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 05/13] target/riscv: Support UXL32 for shift instruction LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 22:17 ` Richard Henderson 2021-08-05 22:17 ` Richard Henderson 2021-08-09 7:51 ` LIU Zhiwei 2021-08-09 7:51 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 06/13] target/riscv: Fix div instructions LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 22:18 ` Richard Henderson 2021-08-05 22:18 ` Richard Henderson 2021-08-09 7:53 ` LIU Zhiwei 2021-08-09 7:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 07/13] target/riscv: Support UXL32 for RVM LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 08/13] target/riscv: Support UXL32 for vector instructions LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 09/13] target/riscv: Support UXL32 for atomic instructions LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 10/13] target/riscv: Support UXL32 for float instructions LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 11/13] target/riscv: Fix srow LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` [RFC PATCH 12/13] target/riscv: Support UXL32 for RVB LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei 2021-08-05 2:53 ` LIU Zhiwei [this message] 2021-08-05 2:53 ` [RFC PATCH 13/13] target/riscv: Changing the width of U-mode CSR LIU Zhiwei 2021-08-05 6:01 ` [RFC PATCH 00/13] Support UXL field in mstatus Alistair Francis 2021-08-05 6:01 ` Alistair Francis 2021-08-05 7:14 ` LIU Zhiwei 2021-08-05 7:14 ` LIU Zhiwei 2021-08-05 7:20 ` Bin Meng 2021-08-05 7:20 ` Bin Meng 2021-08-05 8:10 ` LIU Zhiwei 2021-08-05 8:10 ` LIU Zhiwei 2021-08-06 10:05 ` Alistair Francis 2021-08-06 10:05 ` Alistair Francis 2021-08-09 1:25 ` LIU Zhiwei 2021-08-09 1:25 ` LIU Zhiwei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210805025312.15720-14-zhiwei_liu@c-sky.com \ --to=zhiwei_liu@c-sky.com \ --cc=Alistair.Francis@wdc.com \ --cc=bin.meng@windriver.com \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=richard.henderson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.