Skip to content

feat(memory): use Vector in PageProtections component #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vapourismo merged 1 commit into from
Mar 30, 2026
Merged

feat(memory): use Vector in PageProtections component #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/src/components/vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,14 @@ impl<T> Vector<T, Normal> {
impl<T, M: VectorMode> Index<usize> for Vector<T, M> {
type Output = T;

#[inline(always)]
fn index(&self, idx: usize) -> &T {
M::index(self, idx)
}
}

impl<T, M: VectorMode> IndexMut<usize> for Vector<T, M> {
#[inline(always)]
fn index_mut(&mut self, idx: usize) -> &mut T {
M::index_mut(self, idx)
}
Expand Down Expand Up @@ -434,6 +436,7 @@ impl VectorMode for Normal {
Vector { vector }
}

#[inline(always)]
fn index<T>(this: &Vector<T, Self>, idx: usize) -> &T {
&this.vector[idx]
}
Expand All @@ -448,6 +451,7 @@ impl VectorMode for Normal {
unsafe { this.vector.get_unchecked_mut(idx) }
}

#[inline(always)]
fn index_mut<T>(this: &mut Vector<T, Self>, idx: usize) -> &mut T {
&mut this.vector[idx]
}
Expand Down
3 changes: 2 additions & 1 deletion pvm/src/instruction_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use arithmetic::Arithmetic;
use comparable::Comparable;
use octez_riscv_data::components::atom::AtomMode;
use octez_riscv_data::components::data_space::DataSpaceMode;
use octez_riscv_data::components::vector::VectorMode;
use rustc_apfloat::Float;
use rustc_apfloat::Status;
use rustc_apfloat::StatusAnd;
Expand Down Expand Up @@ -248,7 +249,7 @@ where
fn csr_write(&mut self, reg: CSRegister, value: Self::XValue);
}

