c78416912c
* wiggle-runtime: add as_raw method for [T] * add trivial borrow checker back in * integrate runtime borrow checker with as_raw methods * handle pointer arith overflow correctly in as_raw, create PtrOverflow error * runtime: add validation back to GuestType * generate: impl validate for enums, flags, handles, ints * oops! make validate its own method on trait GuestTypeTransparent * fix transparent impls for enum, flag, handle, int * some structs are transparent. fix tests. * tests: define byte_slice_strat and friends * wiggle-tests: i believe my allocator is working now * some type juggling around memset for ease of use * make GuestTypeTransparent an unsafe trait * delete redundant validation of pointer align * fix doc * wiggle_test: aha, you cant use sets to track memory areas * add multi-string test which exercises the runtime borrow checker against HostMemory::byte_slice_strat * oops left debug panic in * remove redundant (& incorrect, since unchecked) length calc * redesign validate again, and actually hook to as_raw * makr all validate impls as inline this should hopefully allow as_raw's check loop to be unrolled to a no-op in most cases! * code review fixes
102 lines
2.8 KiB
Rust
102 lines
2.8 KiB
Rust
use proptest::prelude::*;
|
|
use std::convert::TryFrom;
|
|
use wiggle_runtime::{GuestError, GuestMemory, GuestPtr};
|
|
use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
|
|
|
|
wiggle::from_witx!({
|
|
witx: ["tests/flags.witx"],
|
|
ctx: WasiCtx,
|
|
});
|
|
|
|
impl_errno!(types::Errno);
|
|
|
|
impl flags::Flags for WasiCtx {
|
|
fn configure_car(
|
|
&self,
|
|
old_config: types::CarConfig,
|
|
other_config_ptr: GuestPtr<types::CarConfig>,
|
|
) -> Result<types::CarConfig, types::Errno> {
|
|
let other_config = other_config_ptr.read().map_err(|e| {
|
|
eprintln!("old_config_ptr error: {}", e);
|
|
types::Errno::InvalidArg
|
|
})?;
|
|
Ok(old_config ^ other_config)
|
|
}
|
|
}
|
|
|
|
fn car_config_strat() -> impl Strategy<Value = types::CarConfig> {
|
|
(1u8..=types::CarConfig::ALL_FLAGS.into())
|
|
.prop_map(|v| {
|
|
types::CarConfig::try_from(v).expect("invalid value for types::CarConfig flag")
|
|
})
|
|
.boxed()
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct ConfigureCarExercise {
|
|
old_config: types::CarConfig,
|
|
other_config: types::CarConfig,
|
|
other_config_by_ptr: MemArea,
|
|
return_ptr_loc: MemArea,
|
|
}
|
|
|
|
impl ConfigureCarExercise {
|
|
pub fn strat() -> BoxedStrategy<Self> {
|
|
(
|
|
car_config_strat(),
|
|
car_config_strat(),
|
|
HostMemory::mem_area_strat(4),
|
|
HostMemory::mem_area_strat(4),
|
|
)
|
|
.prop_map(
|
|
|(old_config, other_config, other_config_by_ptr, return_ptr_loc)| Self {
|
|
old_config,
|
|
other_config,
|
|
other_config_by_ptr,
|
|
return_ptr_loc,
|
|
},
|
|
)
|
|
.prop_filter("non-overlapping ptrs", |e| {
|
|
MemArea::non_overlapping_set(&[e.other_config_by_ptr, e.return_ptr_loc])
|
|
})
|
|
.boxed()
|
|
}
|
|
|
|
pub fn test(&self) {
|
|
let ctx = WasiCtx::new();
|
|
let host_memory = HostMemory::new();
|
|
|
|
// Populate input ptr
|
|
host_memory
|
|
.ptr(self.other_config_by_ptr.ptr)
|
|
.write(self.other_config)
|
|
.expect("deref ptr mut to CarConfig");
|
|
|
|
let res = flags::configure_car(
|
|
&ctx,
|
|
&host_memory,
|
|
self.old_config.into(),
|
|
self.other_config_by_ptr.ptr as i32,
|
|
self.return_ptr_loc.ptr as i32,
|
|
);
|
|
assert_eq!(res, types::Errno::Ok.into(), "configure car errno");
|
|
|
|
let res_config = host_memory
|
|
.ptr::<types::CarConfig>(self.return_ptr_loc.ptr)
|
|
.read()
|
|
.expect("deref to CarConfig value");
|
|
|
|
assert_eq!(
|
|
self.old_config ^ self.other_config,
|
|
res_config,
|
|
"returned CarConfig should be an XOR of inputs"
|
|
);
|
|
}
|
|
}
|
|
proptest! {
|
|
#[test]
|
|
fn configure_car(e in ConfigureCarExercise::strat()) {
|
|
e.test()
|
|
}
|
|
}
|