Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Fri Jan 06 16:18:29 2012 -0800
     1.2 +++ b/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Fri Jan 06 20:09:20 2012 -0800
     1.3 @@ -398,14 +398,14 @@
     1.4  
     1.5            if (id == fast_new_instance_init_check_id) {
     1.6              // make sure the klass is initialized
     1.7 -            __ ldub(G5_klass, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc), G3_t1);
     1.8 +            __ ldub(G5_klass, in_bytes(instanceKlass::init_state_offset()), G3_t1);
     1.9              __ cmp_and_br_short(G3_t1, instanceKlass::fully_initialized, Assembler::notEqual, Assembler::pn, slow_path);
    1.10            }
    1.11  #ifdef ASSERT
    1.12            // assert object can be fast path allocated
    1.13            {
    1.14              Label ok, not_ok;
    1.15 -          __ ld(G5_klass, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc), G1_obj_size);
    1.16 +          __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
    1.17            // make sure it's an instance (LH > 0)
    1.18            __ cmp_and_br_short(G1_obj_size, 0, Assembler::lessEqual, Assembler::pn, not_ok);
    1.19            __ btst(Klass::_lh_instance_slow_path_bit, G1_obj_size);
    1.20 @@ -425,7 +425,7 @@
    1.21            __ bind(retry_tlab);
    1.22  
    1.23            // get the instance size
    1.24 -          __ ld(G5_klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), G1_obj_size);
    1.25 +          __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
    1.26  
    1.27            __ tlab_allocate(O0_obj, G1_obj_size, 0, G3_t1, slow_path);
    1.28  
    1.29 @@ -437,7 +437,7 @@
    1.30  
    1.31            __ bind(try_eden);
    1.32            // get the instance size
    1.33 -          __ ld(G5_klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), G1_obj_size);
    1.34 +          __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
    1.35            __ eden_allocate(O0_obj, G1_obj_size, 0, G3_t1, G4_t2, slow_path);
    1.36            __ incr_allocated_bytes(G1_obj_size, G3_t1, G4_t2);
    1.37  
    1.38 @@ -471,8 +471,7 @@
    1.39          Register G4_length = G4; // Incoming
    1.40          Register O0_obj   = O0; // Outgoing
    1.41  
    1.42 -        Address klass_lh(G5_klass, ((klassOopDesc::header_size() * HeapWordSize)
    1.43 -                                    + Klass::layout_helper_offset_in_bytes()));
    1.44 +        Address klass_lh(G5_klass, Klass::layout_helper_offset());
    1.45          assert(Klass::_lh_header_size_shift % BitsPerByte == 0, "bytewise");
    1.46          assert(Klass::_lh_header_size_mask == 0xFF, "bytewise");
    1.47          // Use this offset to pick out an individual byte of the layout_helper:
    1.48 @@ -592,7 +591,7 @@
    1.49          Label register_finalizer;
    1.50          Register t = O1;
    1.51          __ load_klass(O0, t);
    1.52 -        __ ld(t, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc), t);
    1.53 +        __ ld(t, in_bytes(Klass::access_flags_offset()), t);
    1.54          __ set(JVM_ACC_HAS_FINALIZER, G3);
    1.55          __ andcc(G3, t, G0);
    1.56          __ br(Assembler::notZero, false, Assembler::pt, register_finalizer);