equal
deleted
inserted
replaced
1306 } |
1306 } |
1307 if (aligned) { |
1307 if (aligned) { |
1308 decorators |= ARRAYCOPY_ALIGNED; |
1308 decorators |= ARRAYCOPY_ALIGNED; |
1309 } |
1309 } |
1310 |
1310 |
1311 BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler(); |
1311 BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler(); |
1312 bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3); |
1312 bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3); |
1313 |
1313 |
1314 generate_disjoint_copy(aligned, size, true, true); |
1314 generate_disjoint_copy(aligned, size, true, true); |
1315 |
1315 |
1316 bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true); |
1316 bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true); |
1398 } |
1398 } |
1399 if (aligned) { |
1399 if (aligned) { |
1400 decorators |= ARRAYCOPY_ALIGNED; |
1400 decorators |= ARRAYCOPY_ALIGNED; |
1401 } |
1401 } |
1402 |
1402 |
1403 BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler(); |
1403 BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler(); |
1404 bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3); |
1404 bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3); |
1405 |
1405 |
1406 generate_conjoint_copy(aligned, size, true); // Must preserve ARG2, ARG3. |
1406 generate_conjoint_copy(aligned, size, true); // Must preserve ARG2, ARG3. |
1407 |
1407 |
1408 bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true); |
1408 bs->arraycopy_epilogue(_masm, decorators, T_OBJECT, Z_ARG2, Z_ARG3, true); |