Use rlibc crate

[errordeveloper]

No description provided.

[errordeveloper]

I'm wandering whether it will need llvm_pass: :inline, lto: false,..?

[farcaller]

Ok, so this is a build dep, you still need to use extern crate in rust code.

[errordeveloper]

Ok, so this is a build dep, you still need to use extern crate in rust code.

That's been added, as well :deps in the Rakefile, but I'm not 100% sure how that's being picked-up for linking...

[farcaller]

It should go into src/main.rs, please try removing memory management code from libsupport and see if it still compiles.

[errordeveloper]

@farcaller I see. What's up with all the __aeabi_* functions, were those needed for something specific?

[errordeveloper]

@farcaller this worked:

diff --git a/src/lib/support.rs b/src/lib/support.rs
index 224910d..593c6a6 100644
--- a/src/lib/support.rs
+++ b/src/lib/support.rs
@@ -17,51 +17,6 @@
 #![crate_type="rlib"]
 #![feature(asm, intrinsics)]

-extern "rust-intrinsic" {
-  pub fn offset<T>(dst: *const T, offset: int) -> *const T;
-}
-
-#[allow(non_camel_case_types)]
-pub type c_int = i32;
-
-#[no_mangle]
-#[no_split_stack]
-#[inline(never)]
-pub fn memcpy(dest: *mut u8, src: *const u8, n: int) {
-  unsafe {
-    let mut i = 0;
-    while i < n {
-      *(offset(dest as *const u8, i) as *mut u8) = *(offset(src, i));
-      i += 1;
-    }
-  }
-}
-
-#[no_mangle]
-#[no_split_stack]
-pub extern "C" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: int) {
-  memcpy(dest, src, n);
-}
-
-#[no_mangle]
-#[no_split_stack]
-#[inline(never)]
-pub fn memset(s: *mut u8, c: c_int, n: int) {
-  unsafe {
-    let mut i = 0;
-    while i < n {
-      *(offset(s as *const u8, i) as *mut u8) = c as u8;
-      i += 1;
-    }
-  }
-}
-
-#[no_mangle]
-#[no_split_stack]
-pub extern "C" fn __aeabi_memset(s: *mut u8, n: int, c: c_int) {
-  memset(s, c, n);
-}
-
 #[cfg(test)]
 #[no_split_stack]
 #[no_mangle]

...as far as rm -rf build/ ; rake PLATFORM=lpc17xx build_all test goes ;)

[bharrisau]

The aebi should be in compiler-intrinsic if I remember correctly.

[errordeveloper]

The aebi should be in compiler-intrinsic if I remember correctly.

@bharrisau so we don't need to define those?

[errordeveloper]

I have just grepped for either of these functions and none are called from anywhere apart from memcpy, but I'm not sure why it's in an extern block? Should that be called as rlibc::memcpy?

> git grep -n -p memcpy
src/os/debug.rs=24=extern {
src/os/debug.rs:25:  fn memcpy(dest: *mut u8, src: *u8, n: int);
src/os/debug.rs=36=pub fn setup(conf: &UARTConf) {
src/os/debug.rs:46:    memcpy(dst_ptr, src_ptr, size_of::<UART>() as int);

[bharrisau]

We aren't using compiler-rt yet, so they need to be defined in support.

On 19 July 2014 19:42, Ilya Dmitrichenko notifications@github.com wrote:

I have just grepped for either of these functions and none are called from
anywhere apart from memcpy, but I'm not sure why it's in an extern block?
Should that be called as rlibc::memcpy?

git grep -n -p memcpy
src/os/debug.rs=24=extern {
src/os/debug.rs:25: fn memcpy(dest: *mut u8, src: *u8, n: int);
src/os/debug.rs=36=pub fn setup(conf: &UARTConf) {
src/os/debug.rs:46: memcpy(dst_ptr, src_ptr, size_of::() as int);

—
Reply to this email directly or view it on GitHub
#113 (comment).

[farcaller]

__aeabi_memset was the actual function name, as generated by LLVM (which was a trivial trampoline to memset). So, if it's green without it — it's fine.

[errordeveloper]

I have just grepped for either of these functions and none are called from anywhere apart from memcpy, but I'm not sure why it's in an extern block? Should that be called as rlibc::memcpy?

@farcaller @bharrisau any thoughts on that?

[farcaller]

The debug code is special case, leave it as is (it's going away anyways).

[errordeveloper]

Do I need to add anything here or, perhaps, test?