Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Thu May 22 13:05:24 2014 -0700
     1.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Tue Apr 29 22:04:09 2014 -0700
     1.3 @@ -83,7 +83,7 @@
     1.4   private:
     1.5  
     1.6  #ifdef PRODUCT
     1.7 -#define inc_counter_np(a,b,c) (0)
     1.8 +#define inc_counter_np(a,b,c)
     1.9  #else
    1.10  #define inc_counter_np(counter, t1, t2) \
    1.11    BLOCK_COMMENT("inc_counter " #counter); \
    1.12 @@ -1055,7 +1055,7 @@
    1.13                                                Label& L_loop, bool use_prefetch, bool use_bis);
    1.14  
    1.15    void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
    1.16 -                          int iter_size, CopyLoopFunc copy_loop_func) {
    1.17 +                          int iter_size, StubGenerator::CopyLoopFunc copy_loop_func) {
    1.18      Label L_copy;
    1.19  
    1.20      assert(log2_elem_size <= 3, "the following code should be changed");
    1.21 @@ -1206,7 +1206,7 @@
    1.22      __ inc(from, 8);
    1.23      __ sllx(O3, left_shift,  O3);
    1.24  
    1.25 -    disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop);
    1.26 +    disjoint_copy_core(from, to, count, log2_elem_size, 16, &StubGenerator::copy_16_bytes_shift_loop);
    1.27  
    1.28      __ inccc(count, count_dec>>1 ); // + 8 bytes
    1.29      __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
    1.30 @@ -2085,7 +2085,7 @@
    1.31        __ dec(count, 4);   // The cmp at the beginning guaranty count >= 4
    1.32        __ sllx(O3, 32,  O3);
    1.33  
    1.34 -      disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop);
    1.35 +      disjoint_copy_core(from, to, count, 2, 16, &StubGenerator::copy_16_bytes_loop);
    1.36  
    1.37        __ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
    1.38        __ delayed()->inc(count, 4); // restore 'count'
    1.39 @@ -2366,7 +2366,7 @@
    1.40      // count >= 0 (original count - 8)
    1.41      __ mov(from, from64);
    1.42  
    1.43 -    disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop);
    1.44 +    disjoint_copy_core(from64, to64, count, 3, 64, &StubGenerator::copy_64_bytes_loop);
    1.45  
    1.46        // Restore O4(offset0), O5(offset8)
    1.47        __ sub(from64, from, offset0);