提交 d5d793b9 编写于 作者: M mikael

8022070: Compilation error in stubGenerator_sparc.cpp with some compilers

Reviewed-by: twisti, kvn
上级 7ef335ad
......@@ -83,7 +83,7 @@ class StubGenerator: public StubCodeGenerator {
private:
#ifdef PRODUCT
#define inc_counter_np(a,b,c) (0)
#define inc_counter_np(a,b,c)
#else
#define inc_counter_np(counter, t1, t2) \
BLOCK_COMMENT("inc_counter " #counter); \
......@@ -1055,7 +1055,7 @@ class StubGenerator: public StubCodeGenerator {
Label& L_loop, bool use_prefetch, bool use_bis);
void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
int iter_size, CopyLoopFunc copy_loop_func) {
int iter_size, StubGenerator::CopyLoopFunc copy_loop_func) {
Label L_copy;
assert(log2_elem_size <= 3, "the following code should be changed");
......@@ -1206,7 +1206,7 @@ class StubGenerator: public StubCodeGenerator {
__ inc(from, 8);
__ sllx(O3, left_shift, O3);
disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop);
disjoint_copy_core(from, to, count, log2_elem_size, 16, &StubGenerator::copy_16_bytes_shift_loop);
__ inccc(count, count_dec>>1 ); // + 8 bytes
__ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
......@@ -2085,7 +2085,7 @@ class StubGenerator: public StubCodeGenerator {
__ dec(count, 4); // The cmp at the beginning guaranty count >= 4
__ sllx(O3, 32, O3);
disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop);
disjoint_copy_core(from, to, count, 2, 16, &StubGenerator::copy_16_bytes_loop);
__ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
__ delayed()->inc(count, 4); // restore 'count'
......@@ -2366,7 +2366,7 @@ class StubGenerator: public StubCodeGenerator {
// count >= 0 (original count - 8)
__ mov(from, from64);
disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop);
disjoint_copy_core(from64, to64, count, 3, 64, &StubGenerator::copy_64_bytes_loop);
// Restore O4(offset0), O5(offset8)
__ sub(from64, from, offset0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册