| Message ID | 20211019094812.614056-17-frederic.petrot@univ-grenoble-alpes.fr |
|---|---|
| State | New |
| Headers | show |
| Series | Adding partial support for 128-bit riscv target | expand |
On 10/19/21 2:48 AM, Frédéric Pétrot wrote: > + /* Upper 64-bits of 128-bit CSRs */ > + uint64_t mtvech; > + uint64_t mscratchh; > + uint64_t mepch; > + uint64_t satph; > + uint64_t mstatush; Needs adding to the same machine.c subsection as the gprs. Otherwise, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 10/19/21 2:48 AM, Frédéric Pétrot wrote: > Adding the high part of a minimal set of csr. > > Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr> > Co-authored-by: Fabien Portas <fabien.portas@grenoble-inp.org> > --- > target/riscv/cpu.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 8b96ccb37a..27ec4fec63 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -192,6 +192,13 @@ struct CPURISCVState { > target_ulong hgatp; > uint64_t htimedelta; > > + /* Upper 64-bits of 128-bit CSRs */ > + uint64_t mtvech; > + uint64_t mscratchh; > + uint64_t mepch; > + uint64_t satph; > + uint64_t mstatush; There's nothing defined for mstatush (except SD), so we might as well leave it out until there is. The only thing required there is that we put SD in the correct place when we compute it from lower bits on read. mepch and mtvech do not need extending until we extend pc. I don't see a definition of how satph extends, and since you're not changing the rv64 virtual memory routines nothing will examine it anyway. Let's drop that. Which leaves mscratchh and maybe sscratchh as the only "real" 128-bit csrs. Which suggests that the support that you do add in the next patch does not need to be quite as complicated. E.g. drop the op128 hook. r~
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 8b96ccb37a..27ec4fec63 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -192,6 +192,13 @@ struct CPURISCVState { target_ulong hgatp; uint64_t htimedelta; + /* Upper 64-bits of 128-bit CSRs */ + uint64_t mtvech; + uint64_t mscratchh; + uint64_t mepch; + uint64_t satph; + uint64_t mstatush; + /* Virtual CSRs */ /* * For RV32 this is 32-bit vsstatus and 32-bit vsstatush.
Adding the high part of a minimal set of csr. Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr> Co-authored-by: Fabien Portas <fabien.portas@grenoble-inp.org> --- target/riscv/cpu.h | 7 +++++++ 1 file changed, 7 insertions(+)