Step 2 of cdecl task transition.

Author: Eric Holk

src/rt/main.ll.in

@@ -10,7 +10,7 @@
 @_rust_crate_map_toplevel = external global %0
 
 declare fastcc void @_rust_main(i1* nocapture, %task*, %2* nocapture, %5*);
-declare i32 @rust_start(i32, i32, i32, i32, i32)
+declare i32 @rust_start(i32, i32, i32, i32)
 
 %tydesc = type { %tydesc**, i32, i32, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*)*, void (i1*, %task*, i1*, %tydesc**, i8*, i8*, i8)* }
 
@@ -23,7 +23,6 @@ define void @_rust_main_wrap(i1* nocapture, %task *, %2* nocapture, %5 *)
 }
 
 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 0, i32 %0, i32 %1, i32 ptrtoint (%0* @_rust_crate_map_toplevel to i32), i32 ptrtoint (void (i1*, %task*, %2*, %5*)* @_rust_main_wrap to 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))
   ret i32 %3
 }

src/rt/rust.cpp

@@ -71,16 +71,6 @@ command_line_args : public dom_owned<command_line_args>
     }
 };
 
-// THIS IS AN UGLY HACK TO MAKE rust_start STILL WORK WITH STAGE0 WHILE WE
-// TRANSITION TO ALL-CDECL TASK STARTUP FUNCTIONS.
-void FASTCALL
-(*real_main)(uintptr_t a, uintptr_t b, uintptr_t c, uintptr_t d) = NULL;
-
-void CDECL fake_main(uintptr_t a, uintptr_t b, uintptr_t c, uintptr_t d)
-{
-    real_main(a, b, c, d);
-}
-
 /**
  * Main entry point into the Rust runtime. Here we create a Rust service,
  * initialize the kernel, create the root domain and run it.
@@ -104,9 +94,9 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map,
         DLOG(dom, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
     }
 
-    real_main = (typeof(real_main))main_fn;
-    if(main_fn) { printf("using fastcall main\n"); }
-    dom->root_task->start(main_fn ? (uintptr_t)fake_main : main_fn_cdecl,
+    if(main_fn) { printf("using new cdecl main\n"); }
+    else { printf("using old cdecl main\n"); }
+    dom->root_task->start(main_fn ? main_fn : main_fn_cdecl,
                           (uintptr_t)args->args, sizeof(args->args));
 
     int ret = dom->start_main_loop();