---

yaml
---
r: 6358
b: refs/heads/master
c: dd275cd
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9231e932c6b6e613c54a977aafd658382992525
+refs/heads/master: dd275cd749fb33e272004cd946eff18ec4d10281

trunk/src/comp/middle/trans.rs

@@ -5724,7 +5724,7 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, _path: [str], name: str,
       ast::native_abi_rust_intrinsic. {
         let num_ty_param = native_fn_ty_param_count(ccx, id);
         let fn_type = native_fn_wrapper_type(ccx, sp, num_ty_param, fn_type);
-        let ri_name = "rust_intrinsic_2_" + name;
+        let ri_name = "rust_intrinsic_" + name;
         let llnativefn = get_extern_fn(ccx.externs, ccx.llmod, ri_name,
                                        lib::llvm::LLVMCCallConv, fn_type);
         ccx.item_ids.insert(id, llnativefn);

trunk/src/rt/arch/x86_64/morestack.S

@@ -8,7 +8,7 @@
 #if defined(__APPLE__) || defined(_WIN32)
 #define RUST_NEW_STACK      _rust_new_stack
 #define RUST_DEL_STACK      _rust_del_stack
-#define MORESTACK           ___morestack
+#define MORESTACK           __morestack
 #else
 #define RUST_NEW_STACK      rust_new_stack
 #define RUST_DEL_STACK      rust_del_stack

trunk/src/rt/intrinsics/intrinsics.cpp

@@ -16,7 +16,7 @@ extern "C" CDECL void
 rust_task_sleep(size_t time_in_us);
 
 extern "C" void
-rust_intrinsic_2_vec_len(size_t *retptr,
+rust_intrinsic_vec_len(size_t *retptr,
                          void *env,
                          type_desc *ty,
                          rust_vec **vp)
@@ -25,7 +25,7 @@ rust_intrinsic_2_vec_len(size_t *retptr,
 }
 
 extern "C" void
-rust_intrinsic_2_ptr_offset(void **retptr,
+rust_intrinsic_ptr_offset(void **retptr,
                           void *env,
                           type_desc *ty,
                           void *ptr,
@@ -35,7 +35,7 @@ rust_intrinsic_2_ptr_offset(void **retptr,
 }
 
 extern "C" void
-rust_intrinsic_2_cast(void *retptr,
+rust_intrinsic_cast(void *retptr,
                     void *env,
                     type_desc *t1,
                     type_desc *t2,
@@ -51,91 +51,97 @@ rust_intrinsic_2_cast(void *retptr,
 }
 
 extern "C" void
-rust_intrinsic_2_addr_of(void **retptr,
+rust_intrinsic_addr_of(void **retptr,
                        void *env,
                        type_desc *ty,
                        void *valptr) {
     *retptr = valptr;
 }
 
 extern "C" void
-rust_intrinsic_2_recv(void **retptr,
+rust_intrinsic_recv(void **retptr,
                     void *env,
                     type_desc *ty,
                     rust_port *port) {
     port_recv((uintptr_t*)retptr, port);
 }
 
 extern "C" void
-rust_intrinsic_2_get_type_desc(void **retptr,
+rust_intrinsic_get_type_desc(void **retptr,
                              void *env,
                              type_desc* ty) {
     *(type_desc**)retptr = ty;
 }
 
 extern "C" void
-rust_intrinsic_2_task_sleep(void **retptr,
+rust_intrinsic_task_sleep(void **retptr,
                           void *env,
                           size_t time_in_us) {
     rust_task_sleep(time_in_us);
 }
 
+
 extern "C" void
-rust_intrinsic_vec_len(void *task,
-                       size_t *retptr,
-                       type_desc *ty,
-                       rust_vec **vp)
+rust_intrinsic_2_vec_len(size_t *retptr,
+                         void *env,
+                         type_desc *ty,
+                         rust_vec **vp)
 {
-    rust_intrinsic_2_vec_len(retptr, NULL, ty, vp);
+    *retptr = (*vp)->fill / ty->size;
 }
 
 extern "C" void
-rust_intrinsic_ptr_offset(void *task,
-                          void **retptr,
+rust_intrinsic_2_ptr_offset(void **retptr,
+                          void *env,
                           type_desc *ty,
                           void *ptr,
                           uintptr_t count)
 {
-    rust_intrinsic_2_ptr_offset(retptr, NULL, ty, ptr, count);
+    *retptr = &((uint8_t *)ptr)[ty->size * count];
 }
 
 extern "C" void
-rust_intrinsic_cast(void *task,
-                    void *retptr,
+rust_intrinsic_2_cast(void *retptr,
+                    void *env,
                     type_desc *t1,
                     type_desc *t2,
                     void *src)
 {
-    rust_intrinsic_2_cast(retptr, NULL, t1, t2, src);
+    if (t1->size != t2->size) {
+        upcall_fail("attempt to cast values of differing sizes",
+                    __FILE__, __LINE__);
+        return;
+    }
+
+    memmove(retptr, src, t1->size);
 }
 
 extern "C" void
-rust_intrinsic_addr_of(void *task,
-                       void **retptr,
+rust_intrinsic_2_addr_of(void **retptr,
+                       void *env,
                        type_desc *ty,
                        void *valptr) {
-    rust_intrinsic_2_addr_of(retptr, NULL, ty, valptr);
+    *retptr = valptr;
 }
 
 extern "C" void
-rust_intrinsic_recv(void *task,
-                    void **retptr,
+rust_intrinsic_2_recv(void **retptr,
+                    void *env,
                     type_desc *ty,
                     rust_port *port) {
-    rust_intrinsic_2_recv(retptr, NULL, ty, port);
+    port_recv((uintptr_t*)retptr, port);
 }
 
 extern "C" void
-rust_intrinsic_get_type_desc(void *task,
-                             void **retptr,
+rust_intrinsic_2_get_type_desc(void **retptr,
+                             void *env,
                              type_desc* ty) {
-    rust_intrinsic_2_get_type_desc(retptr, NULL, ty);
+    *(type_desc**)retptr = ty;
 }
 
 extern "C" void
-rust_intrinsic_task_sleep(void *task,
-                          void **retptr,
+rust_intrinsic_2_task_sleep(void **retptr,
+                          void *env,
                           size_t time_in_us) {
     rust_task_sleep(time_in_us);
 }
-