impl<MC: MemoryConfig, M: AtomMode + DataSpaceMode> ICB for MachineCoreState<MC, M> {
impl<MC: MemoryConfig, M: AtomMode + DataSpaceMode + VectorMode> ICB for MachineCoreState<MC, M> {
type XValue = XValue;

type FValue = FValue;
Expand Down
3 changes: 2 additions & 1 deletion pvm/src/interpreter/common_memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

use octez_riscv_data::components::atom::AtomMode;
use octez_riscv_data::components::data_space::DataSpaceMode;
use octez_riscv_data::components::vector::VectorMode;
use octez_riscv_data::serialisation::elem::Elem;

use crate::exceptions::Exception;
Expand All @@ -17,7 +18,7 @@ use crate::machine_state::registers::XRegister;
impl<MC, M> MachineCoreState<MC, M>
where
MC: memory::MemoryConfig,
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
/// Generic read function for loading `T::STORED_SIZE` bytes from `address`
pub(super) fn read_from_address<T: Elem>(&mut self, address: u64) -> Result<T, Exception> {
Expand Down
3 changes: 2 additions & 1 deletion pvm/src/interpreter/rv64d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

use octez_riscv_data::components::atom::AtomMode;
use octez_riscv_data::components::data_space::DataSpaceMode;
use octez_riscv_data::components::vector::VectorMode;
use rustc_apfloat::Float;
use rustc_apfloat::Status;
use rustc_apfloat::StatusAnd;
Expand Down Expand Up @@ -343,7 +344,7 @@ where
impl<MC, M> MachineCoreState<MC, M>
where
MC: memory::MemoryConfig,
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
/// `FLD` I-type instruction.
///
Expand Down
3 changes: 2 additions & 1 deletion pvm/src/interpreter/rv64f.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

use octez_riscv_data::components::atom::AtomMode;
use octez_riscv_data::components::data_space::DataSpaceMode;
use octez_riscv_data::components::vector::VectorMode;
use rustc_apfloat::Float;
use rustc_apfloat::Status;
use rustc_apfloat::StatusAnd;
Expand Down Expand Up @@ -352,7 +353,7 @@ where
impl<MC, M> MachineCoreState<MC, M>
where
MC: memory::MemoryConfig,
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
/// `FLW` I-type instruction.
///
Expand Down
61 changes: 36 additions & 25 deletions pvm/src/machine_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ use octez_riscv_data::components::atom::EncodeAtomMode;
use octez_riscv_data::components::data_space::CloneDataSpaceMode;
use octez_riscv_data::components::data_space::DataSpaceMode;
use octez_riscv_data::components::data_space::EncodeDataSpaceMode;
use octez_riscv_data::components::vector::CloneVectorMode;
use octez_riscv_data::components::vector::EncodeVectorMode;
use octez_riscv_data::components::vector::VectorMode;
use octez_riscv_data::foldable::Fold;
use octez_riscv_data::foldable::Foldable;
use octez_riscv_data::foldable::NodeFold;
Expand Down Expand Up @@ -105,7 +108,7 @@ impl<MC: memory::MemoryConfig, M: Mode> MachineCoreState<MC, M> {
/// Reset the machine state.
pub fn reset(&mut self, listener: impl MemoryGovernanceListener)
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
self.hart.reset(memory::FIRST_ADDRESS);
self.main_memory.reset(listener);
Expand All @@ -119,7 +122,7 @@ impl<MC: memory::MemoryConfig, M: Mode> MachineCoreState<MC, M> {
phys_addr: Address,
) -> Result<memory::InstructionData<u16>, Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
self.main_memory
.read_exec(phys_addr)
Expand All @@ -132,7 +135,7 @@ impl<MC: memory::MemoryConfig, M: Mode> MachineCoreState<MC, M> {
#[inline]
fn fetch_instr(&self, addr: Address) -> Result<memory::InstructionData<Instruction>, Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let lower = self.fetch_instr_halfword(addr)?;

Expand Down Expand Up @@ -229,7 +232,9 @@ where
pub const RISCV_ABI_SP_ALIGNMENT: NonZeroU64 =
NonZeroU64::new(16).expect("Alignment must be non-zero");

impl<MC: memory::MemoryConfig, M: AtomMode + DataSpaceMode> Default for MachineCoreState<MC, M> {
impl<MC: memory::MemoryConfig, M: AtomMode + DataSpaceMode + VectorMode> Default
for MachineCoreState<MC, M>
{
fn default() -> Self {
Self {
hart: HartState::default(),
Expand All @@ -251,7 +256,7 @@ impl<'normal, MC: memory::MemoryConfig> Provable<'normal> for MachineCoreState<M
}
}

impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneDataSpaceMode> Clone
impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneVectorMode + CloneDataSpaceMode> Clone
for MachineCoreState<MC, M>
{
fn clone(&self) -> Self {
Expand All @@ -263,7 +268,7 @@ impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneDataSpaceMode> Clone
}
}

impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneDataSpaceMode> CloneState
impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneVectorMode + CloneDataSpaceMode> CloneState
for MachineCoreState<MC, M>
{
fn clone_state(&self) -> Self {
Expand All @@ -275,7 +280,7 @@ impl<MC: memory::MemoryConfig, M: CloneAtomMode + CloneDataSpaceMode> CloneState
}
}

impl<MC: memory::MemoryConfig, M: EncodeAtomMode + EncodeDataSpaceMode> Encode
impl<MC: memory::MemoryConfig, M: EncodeAtomMode + EncodeDataSpaceMode + EncodeVectorMode> Encode
for MachineCoreState<MC, M>
{
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
Expand Down Expand Up @@ -307,8 +312,11 @@ pub struct MachineState<MC: memory::MemoryConfig, PC, M: Mode> {
pub page_cache: PC,
}

impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: CloneAtomMode + CloneDataSpaceMode> Clone
for MachineState<MC, PC, M>
impl<
MC: memory::MemoryConfig,
PC: PageCache<MC, M>,
M: CloneAtomMode + CloneVectorMode + CloneDataSpaceMode,
> Clone for MachineState<MC, PC, M>
{
// TODO: RV-806: implement Clone on PageCache
fn clone(&self) -> Self {
Expand All @@ -332,8 +340,11 @@ impl<'normal, MC: memory::MemoryConfig, PC: PageCache<MC, Normal>> Provable<'nor
}
}

impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: CloneAtomMode + CloneDataSpaceMode>
CloneState for MachineState<MC, PC, M>
impl<
MC: memory::MemoryConfig,
PC: PageCache<MC, M>,
M: CloneAtomMode + CloneVectorMode + CloneDataSpaceMode,
> CloneState for MachineState<MC, PC, M>
{
fn clone_state(&self) -> Self {
Self {
Expand Down Expand Up @@ -378,7 +389,7 @@ impl<MC, PC, M> Encode for MachineState<MC, PC, M>
where
MC: MemoryConfig,
PC: PageCache<MC, M>,
M: EncodeAtomMode + EncodeDataSpaceMode,
M: EncodeAtomMode + EncodeDataSpaceMode + EncodeVectorMode,
{
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
self.core.encode(encoder)
Expand Down Expand Up @@ -468,8 +479,8 @@ impl<E> Default for StepManyResult<E> {
}
}

impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: AtomMode + DataSpaceMode> Default
for MachineState<MC, PC, M>
impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: AtomMode + DataSpaceMode + VectorMode>
Default for MachineState<MC, PC, M>
{
fn default() -> Self {
Self {
Expand All @@ -483,7 +494,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
/// Reset the machine state.
pub fn reset(&mut self)
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let listener = &mut self.page_cache;
self.core.reset(listener);
Expand All @@ -506,7 +517,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
/// *not* writable.
fn run_instr_at(&mut self, addr: Address) -> Result<ProgramCounterUpdate<Address>, Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let memory::InstructionData {
data: instr,
Expand All @@ -531,7 +542,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
#[inline]
pub fn step(&mut self) -> Result<(), Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
match self.step_max_inner(1).error {
Some(error) => Err(error),
Expand All @@ -541,7 +552,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P

pub(super) fn step_max_inner(&mut self, max_steps: usize) -> StepManyResult<Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let mut result = StepManyResult::ZERO;

Expand Down Expand Up @@ -583,7 +594,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
#[inline]
pub fn step_max(&mut self, max_steps: Bound<usize>) -> StepManyResult<Exception>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let mut result = StepManyResult::ZERO;

Expand Down Expand Up @@ -614,7 +625,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
mut handle: impl FnMut(&mut Self) -> ControlFlow<E>,
) -> StepManyResult<E>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let mut steps = 0usize;

Expand Down Expand Up @@ -652,7 +663,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
mut handle: impl FnMut(&mut Self) -> ControlFlow<E>,
) -> ControlFlow<E>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
match cause {
Exception::EnvCall => return handle(self),
Expand Down Expand Up @@ -701,7 +712,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
handle: impl FnMut(&mut Self) -> ControlFlow<E>,
) -> ControlFlow<E>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let instr_pc = self.core.hart.pc.read();
let result = self
Expand Down Expand Up @@ -740,7 +751,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
program: &Program<MC>,
) -> Result<(Address, Address), MachineError>
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let program_start = program.segments.keys().min().copied().unwrap_or(0);
let program_end = program
Expand Down Expand Up @@ -797,7 +808,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P

fn dispatch_signal_or_trap(&mut self, signal: Signal)
where
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
if self.core.dispatch_signal(signal).is_err() {
self.core.hart.pc.write(0);
Expand All @@ -810,7 +821,7 @@ impl<MC: memory::MemoryConfig, PC: PageCache<MC, M>, M: Mode> MachineState<MC, P
) where
MB: memory::buddy::Buddy<M>,
MC: MemoryConfig<State<M> = memory::state::MemoryImpl<PAGES, TOTAL_BYTES, MB, M>>,
M: AtomMode + DataSpaceMode,
M: AtomMode + DataSpaceMode + VectorMode,
{
let (main_memory, listener) = self.memory_with_listener();
main_memory.set_all_readable_writeable(listener);
Expand Down
Loading
Loading