< prev index next >
src/cpu/x86/vm/c1_Runtime1_x86.cpp
Print this page
rev 12906 : [mq]: gc_interface
@@ -36,14 +36,10 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/macros.hpp"
#include "vmreg_x86.inline.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
-#endif
-
// Implementation of StubAssembler
int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, int args_size) {
// setup registers
@@ -205,44 +201,43 @@
void load_argument(int offset_in_words, Register reg);
~StubFrame();
};
+void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
+ set_info(name, must_gc_arguments);
+ enter();
+}
+
+void StubAssembler::epilogue() {
+ leave();
+ ret(0);
+}
#define __ _sasm->
StubFrame::StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments) {
_sasm = sasm;
- __ set_info(name, must_gc_arguments);
- __ enter();
+ __ prologue(name, must_gc_arguments);
}
// load parameters that were stored with LIR_Assembler::store_parameter
// Note: offsets for store_parameter and load_argument must match
void StubFrame::load_argument(int offset_in_words, Register reg) {
- // rbp, + 0: link
- // + 1: return address
- // + 2: argument with offset 0
- // + 3: argument with offset 1
- // + 4: ...
-
- __ movptr(reg, Address(rbp, (offset_in_words + 2) * BytesPerWord));
+ __ load_parameter(offset_in_words, reg);
}
StubFrame::~StubFrame() {
- __ leave();
- __ ret(0);
+ __ epilogue();
}
#undef __
// Implementation of Runtime1
-#define __ sasm->
-
const int float_regs_as_doubles_size_in_slots = pd_nof_fpu_regs_frame_map * 2;
const int xmm_regs_as_doubles_size_in_slots = FrameMap::nof_xmm_regs * 2;
// Stack layout for saving/restoring all the registers needed during a runtime
// call (this includes deoptimization)
@@ -303,12 +298,10 @@
saved_rbp_off, SLOT2(saved_rbpH_off) // 488, 492
return_off, SLOT2(returnH_off) // 496, 500
reg_save_frame_size // As noted: neglects any parameters to runtime // 504
};
-
-
// Save off registers which might be killed by calls into the runtime.
// Tries to smart of about FP registers. In particular we separate
// saving and describing the FPU registers for deoptimization since we
// have to save the FPU registers twice if we describe them and on P4
// saving FPU registers which don't contain anything appears
@@ -411,12 +404,13 @@
}
return map;
}
-static OopMap* save_live_registers(StubAssembler* sasm, int num_rt_args,
- bool save_fpu_registers = true) {
+#define __ this->
+
+void C1_MacroAssembler::save_live_registers_no_oop_map(int num_rt_args, bool save_fpu_registers) {
__ block_comment("save_live_registers");
__ pusha(); // integer registers
// assert(float_regs_as_doubles_off % 2 == 0, "misaligned offset");
@@ -486,16 +480,16 @@
}
}
// FPU stack must be empty now
__ verify_FPU(0, "save_live_registers");
-
- return generate_oop_map(sasm, num_rt_args, save_fpu_registers);
}
+#undef __
+#define __ sasm->
-static void restore_fpu(StubAssembler* sasm, bool restore_fpu_registers = true) {
+static void restore_fpu(C1_MacroAssembler* sasm, bool restore_fpu_registers) {
if (restore_fpu_registers) {
if (UseSSE >= 2) {
// restore XMM registers
int xmm_bypass_limit = FrameMap::nof_xmm_regs;
#ifdef _LP64
@@ -542,18 +536,32 @@
#endif // ASSERT
__ addptr(rsp, extra_space_offset * VMRegImpl::stack_slot_size);
}
+#undef __
+#define __ this->
-static void restore_live_registers(StubAssembler* sasm, bool restore_fpu_registers = true) {
+void C1_MacroAssembler::restore_live_registers(bool restore_fpu_registers) {
__ block_comment("restore_live_registers");
- restore_fpu(sasm, restore_fpu_registers);
+ restore_fpu(this, restore_fpu_registers);
__ popa();
}
+#undef __
+#define __ sasm->
+
+static OopMap* save_live_registers(StubAssembler* sasm, int num_rt_args,
+ bool save_fpu_registers = true) {
+ sasm->save_live_registers_no_oop_map(num_rt_args, save_fpu_registers);
+ return generate_oop_map(sasm, num_rt_args, save_fpu_registers);
+}
+
+static void restore_live_registers(StubAssembler* sasm, bool restore_fpu_registers = true) {
+ sasm->restore_live_registers(restore_fpu_registers);
+}
static void restore_live_registers_except_rax(StubAssembler* sasm, bool restore_fpu_registers = true) {
__ block_comment("restore_live_registers_except_rax");
restore_fpu(sasm, restore_fpu_registers);
@@ -1599,165 +1607,10 @@
__ pop(rsi);
__ ret(0);
}
break;
-#if INCLUDE_ALL_GCS
- case g1_pre_barrier_slow_id:
- {
- StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
- // arg0 : previous value of memory
-
- BarrierSet* bs = Universe::heap()->barrier_set();
- if (bs->kind() != BarrierSet::G1SATBCTLogging) {
- __ movptr(rax, (int)id);
- __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
- __ should_not_reach_here();
- break;
- }
- __ push(rax);
- __ push(rdx);
-
- const Register pre_val = rax;
- const Register thread = NOT_LP64(rax) LP64_ONLY(r15_thread);
- const Register tmp = rdx;
-
- NOT_LP64(__ get_thread(thread);)
-
- Address queue_active(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
- SATBMarkQueue::byte_offset_of_active()));
- Address queue_index(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
- SATBMarkQueue::byte_offset_of_index()));
- Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
- SATBMarkQueue::byte_offset_of_buf()));
-
- Label done;
- Label runtime;
-
- // Is marking still active?
- if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
- __ cmpl(queue_active, 0);
- } else {
- assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
- __ cmpb(queue_active, 0);
- }
- __ jcc(Assembler::equal, done);
-
- // Can we store original value in the thread's buffer?
-
- __ movptr(tmp, queue_index);
- __ testptr(tmp, tmp);
- __ jcc(Assembler::zero, runtime);
- __ subptr(tmp, wordSize);
- __ movptr(queue_index, tmp);
- __ addptr(tmp, buffer);
-
- // prev_val (rax)
- f.load_argument(0, pre_val);
- __ movptr(Address(tmp, 0), pre_val);
- __ jmp(done);
-
- __ bind(runtime);
-
- save_live_registers(sasm, 3);
-
- // load the pre-value
- f.load_argument(0, rcx);
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), rcx, thread);
-
- restore_live_registers(sasm);
-
- __ bind(done);
-
- __ pop(rdx);
- __ pop(rax);
- }
- break;
-
- case g1_post_barrier_slow_id:
- {
- StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
-
-
- // arg0: store_address
- Address store_addr(rbp, 2*BytesPerWord);
-
- CardTableModRefBS* ct =
- barrier_set_cast<CardTableModRefBS>(Universe::heap()->barrier_set());
- assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
-
- Label done;
- Label enqueued;
- Label runtime;
-
- // At this point we know new_value is non-NULL and the new_value crosses regions.
- // Must check to see if card is already dirty
-
- const Register thread = NOT_LP64(rax) LP64_ONLY(r15_thread);
-
- Address queue_index(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
- DirtyCardQueue::byte_offset_of_index()));
- Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
- DirtyCardQueue::byte_offset_of_buf()));
-
- __ push(rax);
- __ push(rcx);
-
- const Register cardtable = rax;
- const Register card_addr = rcx;
-
- f.load_argument(0, card_addr);
- __ shrptr(card_addr, CardTableModRefBS::card_shift);
- // Do not use ExternalAddress to load 'byte_map_base', since 'byte_map_base' is NOT
- // a valid address and therefore is not properly handled by the relocation code.
- __ movptr(cardtable, (intptr_t)ct->byte_map_base);
- __ addptr(card_addr, cardtable);
-
- NOT_LP64(__ get_thread(thread);)
-
- __ cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
- __ jcc(Assembler::equal, done);
-
- __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
- __ cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
- __ jcc(Assembler::equal, done);
-
- // storing region crossing non-NULL, card is clean.
- // dirty card and log.
-
- __ movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
-
- const Register tmp = rdx;
- __ push(rdx);
-
- __ movptr(tmp, queue_index);
- __ testptr(tmp, tmp);
- __ jcc(Assembler::zero, runtime);
- __ subptr(tmp, wordSize);
- __ movptr(queue_index, tmp);
- __ addptr(tmp, buffer);
- __ movptr(Address(tmp, 0), card_addr);
- __ jmp(enqueued);
-
- __ bind(runtime);
-
- save_live_registers(sasm, 3);
-
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread);
-
- restore_live_registers(sasm);
-
- __ bind(enqueued);
- __ pop(rdx);
-
- __ bind(done);
- __ pop(rcx);
- __ pop(rax);
- }
- break;
-#endif // INCLUDE_ALL_GCS
-
case predicate_failed_trap_id:
{
StubFrame f(sasm, "predicate_failed_trap", dont_gc_arguments);
OopMap* map = save_live_registers(sasm, 1);
< prev index next >