[v1] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh

[PATCH] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh

frank.chang@sifive.com posted 1 patch 3 years, 2 months ago

Diff against v2
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210219095902.3602-1-frank.chang@sifive.com

Maintainers: Alistair Francis <Alistair.Francis@wdc.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Palmer Dabbelt <palmer@dabbelt.com>

There is a newer version of this series

target/riscv/cpu.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Expand all Fold all

[PATCH] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh

Posted by frank.chang@sifive.com 3 years, 2 months ago

From: Frank Chang <frank.chang@sifive.com>

TB_FLAGS mem_idx bits was extended from 2 bits to 3 bits in
commit: c445593, but other TB_FLAGS bits for rvv and rvh were
not shift as well so these bits may overlap with each other when
rvv is enabled.

Signed-off-by: Frank Chang <frank.chang@sifive.com>
---
 target/riscv/cpu.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 02758ae0eb4..1b49eb9950b 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -379,12 +379,13 @@ typedef CPURISCVState CPUArchState;
 typedef RISCVCPU ArchCPU;
 #include "exec/cpu-all.h"
 
-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)
+/* Skip mem_idx bits */
+FIELD(TB_FLAGS, VL_EQ_VLMAX, 3, 1)
+FIELD(TB_FLAGS, LMUL, 4, 2)
+FIELD(TB_FLAGS, SEW, 6, 3)
+FIELD(TB_FLAGS, VILL, 9, 1)
 /* Is a Hypervisor instruction load/store allowed? */
-FIELD(TB_FLAGS, HLSX, 9, 1)
+FIELD(TB_FLAGS, HLSX, 10, 1)
 
 bool riscv_cpu_is_32bit(CPURISCVState *env);
 
-- 
2.17.1

Re: [PATCH] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh

Posted by Richard Henderson 3 years, 2 months ago

On 2/19/21 1:59 AM, frank.chang@sifive.com wrote:
> +/* Skip mem_idx bits */
> +FIELD(TB_FLAGS, VL_EQ_VLMAX, 3, 1)

Why not just add the mem_idx field to the list?

The separation between the FIELDs and TB_FLAG_*_MASK is unfortunate, and will
be a continuing source of errors.


r~

Re: [PATCH] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh

Posted by Frank Chang 3 years, 2 months ago

On Sat, Feb 20, 2021 at 12:12 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> On 2/19/21 1:59 AM, frank.chang@sifive.com wrote:
> > +/* Skip mem_idx bits */
> > +FIELD(TB_FLAGS, VL_EQ_VLMAX, 3, 1)
>
> Why not just add the mem_idx field to the list?
>
> The separation between the FIELDs and TB_FLAG_*_MASK is unfortunate, and
> will
> be a continuing source of errors.
>
>
Sure, I will edit it and send out the next version patch.

Thanks,
Frank Chang


>
> r~
>