From ebeace71ce4734b4382904db4b3aa619ac9fef16 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 13 Jul 2019 10:55:54 +0200
Subject: [PATCH 1/2] avoid ptr::write which might panic in debug mode
---
src/arm.rs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/arm.rs b/src/arm.rs
index 9bfffb74f..ab35ec92b 100644
--- a/src/arm.rs
+++ b/src/arm.rs
@@ -137,11 +137,12 @@ pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: us
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;
@@ -198,7 +199,7 @@ pub unsafe extern "aapcs" fn __aeabi_memset4(dest: *mut u8, mut n: usize, c: i32
let c = (byte << 24) | (byte << 16) | (byte << 8) | byte;
while n >= 4 {
- ptr::write(dest, c);
+ *dest = c;
dest = dest.offset(1);
n -= 4;
}
From 25edd204fa324b00836dcd2d2cea362eeb627096 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 13 Jul 2019 11:00:15 +0200
Subject: [PATCH 2/2] remove unused imports
---
src/arm.rs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/arm.rs b/src/arm.rs
index ab35ec92b..4cf73ef37 100644
--- a/src/arm.rs
+++ b/src/arm.rs
@@ -135,8 +135,6 @@ 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;
@@ -191,8 +189,6 @@ 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;