| Message ID | 20211020101935.1369682-5-space.monkey.delivers@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V Pointer Masking implementation | expand |
On Wed, Oct 20, 2021 at 8:24 PM Alexey Baturo <baturo.alexey@gmail.com> wrote: > > Signed-off-by: Alexey Baturo <space.monkey.delivers@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/machine.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/target/riscv/machine.c b/target/riscv/machine.c > index 16a08302da..ae82f82525 100644 > --- a/target/riscv/machine.c > +++ b/target/riscv/machine.c > @@ -84,6 +84,14 @@ static bool vector_needed(void *opaque) > return riscv_has_ext(env, RVV); > } > > +static bool pointermasking_needed(void *opaque) > +{ > + RISCVCPU *cpu = opaque; > + CPURISCVState *env = &cpu->env; > + > + return riscv_has_ext(env, RVJ); > +} > + > static const VMStateDescription vmstate_vector = { > .name = "cpu/vector", > .version_id = 1, > @@ -138,6 +146,24 @@ static const VMStateDescription vmstate_hyper = { > } > }; > > +static const VMStateDescription vmstate_pointermasking = { > + .name = "cpu/pointer_masking", > + .version_id = 1, > + .minimum_version_id = 1, > + .needed = pointermasking_needed, > + .fields = (VMStateField[]) { > + VMSTATE_UINTTL(env.mmte, RISCVCPU), > + VMSTATE_UINTTL(env.mpmmask, RISCVCPU), > + VMSTATE_UINTTL(env.mpmbase, RISCVCPU), > + VMSTATE_UINTTL(env.spmmask, RISCVCPU), > + VMSTATE_UINTTL(env.spmbase, RISCVCPU), > + VMSTATE_UINTTL(env.upmmask, RISCVCPU), > + VMSTATE_UINTTL(env.upmbase, RISCVCPU), > + > + VMSTATE_END_OF_LIST() > + } > +}; > + > const VMStateDescription vmstate_riscv_cpu = { > .name = "cpu", > .version_id = 2, > @@ -189,6 +215,7 @@ const VMStateDescription vmstate_riscv_cpu = { > &vmstate_pmp, > &vmstate_hyper, > &vmstate_vector, > + &vmstate_pointermasking, > NULL > } > }; > -- > 2.30.2 > >
diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 16a08302da..ae82f82525 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -84,6 +84,14 @@ static bool vector_needed(void *opaque) return riscv_has_ext(env, RVV); } +static bool pointermasking_needed(void *opaque) +{ + RISCVCPU *cpu = opaque; + CPURISCVState *env = &cpu->env; + + return riscv_has_ext(env, RVJ); +} + static const VMStateDescription vmstate_vector = { .name = "cpu/vector", .version_id = 1, @@ -138,6 +146,24 @@ static const VMStateDescription vmstate_hyper = { } }; +static const VMStateDescription vmstate_pointermasking = { + .name = "cpu/pointer_masking", + .version_id = 1, + .minimum_version_id = 1, + .needed = pointermasking_needed, + .fields = (VMStateField[]) { + VMSTATE_UINTTL(env.mmte, RISCVCPU), + VMSTATE_UINTTL(env.mpmmask, RISCVCPU), + VMSTATE_UINTTL(env.mpmbase, RISCVCPU), + VMSTATE_UINTTL(env.spmmask, RISCVCPU), + VMSTATE_UINTTL(env.spmbase, RISCVCPU), + VMSTATE_UINTTL(env.upmmask, RISCVCPU), + VMSTATE_UINTTL(env.upmbase, RISCVCPU), + + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_riscv_cpu = { .name = "cpu", .version_id = 2, @@ -189,6 +215,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_pmp, &vmstate_hyper, &vmstate_vector, + &vmstate_pointermasking, NULL } };
Signed-off-by: Alexey Baturo <space.monkey.delivers@gmail.com> --- target/riscv/machine.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)