Janitorial work on obj box / body / field terminology, following froystig's brave lead.

4 files changed, 40 insertions, 35 deletions

diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml
index 5bdf21faa12..5dd6037bcc4 100644
--- a/src/boot/be/abi.ml
+++ b/src/boot/be/abi.ml
@@ -47,13 +47,15 @@ let stk_field_data = stk_field_limit + 1;;
 
 (* Both obj and fn are two-word "bindings":  One word points to some
  * static dispatch information (vtbl or thunk), and the other points to
- * some bag of bound data (object-body or closure). *)
+ * some bag of bound data (object-body or closure).
+ *)
 
 let binding_field_dispatch = 0;;
 let binding_field_bound_data = 1;;
 
 let obj_field_vtbl = binding_field_dispatch;;
-let obj_field_body_box = binding_field_bound_data;;
+let obj_field_box = binding_field_bound_data;;
+
 let obj_body_elt_tydesc = 0;;
 let obj_body_elt_fields = 1;;
 
diff --git a/src/boot/be/x86.ml b/src/boot/be/x86.ml
index f879027bac6..202f35897e4 100644
--- a/src/boot/be/x86.ml
+++ b/src/boot/be/x86.ml
@@ -1055,7 +1055,7 @@ let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : unit =
 
     (* Bind all the referent types we'll need... *)
 
-    let obj_body_rty = Semant.obj_closure_rty word_bits in
+    let obj_box_rty = Semant.obj_box_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
@@ -1068,7 +1068,7 @@ let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : unit =
 
       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 obj_body = Il.ptr_cast obj_body obj_box_rty in
       let tydesc_ptr = get_element_ptr obj_body Abi.obj_body_elt_tydesc in
 
         mov (rc eax) (Il.Cell tydesc_ptr);
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml
index f0fca1a8ca0..6cf03dfc1c4 100644
--- a/src/boot/me/semant.ml
+++ b/src/boot/me/semant.ml
@@ -1878,7 +1878,10 @@ let tydesc_rty (word_bits:Il.bits) : Il.referent_ty =
     |]
 ;;
 
