AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

c

Browse source
This commit is contained in:
Erin 2023-06-11 14:05:57 +02:00 committed by ondra05
parent efdcd826ee
commit 1263941560
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
hbvm/src/vm/mem/mod.rs
View file

@ -59,33 +59,29 @@ impl Memory {
pub fn load<S: MemAccessSize>(&self, addr: u64) -> Option<Value> { pub fn load<S: MemAccessSize>(&self, addr: u64) -> Option<Value> {
let lookup = self.page_lookup(addr)?; let lookup = self.page_lookup(addr)?;
match lookup.perm { match lookup.perm {
Permission::Empty | Permission::Node => None, Permission::Empty | Permission::Node => return None,
Permission::Readonly | Permission::Write | Permission::Exec => { Permission::Readonly | Permission::Write | Permission::Exec => (),
let mut value = MaybeUninit::<Value>::zeroed(); }
unsafe {
core::ptr::copy_nonoverlapping::<u8>(lookup.ptr, value.as_mut_ptr().cast(), 1); let mut value = MaybeUninit::<Value>::zeroed();
Some(value.assume_init()) unsafe {
} core::ptr::copy_nonoverlapping::<u8>(lookup.ptr, value.as_mut_ptr().cast(), 1);
} Some(value.assume_init())
} }
} }
/// Store value to an address /// Store value to an address
pub fn store<S: MemAccessSize>(&mut self, addr: u64, value: Value) -> Result<(), ()> { pub fn store<S: MemAccessSize>(&mut self, addr: u64, value: Value) -> Result<(), ()> {
let lookup = self.page_lookup(addr).ok_or(())?; let lookup = self.page_lookup(addr).ok_or(())?;
match lookup.perm { if lookup.perm != Permission::Write {
Permission::Write => { return Err(());
unsafe {
core::ptr::copy_nonoverlapping::<u8>(
(&value as *const Value).cast(),
lookup.ptr,
1,
)
};
Ok(())
}
_ => Err(()),
} }
unsafe {
core::ptr::copy_nonoverlapping::<u8>((&value as *const Value).cast(), lookup.ptr, 1)
};
Ok(())
} }
#[inline] #[inline]