alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mark alignment structs as unsafe

Browse source
This commit is contained in:
Maik Klein 2017-06-05 10:56:42 +02:00
parent 3483450010
commit f56d72bda6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ash/src/util.rs
View file

@ -20,11 +20,12 @@ impl AlignByteSlice {
let mut current = 0; let mut current = 0;
for slice in slices{ for slice in slices{
unsafe { unsafe {
let ptr = (self.ptr as *mut u8).offset(current); assert!(current <= self.size, "");
let ptr = (self.ptr as *mut u8).offset(current as isize);
let raw_slice = ::std::slice::from_raw_parts_mut(ptr, slice.len()); let raw_slice = ::std::slice::from_raw_parts_mut(ptr, slice.len());
raw_slice.copy_from_slice(slice); raw_slice.copy_from_slice(slice);
current += slice.len() as isize; current += slice.len();
let padding = current % self.alignment as isize; let padding = current % self.alignment;
current += padding; current += padding;
} }
} }
@ -32,7 +33,7 @@ impl AlignByteSlice {
} }
impl AlignByteSlice { impl AlignByteSlice {
pub fn new(ptr: *mut (), alignment: usize, size: usize) -> Self { pub unsafe fn new(ptr: *mut (), alignment: usize, size: usize) -> Self {
AlignByteSlice { AlignByteSlice {
ptr, ptr,
size, size,
@ -73,7 +74,7 @@ impl<T: Copy> Align<T> {
} }
impl<T> Align<T> { impl<T> Align<T> {
pub fn new(ptr: *mut (), alignment: usize, size: usize) -> Self { pub unsafe fn new(ptr: *mut (), alignment: usize, size: usize) -> Self {
let offset = size_of::<T>() + size_of::<T>() % alignment; let offset = size_of::<T>() + size_of::<T>() % alignment;
Align { Align {
ptr, ptr,