M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #129 - pftbest:memset, r=japaric 

Fix memset arguments for MSP430 target.

On MSP430 second argument to memset has `i16` type instead of `i32`.
This commit is contained in:
bors 2016-12-19 02:34:22 +00:00
parent 568df8fad4 9897bfb8a9
commit 501d93ffe0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mem.rs
View File

@ -1,3 +1,10 @@
#[allow(warnings)]
#[cfg(target_pointer_width = "16")]
type c_int = i16;
#[allow(warnings)]
#[cfg(not(target_pointer_width = "16"))]
type c_int = i32;
#[no_mangle]
pub unsafe extern "C" fn memcpy(dest: *mut u8,
src: *const u8,
@ -35,7 +42,7 @@ pub unsafe extern "C" fn memmove(dest: *mut u8,
}
#[no_mangle]
pub unsafe extern "C" fn memset(s: *mut u8, c: i32, n: usize) -> *mut u8 {
pub unsafe extern "C" fn memset(s: *mut u8, c: c_int, n: usize) -> *mut u8 {
let mut i = 0;
while i < n {
*s.offset(i as isize) = c as u8;