---

yaml
---
r: 471
b: refs/heads/master
c: 982dcc2
h: refs/heads/master
i:
  469: 2cc8874
  467: 9db76a3
  463: f37766c
v: v3

Author: froystig

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e03be459e0ad0defc6c6855e4ccfde85782a53
+refs/heads/master: 982dcc29bf6cd41e967a0befe0c6195811cd6a55

trunk/src/boot/be/abi.ml

@@ -121,7 +121,8 @@ type abi =
                              -> Common.size      (* callsz  *)
                                -> Common.nabi
                                  -> Common.fixup (* grow_task *)
-                                   -> unit);
+                                   -> bool       (* is_obj_fn *)
+                                     -> unit);
 
     abi_emit_fn_epilogue: (Il.emitter -> unit);
 

trunk/src/boot/be/il.ml

@@ -901,6 +901,13 @@ let get_element_ptr
         (string_of_cell fmt mem_cell)
 ;;
 
+let ptr_cast (cell:cell) (rty:referent_ty) : cell =
+  match cell with
+      Mem (mem, _) -> Mem (mem, rty)
+    | Reg (reg, AddrTy _) -> Reg (reg, AddrTy rty)
+    | _ -> bug () "expected address cell in Il.ptr_cast"
+;;
+
 (*
  * Local Variables:
  * fill-column: 78;

trunk/src/boot/be/x86.ml

@@ -593,6 +593,7 @@ let restore_frame_base (e:Il.emitter) (base:Il.reg) (retpc:Il.reg) : unit =
  *
  *   *ebp+20+(4*N) = [argN   ]
  *   ...
+ *   *ebp+28       = [arg2   ] = obj/closure ptr
  *   *ebp+24       = [arg1   ] = task ptr
  *   *ebp+20       = [arg0   ] = out ptr
  *   *ebp+16       = [retpc  ]
@@ -1033,7 +1034,7 @@ let unwind_glue
 
 
 (* Puts result in eax; clobbers ecx, edx in the process. *)
-let rec calculate_sz (e:Il.emitter) (size:size) : unit =
+let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : unit =
   let emit = Il.emit e in
   let mov dst src = emit (Il.umov dst src) in
   let push x = emit (Il.Push x) in
@@ -1045,11 +1046,48 @@ let rec calculate_sz (e:Il.emitter) (size:size) : unit =
   let mul x y = emit (Il.binary Il.UMUL (rc x) (ro x) (ro y)) in
   let subi x y = emit (Il.binary Il.SUB (rc x) (ro x) (immi y)) in
   let eax_gets_a_and_ecx_gets_b a b =
-    calculate_sz e b;
+    calculate_sz e b in_obj;
     push (ro eax);
-    calculate_sz e a;
+    calculate_sz e a in_obj;
     pop (rc ecx);
   in
+
+  let ty_param_n_in_obj_fn i =
+    (*
+     * Here we are trying to immitate the obj-fn branch of
+     * Trans.get_ty_params_of_current_frame while using
+     * eax as our only register.
+     *)
+
+    (* Bind all the referent types we'll need... *)
+
+    let obj_body_rty = Semant.obj_closure_rty word_bits in
+    let tydesc_rty = Semant.tydesc_rty word_bits in
+    (* Note that we cheat here and pretend only to have i+1 tydescs (because
+       we GEP to the i'th while still in this function, so no one outside
+       finds out about the lie. *)
+    let tydesc_tys = Array.init (i + 1) (fun _ -> Ast.TY_type) in
+    let ty_params_ty = Ast.TY_tup tydesc_tys in
+    let ty_params_rty = Semant.referent_type word_bits ty_params_ty in
+
+      (* ... and fetch! *)
+
+      mov (rc eax) (Il.Cell closure_ptr);
+      let obj_body = word_n (h eax) Abi.box_rc_field_body in
+      let obj_body = Il.ptr_cast obj_body obj_body_rty in
+      let tydesc_ptr = get_element_ptr obj_body Abi.obj_body_elt_tydesc in
+
+        mov (rc eax) (Il.Cell tydesc_ptr);
+        let tydesc = Il.ptr_cast (word_at (h eax)) tydesc_rty in
+        let ty_params_ptr =
+          get_element_ptr tydesc Abi.tydesc_field_first_param
+        in
+
+          mov (rc eax) (Il.Cell ty_params_ptr);
+          let ty_params = Il.ptr_cast (word_at (h eax)) ty_params_rty in
+            get_element_ptr ty_params i
+  in
+
     match size with
         SIZE_fixed i ->
           mov (rc eax) (immi i)
@@ -1061,15 +1099,23 @@ let rec calculate_sz (e:Il.emitter) (size:size) : unit =
           mov (rc eax) (imm (Asm.M_POS f))
 
       | SIZE_param_size i ->
-          mov (rc eax) (Il.Cell (ty_param_n i));
+          if in_obj
+          then
+            mov (rc eax) (Il.Cell (ty_param_n_in_obj_fn i))
+          else
+            mov (rc eax) (Il.Cell (ty_param_n i));
           mov (rc eax) (Il.Cell (word_n (h eax) Abi.tydesc_field_size))
 
       | SIZE_param_align i ->
-          mov (rc eax) (Il.Cell (ty_param_n i));
+          if in_obj
+          then
+            mov (rc eax) (Il.Cell (ty_param_n_in_obj_fn i))
+          else
+            mov (rc eax) (Il.Cell (ty_param_n i));
           mov (rc eax) (Il.Cell (word_n (h eax) Abi.tydesc_field_align))
 
       | SIZE_rt_neg a ->
-          calculate_sz e a;
+          calculate_sz e a in_obj;
           neg eax
 
       | SIZE_rt_add (a, b) ->
@@ -1185,6 +1231,7 @@ let fn_prologue
     (callsz:size)
     (nabi:nabi)
     (grow_task_fixup:fixup)
+    (is_obj_fn:bool)
     : unit =
 
   let esi_n = word_n (h esi) in
@@ -1314,7 +1361,7 @@ let fn_prologue
                     emit (Il.jmp Il.JA Il.CodeNone);
 
                     (* Calculate dynamic frame size. *)
-                    calculate_sz e call_and_frame_sz;
+                    calculate_sz e call_and_frame_sz is_obj_fn;
                     ((ro eax), Some primordial_underflow_jmp_pc)
               end
           | Some e -> ((imm e), None)

trunk/src/boot/me/dwarf.ml

@@ -1677,7 +1677,7 @@ let dwarf_visitor
       in
 
       let record trec =
-        let rty = referent_type abi (Ast.TY_rec trec) in
+        let rty = referent_type word_bits (Ast.TY_rec trec) in
         let rty_sz = Il.referent_ty_size abi.Abi.abi_word_bits in
         let fix = new_fixup "record type DIE" in
         let die = DEF (fix, SEQ [|
@@ -1926,7 +1926,7 @@ let dwarf_visitor
          * I'm a bit surprised by that!
          *)
 
-        let rty = referent_type abi (Ast.TY_tag ttag) in
+        let rty = referent_type word_bits (Ast.TY_tag ttag) in
         let rty_sz = Il.referent_ty_size abi.Abi.abi_word_bits in
         let rtys =
           match rty with

trunk/src/boot/me/layout.ml

@@ -113,7 +113,7 @@ let layout_visitor
         | Il.CodeTy -> true
         | Il.NilTy -> false
     in
-      rt_in_mem (slot_referent_type cx.ctxt_abi slot)
+      rt_in_mem (slot_referent_type cx.ctxt_abi.Abi.abi_word_bits slot)
   in
 
   let rty_sz rty = Il.referent_ty_size cx.ctxt_abi.Abi.abi_word_bits rty in
@@ -142,7 +142,7 @@ let layout_visitor
       : unit =
     let accum (off,align) id : (size * size) =
       let slot = get_slot cx id in
-      let rt = slot_referent_type cx.ctxt_abi slot in
+      let rt = slot_referent_type cx.ctxt_abi.Abi.abi_word_bits slot in
       let (elt_size, elt_align) = rty_layout rt in
         if vregs_ok
           && (is_subword_size elt_size)
@@ -170,7 +170,9 @@ let layout_visitor
               then elt_off
               else neg_sz (add_sz elt_off elt_size)
             in
-              Stack.push (slot_referent_type cx.ctxt_abi slot) slot_accum;
+              Stack.push
+                (slot_referent_type cx.ctxt_abi.Abi.abi_word_bits slot)
+                slot_accum;
             iflog
               begin
                 fun _ ->

trunk/src/boot/me/semant.ml

@@ -1822,24 +1822,24 @@ let run_passes
 
 (* Rust type -> IL type conversion. *)
 
-let word_sty (abi:Abi.abi) : Il.scalar_ty =
-  Il.ValTy abi.Abi.abi_word_bits
+let word_sty (word_bits:Il.bits) : Il.scalar_ty =
+  Il.ValTy word_bits
 ;;
 
-let word_rty (abi:Abi.abi) : Il.referent_ty =
-  Il.ScalarTy (word_sty abi)
+let word_rty (word_bits:Il.bits) : Il.referent_ty =
+  Il.ScalarTy (word_sty word_bits)
 ;;
 
-let tydesc_rty (abi:Abi.abi) : Il.referent_ty =
+let tydesc_rty (word_bits:Il.bits) : Il.referent_ty =
   (* 
    * NB: must match corresponding tydesc structure
    * in trans and offsets in ABI exactly.
    *)
   Il.StructTy
     [|
-      word_rty abi;                      (* Abi.tydesc_field_first_param   *)
-      word_rty abi;                      (* Abi.tydesc_field_size          *)
-      word_rty abi;                      (* Abi.tydesc_field_align         *)
+      word_rty word_bits;                (* Abi.tydesc_field_first_param   *)
+      word_rty word_bits;                (* Abi.tydesc_field_size          *)
+      word_rty word_bits;                (* Abi.tydesc_field_align         *)
       Il.ScalarTy (Il.AddrTy Il.CodeTy); (* Abi.tydesc_field_copy_glue     *)
       Il.ScalarTy (Il.AddrTy Il.CodeTy); (* Abi.tydesc_field_drop_glue     *)
       Il.ScalarTy (Il.AddrTy Il.CodeTy); (* Abi.tydesc_field_free_glue     *)
@@ -1849,29 +1849,29 @@ let tydesc_rty (abi:Abi.abi) : Il.referent_ty =
     |]
 ;;
 
-let obj_closure_rty (abi:Abi.abi) : Il.referent_ty =
+let obj_closure_rty (word_bits:Il.bits) : Il.referent_ty =
   Il.StructTy [|
-    word_rty abi;
+    word_rty word_bits;
     Il.StructTy [|
-      Il.ScalarTy (Il.AddrTy (tydesc_rty abi));
-      word_rty abi (* A lie: it's opaque, but this permits
-                    * GEP'ing to it. *)
+      Il.ScalarTy (Il.AddrTy (tydesc_rty word_bits));
+      word_rty word_bits (* A lie: it's opaque, but this permits
+                          * GEP'ing to it. *)
     |]
   |]
 ;;
 
-let rec referent_type (abi:Abi.abi) (t:Ast.ty) : Il.referent_ty =
+let rec referent_type (word_bits:Il.bits) (t:Ast.ty) : Il.referent_ty =
   let s t = Il.ScalarTy t in
   let v b = Il.ValTy b in
   let p t = Il.AddrTy t in
   let sv b = s (v b) in
   let sp t = s (p t) in
 
-  let word = word_rty abi in
+  let word = word_rty word_bits in
   let ptr = sp Il.OpaqueTy in
   let rc_ptr = sp (Il.StructTy [| word; Il.OpaqueTy |]) in
   let codeptr = sp Il.CodeTy in
-  let tup ttup = Il.StructTy (Array.map (referent_type abi) ttup) in
+  let tup ttup = Il.StructTy (Array.map (referent_type word_bits) ttup) in
   let tag ttag =
     let union =
       Il.UnionTy
@@ -1916,7 +1916,7 @@ let rec referent_type (abi:Abi.abi) (t:Ast.ty) : Il.referent_ty =
             Il.StructTy [| codeptr; fn_closure_ptr |]
 
       | Ast.TY_obj _ ->
-          let obj_closure_ptr = sp (obj_closure_rty abi) in
+          let obj_closure_ptr = sp (obj_closure_rty word_bits) in
             Il.StructTy [| ptr; obj_closure_ptr |]
 
       | Ast.TY_tag ttag -> tag ttag
@@ -1928,26 +1928,26 @@ let rec referent_type (abi:Abi.abi) (t:Ast.ty) : Il.referent_ty =
       | Ast.TY_port _
       | Ast.TY_task -> rc_ptr
 
-      | Ast.TY_type -> sp (tydesc_rty abi)
+      | Ast.TY_type -> sp (tydesc_rty word_bits)
 
       | Ast.TY_native _ -> ptr
 
       | Ast.TY_box t ->
-          sp (Il.StructTy [| word; referent_type abi t |])
+          sp (Il.StructTy [| word; referent_type word_bits t |])
 
-      | Ast.TY_mutable t -> referent_type abi t
+      | Ast.TY_mutable t -> referent_type word_bits t
 
       | Ast.TY_param (i, _) -> Il.ParamTy i
 
       | Ast.TY_named _ -> bug () "named type in referent_type"
-      | Ast.TY_constrained (t, _) -> referent_type abi t
+      | Ast.TY_constrained (t, _) -> referent_type word_bits t
 
-and slot_referent_type (abi:Abi.abi) (sl:Ast.slot) : Il.referent_ty =
+and slot_referent_type (word_bits:Il.bits) (sl:Ast.slot) : Il.referent_ty =
   let s t = Il.ScalarTy t in
   let p t = Il.AddrTy t in
   let sp t = s (p t) in
 
-  let rty = referent_type abi (slot_ty sl) in
+  let rty = referent_type word_bits (slot_ty sl) in
     match sl.Ast.slot_mode with
       | Ast.MODE_local -> rty
       | Ast.MODE_alias -> sp rty
@@ -1958,7 +1958,7 @@ let task_rty (abi:Abi.abi) : Il.referent_ty =
     begin
       Array.init
         Abi.n_visible_task_fields
-        (fun _ -> word_rty abi)
+        (fun _ -> word_rty abi.Abi.abi_word_bits)
     end
 ;;
 
@@ -1970,14 +1970,17 @@ let call_args_referent_type_full
     (iterator_arg_rtys:Il.referent_ty array)
     (indirect_arg_rtys:Il.referent_ty array)
     : Il.referent_ty =
-  let out_slot_rty = slot_referent_type abi out_slot in
+  let out_slot_rty = slot_referent_type abi.Abi.abi_word_bits out_slot in
   let out_ptr_rty = Il.ScalarTy (Il.AddrTy out_slot_rty) in
   let task_ptr_rty = Il.ScalarTy (Il.AddrTy (task_rty abi)) in
   let ty_param_rtys =
-    let td = Il.ScalarTy (Il.AddrTy (tydesc_rty abi)) in
+    let td = Il.ScalarTy (Il.AddrTy (tydesc_rty abi.Abi.abi_word_bits)) in
       Il.StructTy (Array.init n_ty_params (fun _ -> td))
   in
-  let arg_rtys = Il.StructTy (Array.map (slot_referent_type abi) in_slots) in
+  let arg_rtys =
+    Il.StructTy
+      (Array.map (slot_referent_type abi.Abi.abi_word_bits) in_slots)
+  in
     (* 
      * NB: must match corresponding calltup structure in trans and
      * member indices in ABI exactly.
@@ -2003,7 +2006,7 @@ let call_args_referent_type
     (* Abi.indirect_args_elt_closure *)
     match closure with
         None ->
-          [| word_rty cx.ctxt_abi |]
+          [| word_rty cx.ctxt_abi.Abi.abi_word_bits |]
       | Some c ->
           [| Il.ScalarTy (Il.AddrTy c) |]
   in
@@ -2057,16 +2060,18 @@ let direct_call_args_referent_type
 ;;
 
 let ty_sz (abi:Abi.abi) (t:Ast.ty) : int64 =
-  force_sz (Il.referent_ty_size abi.Abi.abi_word_bits (referent_type abi t))
+  let wb = abi.Abi.abi_word_bits in
+    force_sz (Il.referent_ty_size wb (referent_type wb t))
 ;;
 
 let ty_align (abi:Abi.abi) (t:Ast.ty) : int64 =
-  force_sz (Il.referent_ty_align abi.Abi.abi_word_bits (referent_type abi t))
+  let wb = abi.Abi.abi_word_bits in
+    force_sz (Il.referent_ty_align wb (referent_type wb t))
 ;;
 
 let slot_sz (abi:Abi.abi) (s:Ast.slot) : int64 =
-  force_sz (Il.referent_ty_size abi.Abi.abi_word_bits
-              (slot_referent_type abi s))
+  let wb = abi.Abi.abi_word_bits in
+    force_sz (Il.referent_ty_size wb (slot_referent_type wb s))
 ;;
 
 let word_slot (abi:Abi.abi) : Ast.slot =