*** old/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Nov 25 07:06:01 2010
--- new/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Nov 25 07:06:01 2010

*** 153,167 ****
--- 153,182 ----
      movptr(Address(obj, oopDesc::mark_offset_in_bytes()), t1);
    } else {
      // This assumes that all prototype bits fit in an int32_t
      movptr(Address(obj, oopDesc::mark_offset_in_bytes ()), (int32_t)(intptr_t)markOopDesc::prototype());
    }
  
+ #ifdef _LP64
+   if (UseCompressedOops) { // Take care not to kill klass
+     movptr(t1, klass);
+     encode_heap_oop_not_null(t1);
+     movl(Address(obj, oopDesc::klass_offset_in_bytes()), t1);
+   } else 
+ #endif
+   {
      movptr(Address(obj, oopDesc::klass_offset_in_bytes()), klass);
+   }
+ 
    if (len->is_valid()) {
      movl(Address(obj, arrayOopDesc::length_offset_in_bytes()), len);
    }
+ #ifdef _LP64 
+   else if (UseCompressedOops) {
+     xorptr(t1, t1);
+     store_klass_gap(obj, t1);
+   }
+ #endif
  }
  
  
  // preserves obj, destroys len_in_bytes
  void C1_MacroAssembler::initialize_body(Register obj, Register len_in_bytes, int hdr_size_in_bytes, Register t1) {

*** 228,238 ****
--- 243,253 ----
  }
  
  void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register var_size_in_bytes, int con_size_in_bytes, Register t1, Register t2) {
    assert((con_size_in_bytes & MinObjAlignmentInBytesMask) == 0,
           "con_size_in_bytes is not multiple of alignment");
!   const int hdr_size_in_bytes = instanceOopDesc::base_offset_in_bytes();
!   const int hdr_size_in_bytes = instanceOopDesc::header_size() * HeapWordSize;
  
    initialize_header(obj, klass, noreg, t1, t2);
  
    // clear rest of allocated space
    const Register t1_zero = t1;

*** 315,331 ****
--- 330,352 ----
    verify_oop(receiver);
    // explicit NULL check not needed since load from [klass_offset] causes a trap
    // check against inline cache
    assert(!MacroAssembler::needs_explicit_null_check(oopDesc::klass_offset_in_bytes()), "must add explicit null check");
    int start_offset = offset();
+ 
+   if (UseCompressedOops) {
+     load_klass(rscratch1, receiver);
+     cmpptr(rscratch1, iCache);
+   } else {
      cmpptr(iCache, Address(receiver, oopDesc::klass_offset_in_bytes()));
+   }
    // if icache check fails, then jump to runtime routine
    // Note: RECEIVER must still contain the receiver!
    jump_cc(Assembler::notEqual,
            RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
    const int ic_cmp_size = LP64_ONLY(10) NOT_LP64(9);
!   assert(UseCompressedOops || offset() - start_offset == ic_cmp_size, "check alignment in emit_method_entry");
  }
  
  
  void C1_MacroAssembler::build_frame(int frame_size_in_bytes) {
    // Make sure there is enough stack space for this method's activation.