From 8bcefef2f2747dc7b2f48ba7924101dc70492cf0 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 6 Jun 2013 15:18:06 -0400 Subject: libc: omit memcpy, memmove and memset LLVM provides these functions as intrinsics, and will generate calls to libc when appropriate. They are exposed in the `ptr` module as `copy_nonoverlapping_memory`, `copy_memory` and `set_memory`. --- src/libstd/ptr.rs | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/libstd/ptr.rs') diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs index c656a3eef62..c8e2f58d801 100644 --- a/src/libstd/ptr.rs +++ b/src/libstd/ptr.rs @@ -20,22 +20,6 @@ use unstable::intrinsics; #[cfg(not(test))] use cmp::{Eq, Ord}; use uint; -#[cfg(stage0)] -pub mod libc_ { - use libc::c_void; - use libc; - - #[nolink] - #[abi = "cdecl"] - pub extern { - #[rust_stack] - unsafe fn memset(dest: *mut c_void, - c: libc::c_int, - len: libc::size_t) - -> *c_void; - } -} - /// Calculate the offset from a pointer #[inline(always)] pub fn offset(ptr: *T, count: uint) -> *T { @@ -178,13 +162,6 @@ pub unsafe fn copy_nonoverlapping_memory(dst: *mut T, src: *const T, count: u memcpy64(dst, src as *T, count as u64); } -#[inline(always)] -#[cfg(stage0)] -pub unsafe fn set_memory(dst: *mut T, c: int, count: uint) { - let n = count * sys::size_of::(); - libc_::memset(dst as *mut c_void, c as libc::c_int, n as size_t); -} - /** * Invokes memset on the specified pointer, setting `count` bytes of memory * starting at `dst` to `c`. @@ -601,6 +578,7 @@ pub mod ptr_tests { } #[test] + #[cfg(not(stage0))] fn test_set_memory() { let mut xs = [0u8, ..20]; let ptr = vec::raw::to_mut_ptr(xs); -- cgit 1.4.1-3-g733a5