Add ABI tagging to crates, adjust rustc output and runtime stack-frame setup so access to argv works.

3 files changed, 28 insertions, 12 deletions

diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml
index 035d1f05..89e308bf 100644
--- a/src/boot/be/abi.ml
+++ b/src/boot/be/abi.ml
@@ -110,23 +110,33 @@ let indirect_args_elt_closure = 0;;
 (* Current worst case is by vec grow glue *)
 let worst_case_glue_call_args = 8;;
 
+(* 
+ * ABI tags used to inform the runtime which sort of frame to set up for new
+ * spawned functions. FIXME: There is almost certainly a better abstraction to
+ * use.
+ *)
+let abi_x86_rustboot_cdecl = 1;;
+let abi_x86_rustc_fastcall = 2;;
+
 type abi =
-  {
-    abi_word_sz: int64;
-    abi_word_bits: Il.bits;
-    abi_word_ty: Common.ty_mach;
+    {
+      abi_word_sz: int64;
+      abi_word_bits: Il.bits;
+      abi_word_ty: Common.ty_mach;
+
+      abi_tag: int;
 
-    abi_has_pcrel_data: bool;
-    abi_has_pcrel_code: bool;
+      abi_has_pcrel_data: bool;
+      abi_has_pcrel_code: bool;
 
-    abi_n_hardregs: int;
-    abi_str_of_hardreg: (int -> string);
+      abi_n_hardregs: int;
+      abi_str_of_hardreg: (int -> string);
 
-    abi_emit_target_specific: (Il.emitter -> Il.quad -> unit);
-    abi_constrain_vregs: (Il.quad -> (Il.vreg,Bits.t) Hashtbl.t -> unit);
+      abi_emit_target_specific: (Il.emitter -> Il.quad -> unit);
+      abi_constrain_vregs: (Il.quad -> (Il.vreg,Bits.t) Hashtbl.t -> unit);
 
-    abi_emit_fn_prologue: (Il.emitter
-                           -> Common.size        (* framesz *)
+      abi_emit_fn_prologue: (Il.emitter
+                             -> Common.size        (* framesz *)
                              -> Common.size      (* callsz  *)
                                -> Common.nabi
                                  -> Common.fixup (* grow_task *)
diff --git a/src/boot/be/x86.ml b/src/boot/be/x86.ml
index 30b49ed1..49b660be 100644
--- a/src/boot/be/x86.ml
+++ b/src/boot/be/x86.ml
@@ -1851,6 +1851,8 @@ let (abi:Abi.abi) =
     Abi.abi_word_bits = word_bits;
     Abi.abi_word_ty = word_ty;
 
+    Abi.abi_tag = Abi.abi_x86_rustboot_cdecl;
+
     Abi.abi_has_pcrel_data = false;
     Abi.abi_has_pcrel_code = true;
 
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 4f717219..bbf49e83 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -2727,6 +2727,7 @@ let trans_visitor
                   [|
                     Il.Cell new_task;
                     exit_task_glue_fptr;
+                     (imm (Int64.of_int abi.Abi.abi_tag));
                     fptr_operand;
                     callsz
                   |];
@@ -2739,6 +2740,7 @@ let trans_visitor
                    [|
                      Il.Cell new_task;
                      exit_task_glue_fptr;
+                     (imm (Int64.of_int abi.Abi.abi_tag));
                      fptr_operand;
                      callsz
                    |];
@@ -6183,6 +6185,8 @@ let trans_visitor
             tab_sz cx.ctxt_required_rust_sym_num;
             tab_sz cx.ctxt_required_c_sym_num;
             tab_sz cx.ctxt_required_lib_num;
+
+            Asm.WORD (word_ty_mach, Asm.IMM (Int64.of_int abi.Abi.abi_tag));
           |]))
     in