Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid ptr::write which might panic in debug mode #300

Merged
merged 2 commits into from
Jul 15, 2019
Merged

avoid ptr::write which might panic in debug mode #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebeace7
avoid ptr::write which might panic in debug mode
RalfJung Jul 13, 2019
25edd20
remove unused imports
RalfJung Jul 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/arm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,12 @@ pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: us
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
#[cfg_attr(thumb, linkage = "weak")]
pub unsafe extern "aapcs" fn __aeabi_memcpy4(dest: *mut u8, src: *const u8, mut n: usize) {
use core::ptr;

// We are guaranteed 4-alignment, so accessing at u32 is okay.
let mut dest = dest as *mut u32;
let mut src = src as *mut u32;

while n >= 4 {
ptr::write(dest, ptr::read(src));
*dest = *src;
dest = dest.offset(1);
src = src.offset(1);
n -= 4;
Expand Down Expand Up @@ -190,15 +189,13 @@ pub unsafe extern "aapcs" fn __aeabi_memset(dest: *mut u8, n: usize, c: i32) {
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
#[cfg_attr(thumb, linkage = "weak")]
pub unsafe extern "aapcs" fn __aeabi_memset4(dest: *mut u8, mut n: usize, c: i32) {
use core::ptr;

let mut dest = dest as *mut u32;

let byte = (c as u32) & 0xff;
let c = (byte << 24) | (byte << 16) | (byte << 8) | byte;

while n >= 4 {
ptr::write(dest, c);
*dest = c;
dest = dest.offset(1);
n -= 4;
}
Expand Down