---

yaml
---
r: 474
b: refs/heads/master
c: df75a96
h: refs/heads/master
v: v3

Author: jyasskin

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e46cc4d0fbd8f1a1c4676931119a858fafeacf
+refs/heads/master: df75a968c56935cca1c1482a8703eca82c607c62

trunk/.gitignore

@@ -30,8 +30,6 @@
 *.swp
 .hg/
 .hgignore
-.cproject
-.project
 lexer.ml
 rustboot
 rustc

trunk/src/Makefile

@@ -245,8 +245,7 @@ BOOT_CMXS := $(BOOT_MLS:.ml=.cmx)
 BOOT_OBJS := $(BOOT_MLS:.ml=.o)
 BOOT_CMIS := $(BOOT_MLS:.ml=.cmi)
 
-RUNTIME_CS := rt/sync/sync.cpp \
-			  rt/sync/spin_lock.cpp \
+RUNTIME_CS := rt/sync/spin_lock.cpp \
               rt/sync/lock_free_queue.cpp \
               rt/sync/condition_variable.cpp \
               rt/rust.cpp \
@@ -280,8 +279,7 @@ RUNTIME_HDR := rt/globals.h \
                rt/rust_message.h \
                rt/circular_buffer.h \
                rt/util/array_list.h \
-               rt/util/hash_map.h \
-               rt/sync/sync.h
+               rt/util/hash_map.h
 
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX))
@@ -385,10 +383,7 @@ TASK_XFAILS := test/run-pass/acyclic-unwind.rs \
                test/run-pass/threads.rs \
                test/run-pass/yield.rs
 
-TEST_XFAILS := test/run-pass/arith-0.rs
-
 TEST_XFAILS_X86 :=  $(TASK_XFAILS) \
-					$(TEST_XFAILS) \
                     test/run-pass/arithmetic-interference.rs \
                     test/run-pass/bind-obj-ctor.rs \
                     test/run-pass/child-outlives-parent.rs \
@@ -419,9 +414,7 @@ TEST_XFAILS_X86 :=  $(TASK_XFAILS) \
                     test/compile-fail/writing-through-read-alias.rs
 
 TEST_XFAILS_LLVM := $(TASK_XFAILS) \
-					$(TEST_XFAILS) \
                     $(addprefix test/run-pass/, \
-                      arith-1.rs \
                       acyclic-unwind.rs \
                       alt-pattern-simple.rs \
                       alt-tag.rs \
@@ -430,8 +423,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       autoderef-full-lval.rs \
                       autoderef-objfn.rs \
                       basic.rs \
-                      basic-1.rs \
-                      basic-2.rs \
                       bind-obj-ctor.rs \
                       bind-thunk.rs \
                       bind-trivial.rs \
@@ -472,7 +463,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       i32-sub.rs \
                       i8-incr.rs \
                       import.rs \
-                      inner-module.rs \
                       integral-indexing.rs \
                       int-lib.rs \
                       iter-range.rs \

trunk/src/boot/be/abi.ml

@@ -41,7 +41,7 @@ let box_gc_header_size = 4;;
 
 let box_gc_malloc_return_adjustment = 3;;
 
-let stk_field_valgrind_id = 0;;
+let stk_field_valgrind_id = 0 + 1;;
 let stk_field_limit = stk_field_valgrind_id + 1;;
 let stk_field_data = stk_field_limit + 1;;
 
@@ -121,8 +121,7 @@ type abi =
                              -> Common.size      (* callsz  *)
                                -> Common.nabi
                                  -> Common.fixup (* grow_task *)
-                                   -> bool       (* is_obj_fn *)
-                                     -> unit);
+                                   -> unit);
 
     abi_emit_fn_epilogue: (Il.emitter -> unit);
 

trunk/src/boot/be/il.ml

@@ -901,13 +901,6 @@ 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,7 +593,6 @@ 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  ]
@@ -1034,7 +1033,7 @@ let unwind_glue
 
 
 (* Puts result in eax; clobbers ecx, edx in the process. *)
-let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : unit =
+let rec calculate_sz (e:Il.emitter) (size:size) : 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
@@ -1046,48 +1045,11 @@ let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : 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 in_obj;
+    calculate_sz e b;
     push (ro eax);
-    calculate_sz e a in_obj;
+    calculate_sz e a;
     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)
@@ -1099,23 +1061,15 @@ let rec calculate_sz (e:Il.emitter) (size:size) (in_obj:bool) : unit =
           mov (rc eax) (imm (Asm.M_POS f))
 
       | SIZE_param_size 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 (ty_param_n i));
           mov (rc eax) (Il.Cell (word_n (h eax) Abi.tydesc_field_size))
 
       | SIZE_param_align 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 (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 in_obj;
+          calculate_sz e a;
           neg eax
 
       | SIZE_rt_add (a, b) ->
@@ -1231,7 +1185,6 @@ let fn_prologue
     (callsz:size)
     (nabi:nabi)
     (grow_task_fixup:fixup)
-    (is_obj_fn:bool)
     : unit =
 
   let esi_n = word_n (h esi) in
@@ -1361,7 +1314,7 @@ let fn_prologue
                     emit (Il.jmp Il.JA Il.CodeNone);
 
                     (* Calculate dynamic frame size. *)
-                    calculate_sz e call_and_frame_sz is_obj_fn;
+                    calculate_sz e call_and_frame_sz;
                     ((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 word_bits (Ast.TY_rec trec) in
+        let rty = referent_type abi (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 word_bits (Ast.TY_tag ttag) in
+        let rty = referent_type abi (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.Abi.abi_word_bits slot)
+      rt_in_mem (slot_referent_type cx.ctxt_abi 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.Abi.abi_word_bits slot in
+      let rt = slot_referent_type cx.ctxt_abi slot in
       let (elt_size, elt_align) = rty_layout rt in
         if vregs_ok
           && (is_subword_size elt_size)
@@ -170,9 +170,7 @@ let layout_visitor
               then elt_off
               else neg_sz (add_sz elt_off elt_size)
             in
-              Stack.push
-                (slot_referent_type cx.ctxt_abi.Abi.abi_word_bits slot)
-                slot_accum;
+              Stack.push (slot_referent_type cx.ctxt_abi slot) slot_accum;
             iflog
               begin
                 fun _ ->