---

yaml
---
r: 3118
b: refs/heads/master
c: 59a254a
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 405c164f023e3aceb64d0eeee1591de391201826
+refs/heads/master: 59a254ae32ef9e3878c5b1c11ab5a3beef0a12ff

trunk/src/comp/back/link.rs

@@ -209,7 +209,7 @@ mod write {
  *
  * There are a few issues to handle:
  *
- *  - Linkers operate on a flat namespace, so we have to flatten names.
+ *  - Linnkers operate on a flat namespace, so we have to flatten names.
  *    We do this using the C++ namespace-mangling technique. Foo::bar
  *    symbols and such.
  *
@@ -221,15 +221,15 @@ mod write {
  *    symbols in the same process before you're even hitting birthday-paradox
  *    collision probability.
  *
- *  - Symbols in dirrerent crates but with same names "within" the crate need
+ *  - Symbols in different crates but with same names "within" the crate need
  *    to get different linkage-names.
  *
  * So here is what we do:
  *
  *  - Separate the meta tags into two sets: exported and local. Only work with
  *    the exported ones when considering linkage.
  *
- *  - Consider two exported tags as special (and madatory): name and vers.
+ *  - Consider two exported tags as special (and mandatory): name and vers.
  *    Every crate gets them; if it doesn't name them explicitly we infer them
  *    as basename(crate) and "0.1", respectively. Call these CNAME, CVERS.
  *

trunk/src/comp/middle/trans.rs

@@ -5842,8 +5842,7 @@ fn mk_spawn_wrapper(&@block_ctxt cx, &@ast::expr func, &ty::t args_ty) ->
     let str wrap_name =
         mangle_internal_name_by_path_and_seq(cx.fcx.lcx.ccx, cx.fcx.lcx.path,
                                              "spawn_wrapper");
-    auto llfndecl = decl_cdecl_fn(llmod, wrap_name, wrapper_fn_type);
-
+    auto llfndecl = decl_fastcall_fn(llmod, wrap_name, wrapper_fn_type);
     auto fcx = new_fn_ctxt(cx.fcx.lcx, cx.sp, llfndecl);
     auto fbcx = new_top_block_ctxt(fcx);
     // 3u to skip the three implicit args

trunk/src/rt/main.ll.in

@@ -16,13 +16,7 @@ declare i32 @rust_start(i32, i32, i32, i32)
 
 %task = type { i32, i32, i32, i32, i32, i32, i32, i32 }
 
-define void @_rust_main_wrap(i1* nocapture, %task *, %2* nocapture, %5 *)
-{
-  tail call fastcc void @_rust_main(i1* %0, %task *%1, %2* nocapture %2, %5 *%3)
-  ret void
-}
-
 define i32 @"MAIN"(i32, i32) {
-  %3 = tail call i32 @rust_start(i32 ptrtoint (void (i1*, %task*, %2*, %5*)* @_rust_main_wrap to i32), i32 %0, i32 %1, i32 ptrtoint (%0* @_rust_crate_map_toplevel to i32))
+  %3 = tail call i32 @rust_start(i32 ptrtoint (void (i1*, %task*, %2*, %5*)* @_rust_main to i32), i32 %0, i32 %1, i32 ptrtoint (%0* @_rust_crate_map_toplevel to i32))
   ret i32 %3
 }

trunk/src/rt/rust.cpp

@@ -93,7 +93,12 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
         DLOG(dom, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
     }
 
-    dom->root_task->start(main_fn, 
+    /*
+    uintptr_t main_args[4] = {0, 0, 0, (uintptr_t)args->args};
+    dom->root_task->start(main_fn,
+                          (uintptr_t)&main_args, sizeof(main_args));
+    */
+    dom->root_task->start(main_fn,
                           (uintptr_t)args->args, sizeof(args->args));
 
     int ret = dom->start_main_loop();

trunk/src/rt/rust_task.cpp

@@ -118,7 +118,7 @@ struct spawn_args {
     rust_task *task;
     uintptr_t a3;
     uintptr_t a4;
-    void (*CDECL f)(int *, rust_task *, 
+    void (*FASTCALL f)(int *, rust_task *, 
                        uintptr_t, uintptr_t);
 };
 

trunk/src/snapshots.txt

@@ -1,18 +1,3 @@
-S 2011-06-15 02018fe
-  linux-i386 74661121d9ea02881abd77e488f448038268c4df
-  macos-i386 4942eeb8897d75cbdb8cf15bef3b9bc941bc9f34
-  winnt-i386 b8cf72007bf751062de0802984e7e5a68b66ae61
-
-S 2011-06-15 92bd350 
-  linux-i386 145b68488a780623cc31c5e043c6770007273f80
-  macos-i386 d3149431f12603927bb211f53f8572fc188eb7d2
-  winnt-i386 8ee37c22195ce180961db1fad013a0743cf97cdd
-
-S 2011-06-15 01ea27b
-  linux-i386 10a8fe7ed1ea30508a06f2e883e2177e14af7b1c
-  macos-i386 d431f6e57c331c12fd1ec0ffcb2f567ef5e22c35
-  winnt-i386 096e4dd5ddfef37f9e3c3cb55037041b2198cc9a
-
 S 2011-06-14 c3015b8
   linux-i386 b091d33519a1bbf6cf12ee1954a1607940ae3915
   macos-i386 7d47cece095a7b30f5a3e2467417652d3b2353e5