-let obj_closure_rty (word_bits:Il.bits) : Il.referent_ty =
+(* 
+ * [ rc [ tydesc* | obj-body ] ]
+ *)
+let obj_box_rty (word_bits:Il.bits) : Il.referent_ty =
   Il.StructTy [|
     word_rty word_bits;
     Il.StructTy [|
@@ -1945,8 +1948,8 @@ let rec referent_type (word_bits:Il.bits) (t:Ast.ty) : Il.referent_ty =
             Il.StructTy [| codeptr; fn_closure_ptr |]
 
       | Ast.TY_obj _ ->
-          let obj_closure_ptr = sp (obj_closure_rty word_bits) in
-            Il.StructTy [| ptr; obj_closure_ptr |]
+          let obj_box_ptr = sp (obj_box_rty word_bits) in
+            Il.StructTy [| ptr; obj_box_ptr |]
 
       | Ast.TY_tag ttag -> tag ttag
       | Ast.TY_iso tiso -> tag tiso.Ast.iso_group.(tiso.Ast.iso_index)
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 44258d0a64b..2dccb023a60 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -459,7 +459,7 @@ let trans_visitor
     in
       deref (ptr_cast
                (get_element_ptr indirect_args Abi.indirect_args_elt_closure)
-               (Il.ScalarTy (Il.AddrTy (obj_closure_rty word_bits))))
+               (Il.ScalarTy (Il.AddrTy (obj_box_rty word_bits))))
   in
 
   let fp_to_args (fp:Il.cell) (args_rty:Il.referent_ty): Il.cell =
@@ -1236,7 +1236,7 @@ let trans_visitor
     let fty = Hashtbl.find (snd caller) ident in
     let self_args_rty =
       call_args_referent_type cx 0
-        (Ast.TY_fn fty) (Some (obj_closure_rty word_bits))
+        (Ast.TY_fn fty) (Some (obj_box_rty word_bits))
     in
     let callsz = Il.referent_ty_size word_bits self_args_rty in
     let spill = new_fixup "forwarding fn spill" in
@@ -1891,8 +1891,8 @@ let trans_visitor
     begin
       match ty with
           Ast.TY_obj _ ->
-            let lhs_binding = get_element_ptr lhs Abi.obj_field_body_box in
-            let rhs_binding = get_element_ptr rhs Abi.obj_field_body_box in
+            let lhs_binding = get_element_ptr lhs Abi.obj_field_box in
+            let rhs_binding = get_element_ptr rhs Abi.obj_field_box in
             let lhs_box, rhs_box = deref lhs_binding, deref rhs_binding in
             let lhs_obj = get_element_ptr lhs_box Abi.box_rc_field_body in
             let rhs_obj = get_element_ptr rhs_box Abi.box_rc_field_body in
@@ -2643,7 +2643,7 @@ let trans_visitor
 
         | Ast.TY_obj _ ->
             note_drop_step ty "drop_ty: obj path";
-            let binding = get_element_ptr cell Abi.obj_field_body_box in
+            let binding = get_element_ptr cell Abi.obj_field_box in
             let null_jmp = null_check binding in
             let rc_jmp = drop_refcount_and_cmp binding in
             let obj_box = deref binding in
@@ -4948,14 +4948,14 @@ let trans_visitor
         all_args_cell Abi.calltup_elt_ty_params
     in
 
-    let obj_args_tup =
+    let obj_fields_tup =
       Array.map (fun (sloti,_) -> (slot_ty sloti.node)) header
     in
-    let obj_args_ty = Ast.TY_tup obj_args_tup in
-    let state_ty = Ast.TY_tup [| Ast.TY_type; obj_args_ty |] in
-    let state_ptr_ty = Ast.TY_box state_ty in
-    let state_ptr_rty = referent_type word_bits state_ptr_ty in
-    let state_malloc_sz = box_allocation_size state_ptr_ty in
+    let obj_fields_ty = Ast.TY_tup obj_fields_tup in
+    let obj_body_ty = Ast.TY_tup [| Ast.TY_type; obj_fields_ty |] in
+    let box_ptr_ty = Ast.TY_box obj_body_ty in
+    let box_ptr_rty = referent_type word_bits box_ptr_ty in
+    let box_malloc_sz = box_allocation_size box_ptr_ty in
 
     let ctor_ty = Hashtbl.find cx.ctxt_all_item_types obj_id in
     let obj_ty =
@@ -4973,48 +4973,48 @@ let trans_visitor
     let dst_pair_item_cell =
       get_element_ptr dst_pair_cell Abi.obj_field_vtbl
     in
-    let dst_pair_state_cell =
-      get_element_ptr dst_pair_cell Abi.obj_field_body_box
+    let dst_pair_box_cell =
+      get_element_ptr dst_pair_cell Abi.obj_field_box
     in
 
       (* Load first cell of pair with vtbl ptr.*)
       iflog (fun _ -> annotate "mov vtbl-ptr to obj.item cell");
       mov dst_pair_item_cell (Il.Cell vtbl_cell);
 
-      (* Load second cell of pair with pointer to fresh state tuple.*)
-      iflog (fun _ -> annotate "malloc state-tuple to obj.state cell");
-      trans_malloc dst_pair_state_cell state_malloc_sz zero;
+      (* Load second cell of pair with pointer to fresh body tuple.*)
+      iflog (fun _ -> annotate "malloc state-tuple to obj.box-ptr cell");
+      trans_malloc dst_pair_box_cell box_malloc_sz zero;
 
-      (* Copy args into the state tuple. *)
-      let state_ptr = next_vreg_cell (need_scalar_ty state_ptr_rty) in
-        iflog (fun _ -> annotate "load obj.state ptr to vreg");
-        mov state_ptr (Il.Cell dst_pair_state_cell);
-        let state = deref state_ptr in
+      (* Copy rc, tydesc, args into the obj. *)
+      let box_ptr = next_vreg_cell (need_scalar_ty box_ptr_rty) in
+        iflog (fun _ -> annotate "load obj.box ptr to vreg");
+        mov box_ptr (Il.Cell dst_pair_box_cell);
+        let box = deref box_ptr in
         let refcnt =
-          get_element_ptr_dyn_in_current_frame state
+          get_element_ptr_dyn_in_current_frame box
             Abi.box_rc_field_refcnt
         in
         let body =
-          get_element_ptr_dyn_in_current_frame state
+          get_element_ptr_dyn_in_current_frame box
             Abi.box_rc_field_body
         in
         let obj_tydesc =
           get_element_ptr_dyn_in_current_frame body Abi.obj_body_elt_tydesc
         in
-        let obj_args =
+        let obj_fields =
           get_element_ptr_dyn_in_current_frame body Abi.obj_body_elt_fields
         in
-          iflog (fun _ -> annotate "write refcnt=1 to obj state");
+          iflog (fun _ -> annotate "write refcnt=1 to obj box");
           mov refcnt one;
-          iflog (fun _ -> annotate "get args-tup tydesc");
+          iflog (fun _ -> annotate "write tydesc to obj body");
           mov obj_tydesc
             (Il.Cell (get_tydesc
                         (Some obj_id)
-                        (Ast.TY_tup obj_args_tup)));
+                        (Ast.TY_tup obj_fields_tup)));
           iflog (fun _ -> annotate "copy ctor args to obj args");
           trans_copy_tup
             frame_ty_params true
-            obj_args frame_args obj_args_tup;
+            obj_fields frame_args obj_fields_tup;
           (* We have to do something curious here: we can't drop the
            * arg slots directly as in the normal frame-exit sequence,
            * because the arg slot ids are actually given layout