mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deduplicate some code

Browse Source
This commit is contained in:
Ralf Jung 2019-06-23 20:08:55 +02:00
parent 9492038ae9
commit 9954af4a9f
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/librustc_mir/interpret/memory.rs
View File

@ -274,6 +274,19 @@ pub fn check_ptr_access(
size: Size,
align: Align,
) -> InterpResult<'tcx, Option<Pointer<M::PointerTag>>> {
fn check_offset_align(offset: u64, align: Align) -> InterpResult<'static> {
if offset % align.bytes() == 0 {
Ok(())
} else {
// The biggest power of two through which `offset` is divisible.
let offset_pow2 = 1 << offset.trailing_zeros();
err!(AlignmentCheckFailed {
has: Align::from_bytes(offset_pow2).unwrap(),
required: align,
})
}
}
// Normalize to a `Pointer` if we definitely need one.
let normalized = if size.bytes() == 0 {
// Can be an integer, just take what we got.
@ -290,14 +303,7 @@ pub fn check_ptr_access(
if bits == 0 {
return err!(InvalidNullPointerUsage);
}
if bits % align.bytes() != 0 {
// The biggest power of two through which `bits` is divisible.
let bits_pow2 = 1 << bits.trailing_zeros();
return err!(AlignmentCheckFailed {
has: Align::from_bytes(bits_pow2).unwrap(),
required: align,
});
}
check_offset_align(bits, align)?;
None
}
Err(ptr) => {
@ -321,15 +327,7 @@ pub fn check_ptr_access(
required: align,
});
}
let offset = ptr.offset.bytes();
if offset % align.bytes() != 0 {
// The biggest power of two through which `offset` is divisible.
let bits_pow2 = 1 << offset.trailing_zeros();
return err!(AlignmentCheckFailed {
has: Align::from_bytes(bits_pow2).unwrap(),
required: align,
})
}
check_offset_align(ptr.offset.bytes(), align)?;
// We can still be zero-sized in this branch, in which case we have to
// return `None`.