fmt
This commit is contained in:
parent
b8ee38d3e8
commit
92f776363f
6 changed files with 13 additions and 12 deletions
|
|
@ -81,7 +81,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
fn malloc(&mut self, size: u64, init: AllocInit) -> InterpResult<'tcx, Pointer> {
|
||||
let this = self.eval_context_mut();
|
||||
let align = this.malloc_align(size);
|
||||
let ptr = this.allocate_ptr(Size::from_bytes(size), align, MiriMemoryKind::C.into(), init)?;
|
||||
let ptr =
|
||||
this.allocate_ptr(Size::from_bytes(size), align, MiriMemoryKind::C.into(), init)?;
|
||||
interp_ok(ptr.into())
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +106,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
MiriMemoryKind::C.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
this.write_pointer(ptr, &memptr)?;
|
||||
interp_ok(Scalar::from_i32(0))
|
||||
|
|
@ -138,7 +139,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(new_size),
|
||||
new_align,
|
||||
MiriMemoryKind::C.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
interp_ok(new_ptr.into())
|
||||
}
|
||||
|
|
@ -179,7 +180,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
MiriMemoryKind::C.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
interp_ok(ptr.into())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -509,7 +509,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
memory_kind.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
|
||||
ecx.write_pointer(ptr, dest)
|
||||
|
|
@ -538,7 +538,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
MiriMemoryKind::Rust.into(),
|
||||
AllocInit::Zero
|
||||
AllocInit::Zero,
|
||||
)?;
|
||||
this.write_pointer(ptr, dest)
|
||||
});
|
||||
|
|
@ -599,7 +599,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(new_size),
|
||||
align,
|
||||
MiriMemoryKind::Rust.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
this.write_pointer(new_ptr, dest)
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
dirent_layout.align.abi,
|
||||
MiriMemoryKind::Runtime.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
let entry: Pointer = entry.into();
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(new_size),
|
||||
align,
|
||||
MiriMemoryKind::Mmap.into(),
|
||||
AllocInit::Zero
|
||||
AllocInit::Zero,
|
||||
)?;
|
||||
|
||||
interp_ok(Scalar::from_pointer(ptr, this))
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
align,
|
||||
MiriMemoryKind::Mmap.into(),
|
||||
// mmap guarantees new mappings are zero-init.
|
||||
AllocInit::Zero
|
||||
AllocInit::Zero,
|
||||
)?;
|
||||
|
||||
interp_ok(Scalar::from_pointer(ptr, this))
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
MiriMemoryKind::WinHeap.into(),
|
||||
init
|
||||
init,
|
||||
)?;
|
||||
this.write_pointer(ptr, dest)?;
|
||||
}
|
||||
|
|
@ -299,7 +299,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
|
|||
Size::from_bytes(size),
|
||||
Align::from_bytes(align).unwrap(),
|
||||
MiriMemoryKind::WinHeap.into(),
|
||||
AllocInit::Uninit
|
||||
AllocInit::Uninit,
|
||||
)?;
|
||||
this.write_pointer(new_ptr, dest)?;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue