< prev index next > src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
BarrierSetC1_v3
BarrierSetC1_v2
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
#include "utilities/macros.hpp"
#ifdef ASSERT
-#define __ lir_generator->lir(__FILE__, __LINE__)->
+#define __ gen->lir(__FILE__, __LINE__)->
#else
-#define __ lir_generator->lir()->
+#define __ gen->lir()->
#endif
void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
G1BarrierSetAssembler* bs = (G1BarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
bs->gen_g1_pre_barrier_stub(ce, this);
void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {
G1BarrierSetAssembler* bs = (G1BarrierSetAssembler*)BarrierSet::barrier_set()->barrier_set_assembler();
bs->gen_g1_post_barrier_stub(ce, this);
}
-void G1BarrierSetC1::pre_barrier(LIRGenerator *lir_generator, DecoratorSet decorators,
- LIR_Opr addr_opr, LIR_Opr pre_val, CodeEmitInfo* info) {
+void G1BarrierSetC1::pre_barrier(LIRAccess& access, LIR_Opr addr_opr,
+ LIR_Opr pre_val, CodeEmitInfo* info) {
+ LIRGenerator* gen = access.gen();
+ DecoratorSet decorators = access.decorators();
bool in_heap = (decorators & IN_HEAP) != 0;
bool in_conc_root = (decorators & IN_CONCURRENT_ROOT) != 0;
if (!in_heap && !in_conc_root) {
return;
}
"Assumption");
// Use unsigned type T_BOOLEAN here rather than signed T_BYTE since some platforms, eg. ARM,
// need to use unsigned instructions to use the large offset to load the satb_mark_queue.
flag_type = T_BOOLEAN;
}
- LIR_Opr thrd = lir_generator->getThreadPointer();
+ LIR_Opr thrd = gen->getThreadPointer();
LIR_Address* mark_active_flag_addr =
new LIR_Address(thrd,
in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()),
flag_type);
// Read the marking-in-progress flag.
- LIR_Opr flag_val = lir_generator->new_register(T_INT);
+ LIR_Opr flag_val = gen->new_register(T_INT);
__ load(mark_active_flag_addr, flag_val);
__ cmp(lir_cond_notEqual, flag_val, LIR_OprFact::intConst(0));
LIR_PatchCode pre_val_patch_code = lir_patch_none;
assert(addr_opr != LIR_OprFact::illegalOpr, "sanity");
if (patch)
pre_val_patch_code = lir_patch_normal;
- pre_val = lir_generator->new_register(T_OBJECT);
+ pre_val = gen->new_register(T_OBJECT);
if (!addr_opr->is_address()) {
assert(addr_opr->is_register(), "must be");
addr_opr = LIR_OprFact::address(new LIR_Address(addr_opr, T_OBJECT));
}
__ branch(lir_cond_notEqual, T_INT, slow);
__ branch_destination(slow->continuation());
}
-void G1BarrierSetC1::post_barrier(LIRGenerator *lir_generator, DecoratorSet decorators,
- LIR_OprDesc* addr, LIR_OprDesc* new_val) {
+void G1BarrierSetC1::post_barrier(LIRAccess& access, LIR_OprDesc* addr, LIR_OprDesc* new_val) {
+ LIRGenerator* gen = access.gen();
+ DecoratorSet decorators = access.decorators();
bool in_heap = (decorators & IN_HEAP) != 0;
if (!in_heap) {
return;
}
// If the "new_val" is a constant NULL, no barrier is necessary.
if (new_val->is_constant() &&
new_val->as_constant_ptr()->as_jobject() == NULL) return;
if (!new_val->is_register()) {
- LIR_Opr new_val_reg = lir_generator->new_register(T_OBJECT);
+ LIR_Opr new_val_reg = gen->new_register(T_OBJECT);
if (new_val->is_constant()) {
__ move(new_val, new_val_reg);
} else {
__ leal(new_val, new_val_reg);
}
}
assert(new_val->is_register(), "must be a register at this point");
if (addr->is_address()) {
LIR_Address* address = addr->as_address_ptr();
- LIR_Opr ptr = lir_generator->new_pointer_register();
+ LIR_Opr ptr = gen->new_pointer_register();
if (!address->index()->is_valid() && address->disp() == 0) {
__ move(address->base(), ptr);
} else {
assert(address->disp() != max_jint, "lea doesn't support patched addresses!");
__ leal(addr, ptr);
}
addr = ptr;
}
assert(addr->is_register(), "must be a register at this point");
- LIR_Opr xor_res = lir_generator->new_pointer_register();
- LIR_Opr xor_shift_res = lir_generator->new_pointer_register();
+ LIR_Opr xor_res = gen->new_pointer_register();
+ LIR_Opr xor_shift_res = gen->new_pointer_register();
if (TwoOperandLIRForm) {
__ move(addr, xor_res);
__ logical_xor(xor_res, new_val, xor_res);
__ move(xor_res, xor_shift_res);
__ unsigned_shift_right(xor_shift_res,
xor_shift_res,
LIR_OprDesc::illegalOpr());
}
if (!new_val->is_register()) {
- LIR_Opr new_val_reg = lir_generator->new_register(T_OBJECT);
+ LIR_Opr new_val_reg = gen->new_register(T_OBJECT);
__ leal(new_val, new_val_reg);
new_val = new_val_reg;
}
assert(new_val->is_register(), "must be a register at this point");
CodeStub* slow = new G1PostBarrierStub(addr, new_val);
__ branch(lir_cond_notEqual, LP64_ONLY(T_LONG) NOT_LP64(T_INT), slow);
__ branch_destination(slow->continuation());
}
-void G1BarrierSetC1::load_at_resolved(LIRGenerator *lir_generator, DecoratorSet decorators, BasicType type,
- LIR_Opr addr, LIRItem& base, LIR_Opr offset, LIR_Opr result,
- CodeEmitInfo* patch_info, CodeEmitInfo* load_emit_info) {
- bool is_oop = type == T_OBJECT || type == T_ARRAY;
+void G1BarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) {
+ DecoratorSet decorators = access.decorators();
bool is_weak = (decorators & ON_WEAK_OOP_REF) != 0;
bool is_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
bool is_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
+ LIRGenerator *gen = access.gen();
- BarrierSetC1::load_at_resolved(lir_generator, decorators, type, addr, base, offset, result, patch_info, load_emit_info);
+ BarrierSetC1::load_at_resolved(access, result);
- if (is_oop && (is_weak || is_phantom || is_anonymous)) {
+ if (access.is_oop() && (is_weak || is_phantom || is_anonymous)) {
// Register the value in the referent field with the pre-barrier
LabelObj *Lcont_anonymous;
if (is_anonymous) {
Lcont_anonymous = new LabelObj();
- generate_referent_check(lir_generator, base, offset, Lcont_anonymous);
+ generate_referent_check(access, Lcont_anonymous);
}
- pre_barrier(lir_generator, decorators, LIR_OprFact::illegalOpr /* addr_opr */, result /* pre_val */, patch_info /* info */);
+ pre_barrier(access, LIR_OprFact::illegalOpr /* addr_opr */,
+ result /* pre_val */, access.patch_info() /* info */);
if (is_anonymous) {
__ branch_destination(Lcont_anonymous->label());
}
}
}
};
void G1BarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob) {
C1G1PreBarrierCodeGenClosure pre_code_gen_cl;
C1G1PostBarrierCodeGenClosure post_code_gen_cl;
- _pre_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, -1, "g1_pre_barrier_slow", false, &pre_code_gen_cl);
- _post_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, -1, "g1_post_barrier_slow", false, &post_code_gen_cl);
+ _pre_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, -1, "g1_pre_barrier_slow",
+ false, &pre_code_gen_cl);
+ _post_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, -1, "g1_post_barrier_slow",
+ false, &post_code_gen_cl);
}
< prev index next >