jdk-sandbox: comparison hotspot/src/cpu/x86/vm/x86

equal deleted inserted replaced

-:82e8f98f22d8
+:6671edbd230e
 st->print("INT3");
 }
 #endif
 // EMIT_RM()
-void emit_rm(CodeBuffer &cbuf, int f1, int f2, int f3)
+void emit_rm(CodeBuffer &cbuf, int f1, int f2, int f3) {
-{
 unsigned char c = (unsigned char) ((f1 << 6) | (f2 << 3) | f3);
-*(cbuf.code_end()) = c;
+cbuf.insts()->emit_int8(c);
-cbuf.set_code_end(cbuf.code_end() + 1);
 }
 // EMIT_CC()
-void emit_cc(CodeBuffer &cbuf, int f1, int f2)
+void emit_cc(CodeBuffer &cbuf, int f1, int f2) {
-{
 unsigned char c = (unsigned char) (f1 | f2);
-*(cbuf.code_end()) = c;
+cbuf.insts()->emit_int8(c);
-cbuf.set_code_end(cbuf.code_end() + 1);
 }
 // EMIT_OPCODE()
-void emit_opcode(CodeBuffer &cbuf, int code)
+void emit_opcode(CodeBuffer &cbuf, int code) {
-{
+cbuf.insts()->emit_int8((unsigned char) code);
-*(cbuf.code_end()) = (unsigned char) code;
-cbuf.set_code_end(cbuf.code_end() + 1);
 }
 // EMIT_OPCODE() w/ relocation information
 void emit_opcode(CodeBuffer &cbuf,
 int code, relocInfo::relocType reloc, int offset, int format)
 {
-cbuf.relocate(cbuf.inst_mark() + offset, reloc, format);
+cbuf.relocate(cbuf.insts_mark() + offset, reloc, format);
 emit_opcode(cbuf, code);
 }
 // EMIT_D8()
-void emit_d8(CodeBuffer &cbuf, int d8)
+void emit_d8(CodeBuffer &cbuf, int d8) {
-{
+cbuf.insts()->emit_int8((unsigned char) d8);
-*(cbuf.code_end()) = (unsigned char) d8;
-cbuf.set_code_end(cbuf.code_end() + 1);
 }
 // EMIT_D16()
-void emit_d16(CodeBuffer &cbuf, int d16)
+void emit_d16(CodeBuffer &cbuf, int d16) {
-{
+cbuf.insts()->emit_int16(d16);
-*((short *)(cbuf.code_end())) = d16;
-cbuf.set_code_end(cbuf.code_end() + 2);
 }
 // EMIT_D32()
-void emit_d32(CodeBuffer &cbuf, int d32)
+void emit_d32(CodeBuffer &cbuf, int d32) {
-{
+cbuf.insts()->emit_int32(d32);
-*((int *)(cbuf.code_end())) = d32;
-cbuf.set_code_end(cbuf.code_end() + 4);
 }
 // EMIT_D64()
-void emit_d64(CodeBuffer &cbuf, int64_t d64)
+void emit_d64(CodeBuffer &cbuf, int64_t d64) {
-{
+cbuf.insts()->emit_int64(d64);
-*((int64_t*) (cbuf.code_end())) = d64;
-cbuf.set_code_end(cbuf.code_end() + 8);
 }
 // emit 32 bit value and construct relocation entry from relocInfo::relocType
 void emit_d32_reloc(CodeBuffer& cbuf,
 int d32,
 relocInfo::relocType reloc,
 int format)
 {
 assert(reloc != relocInfo::external_word_type, "use 2-arg emit_d32_reloc");
-cbuf.relocate(cbuf.inst_mark(), reloc, format);
+cbuf.relocate(cbuf.insts_mark(), reloc, format);
+cbuf.insts()->emit_int32(d32);
-*((int*) (cbuf.code_end())) = d32;
-cbuf.set_code_end(cbuf.code_end() + 4);
 }
 // emit 32 bit value and construct relocation entry from RelocationHolder
-void emit_d32_reloc(CodeBuffer& cbuf,
+void emit_d32_reloc(CodeBuffer& cbuf, int d32, RelocationHolder const& rspec, int format) {
-int d32,
-RelocationHolder const& rspec,
-int format)
-{
 #ifdef ASSERT
 if (rspec.reloc()->type() == relocInfo::oop_type &&
 d32 != 0 && d32 != (intptr_t) Universe::non_oop_word()) {
 assert(oop((intptr_t)d32)->is_oop() && (ScavengeRootsInCode || !oop((intptr_t)d32)->is_scavengable()), "cannot embed scavengable oops in code");
 }
 #endif
-cbuf.relocate(cbuf.inst_mark(), rspec, format);
+cbuf.relocate(cbuf.insts_mark(), rspec, format);
+cbuf.insts()->emit_int32(d32);
-*((int* )(cbuf.code_end())) = d32;
-cbuf.set_code_end(cbuf.code_end() + 4);
 }
 void emit_d32_reloc(CodeBuffer& cbuf, address addr) {
-address next_ip = cbuf.code_end() + 4;
+address next_ip = cbuf.insts_end() + 4;
 emit_d32_reloc(cbuf, (int) (addr - next_ip),
 external_word_Relocation::spec(addr),
 RELOC_DISP32);
 }
 // emit 64 bit value and construct relocation entry from relocInfo::relocType
-void emit_d64_reloc(CodeBuffer& cbuf,
+void emit_d64_reloc(CodeBuffer& cbuf, int64_t d64, relocInfo::relocType reloc, int format) {
-int64_t d64,
+cbuf.relocate(cbuf.insts_mark(), reloc, format);
-relocInfo::relocType reloc,
+cbuf.insts()->emit_int64(d64);
-int format)
-{
-cbuf.relocate(cbuf.inst_mark(), reloc, format);
-*((int64_t*) (cbuf.code_end())) = d64;
-cbuf.set_code_end(cbuf.code_end() + 8);
 }
 // emit 64 bit value and construct relocation entry from RelocationHolder
-void emit_d64_reloc(CodeBuffer& cbuf,
+void emit_d64_reloc(CodeBuffer& cbuf, int64_t d64, RelocationHolder const& rspec, int format) {
-int64_t d64,
-RelocationHolder const& rspec,
-int format)
-{
 #ifdef ASSERT
 if (rspec.reloc()->type() == relocInfo::oop_type &&
 d64 != 0 && d64 != (int64_t) Universe::non_oop_word()) {
 assert(oop(d64)->is_oop() && (ScavengeRootsInCode || !oop(d64)->is_scavengable()),
 "cannot embed scavengable oops in code");
 }
 #endif
-cbuf.relocate(cbuf.inst_mark(), rspec, format);
+cbuf.relocate(cbuf.insts_mark(), rspec, format);
+cbuf.insts()->emit_int64(d64);
-*((int64_t*) (cbuf.code_end())) = d64;
-cbuf.set_code_end(cbuf.code_end() + 8);
 }
 // Access stack slot for load or store
 void store_to_stackslot(CodeBuffer &cbuf, int opcode, int rm_field, int disp)
 {
 emit_rm(cbuf, 0x3, 0x05, RSP_enc);
 emit_d32(cbuf, framesize);
 }
 }
-C->set_frame_complete(cbuf.code_end() - cbuf.code_begin());
+C->set_frame_complete(cbuf.insts_size());
 #ifdef ASSERT
 if (VerifyStackAtCalls) {
 Label L;
 MacroAssembler masm(&cbuf);
 emit_opcode(cbuf, 0x58 | RBP_enc);
 if (do_polling() && C->is_method_compilation()) {
 // testl %rax, off(%rip) // Opcode + ModRM + Disp32 == 6 bytes
 // XXX reg_mem doesn't support RIP-relative addressing yet
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
-cbuf.relocate(cbuf.inst_mark(), relocInfo::poll_return_type, 0); // XXX
+cbuf.relocate(cbuf.insts_mark(), relocInfo::poll_return_type, 0); // XXX
 emit_opcode(cbuf, 0x85); // testl
 emit_rm(cbuf, 0x0, RAX_enc, 0x5); // 00 rax 101 == 0x5
-// cbuf.inst_mark() is beginning of instruction
+// cbuf.insts_mark() is beginning of instruction
 emit_d32_reloc(cbuf, os::get_polling_page());
 //                    relocInfo::poll_return_type,
 }
 }
 // Stub is fixed up when the corresponding call is converted from
 // calling compiled code to calling interpreted code.
 // movq rbx, 0
 // jmp -5 # to self
-address mark = cbuf.inst_mark();  // get mark within main instrs section
+address mark = cbuf.insts_mark();  // get mark within main instrs section
-// Note that the code buffer's inst_mark is always relative to insts.
+// Note that the code buffer's insts_mark is always relative to insts.
 // That's why we must use the macroassembler to generate a stub.
 MacroAssembler _masm(&cbuf);
 address base =
 __ start_a_stub(Compile::MAX_stubs_size);
 // static stub relocation also tags the methodOop in the code-stream.
 __ movoop(rbx, (jobject) NULL);  // method is zapped till fixup time
 // This is recognized as unresolved by relocs/nativeinst/ic code
 __ jump(RuntimeAddress(__ pc()));
-// Update current stubs pointer and restore code_end.
+// Update current stubs pointer and restore insts_end.
 __ end_a_stub();
 }
 // size of call stub, compiled java to interpretor
 uint size_java_to_interp()
 #endif
 void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
 {
 MacroAssembler masm(&cbuf);
-uint code_size = cbuf.code_size();
+uint insts_size = cbuf.insts_size();
 if (UseCompressedOops) {
 masm.load_klass(rscratch1, j_rarg0);
 masm.cmpptr(rax, rscratch1);
 } else {
 masm.cmpptr(rax, Address(j_rarg0, oopDesc::klass_offset_in_bytes()));
 masm.jump_cc(Assembler::notEqual, RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
 /* WARNING these NOPs are critical so that verified entry point is properly
 4 bytes aligned for patching by NativeJump::patch_verified_entry() */
-int nops_cnt = 4 - ((cbuf.code_size() - code_size) & 0x3);
+int nops_cnt = 4 - ((cbuf.insts_size() - insts_size) & 0x3);
 if (OptoBreakpoint) {
 // Leave space for int3
 nops_cnt -= 1;
 }
 nops_cnt &= 0x3; // Do not add nops if code is aligned.
 // Emit exception handler code.
 int emit_exception_handler(CodeBuffer& cbuf)
 {
-// Note that the code buffer's inst_mark is always relative to insts.
+// Note that the code buffer's insts_mark is always relative to insts.
 // That's why we must use the macroassembler to generate a handler.
 MacroAssembler _masm(&cbuf);
 address base =
 __ start_a_stub(size_exception_handler());
 if (base == NULL)  return 0;  // CodeBuffer::expand failed
 int offset = __ offset();
-__ jump(RuntimeAddress(OptoRuntime::exception_blob()->instructions_begin()));
+__ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
 assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
 __ end_a_stub();
 return offset;
 }
 // Emit deopt handler code.
 int emit_deopt_handler(CodeBuffer& cbuf)
 {
-// Note that the code buffer's inst_mark is always relative to insts.
+// Note that the code buffer's insts_mark is always relative to insts.
 // That's why we must use the macroassembler to generate a handler.
 MacroAssembler _masm(&cbuf);
 address base =
 __ start_a_stub(size_deopt_handler());
 if (base == NULL)  return 0;  // CodeBuffer::expand failed
 int mark = cbuf.insts()->mark_off();
 MacroAssembler _masm(&cbuf);
 address double_address = __ double_constant(x);
 cbuf.insts()->set_mark_off(mark);  // preserve mark across masm shift
 emit_d32_reloc(cbuf,
-(int) (double_address - cbuf.code_end() - 4),
+(int) (double_address - cbuf.insts_end() - 4),
 internal_word_Relocation::spec(double_address),
 RELOC_DISP32);
 }
 static void emit_float_constant(CodeBuffer& cbuf, float x) {
 int mark = cbuf.insts()->mark_off();
 MacroAssembler _masm(&cbuf);
 address float_address = __ float_constant(x);
 cbuf.insts()->set_mark_off(mark);  // preserve mark across masm shift
 emit_d32_reloc(cbuf,
-(int) (float_address - cbuf.code_end() - 4),
+(int) (float_address - cbuf.insts_end() - 4),
 internal_word_Relocation::spec(float_address),
 RELOC_DISP32);
 }
 enc_class Lbl(label labl)
 %{
 // JMP, CALL
 Label* l = $labl$$label;
-emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.code_size() + 4)) : 0);
+emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0);
 %}
 enc_class LblShort(label labl)
 %{
 // JMP, CALL
 Label* l = $labl$$label;
-int disp = l ? (l->loc_pos() - (cbuf.code_size() + 1)) : 0;
+int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
 assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
 emit_d8(cbuf, disp);
 %}
 enc_class opc2_reg(rRegI dst)
 %{
 // JCC
 Label* l = $labl$$label;
 $$$emit8$primary;
 emit_cc(cbuf, $secondary, $cop$$cmpcode);
-emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.code_size() + 4)) : 0);
+emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0);
 %}
 enc_class JccShort (cmpOp cop, label labl)
 %{
 // JCC
 Label *l = $labl$$label;
 emit_cc(cbuf, $primary, $cop$$cmpcode);
-int disp = l ? (l->loc_pos() - (cbuf.code_size() + 1)) : 0;
+int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
 assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
 emit_d8(cbuf, disp);
 %}
 enc_class enc_cmov(cmpOp cop)
 enc_class Java_To_Interpreter(method meth)
 %{
 // CALL Java_To_Interpreter
 // This is the instruction starting address for relocation info.
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 $$$emit8$primary;
 // CALL directly to the runtime
 emit_d32_reloc(cbuf,
-(int) ($meth$$method - ((intptr_t) cbuf.code_end()) - 4),
+(int) ($meth$$method - ((intptr_t) cbuf.insts_end()) - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 %}
 enc_class preserve_SP %{
-debug_only(int off0 = cbuf.code_size());
+debug_only(int off0 = cbuf.insts_size());
 MacroAssembler _masm(&cbuf);
 // RBP is preserved across all calls, even compiled calls.
 // Use it to preserve RSP in places where the callee might change the SP.
 __ movptr(rbp_mh_SP_save, rsp);
-debug_only(int off1 = cbuf.code_size());
+debug_only(int off1 = cbuf.insts_size());
 assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
 %}
 enc_class restore_SP %{
 MacroAssembler _masm(&cbuf);
 enc_class Java_Static_Call(method meth)
 %{
 // JAVA STATIC CALL
 // CALL to fixup routine.  Fixup routine uses ScopeDesc info to
 // determine who we intended to call.
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 $$$emit8$primary;
 if (!_method) {
 emit_d32_reloc(cbuf,
-(int) ($meth$$method - ((intptr_t) cbuf.code_end()) - 4),
+(int) ($meth$$method - ((intptr_t) cbuf.insts_end()) - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 } else if (_optimized_virtual) {
 emit_d32_reloc(cbuf,
-(int) ($meth$$method - ((intptr_t) cbuf.code_end()) - 4),
+(int) ($meth$$method - ((intptr_t) cbuf.insts_end()) - 4),
 opt_virtual_call_Relocation::spec(),
 RELOC_DISP32);
 } else {
 emit_d32_reloc(cbuf,
-(int) ($meth$$method - ((intptr_t) cbuf.code_end()) - 4),
+(int) ($meth$$method - ((intptr_t) cbuf.insts_end()) - 4),
 static_call_Relocation::spec(),
 RELOC_DISP32);
 }
 if (_method) {
 // Emit stub for static call
 %{
 // JAVA DYNAMIC CALL
 // !!!!!
 // Generate  "movq rax, -1", placeholder instruction to load oop-info
 // emit_call_dynamic_prologue( cbuf );
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 // movq rax, -1
 emit_opcode(cbuf, Assembler::REX_W);
 emit_opcode(cbuf, 0xB8 | RAX_enc);
 emit_d64_reloc(cbuf,
 (int64_t) Universe::non_oop_word(),
 oop_Relocation::spec_for_immediate(), RELOC_IMM64);
-address virtual_call_oop_addr = cbuf.inst_mark();
+address virtual_call_oop_addr = cbuf.insts_mark();
 // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
 // who we intended to call.
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 $$$emit8$primary;
 emit_d32_reloc(cbuf,
-(int) ($meth$$method - ((intptr_t) cbuf.code_end()) - 4),
+(int) ($meth$$method - ((intptr_t) cbuf.insts_end()) - 4),
 virtual_call_Relocation::spec(virtual_call_oop_addr),
 RELOC_DISP32);
 %}
 enc_class Java_Compiled_Call(method meth)
 // XXX XXX offset is 128 is 1.5 NON-PRODUCT !!!
 // assert(-0x80 <= disp && disp < 0x80, "compiled_code_offset isn't small");
 // callq *disp(%rax)
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 $$$emit8$primary;
 if (disp < 0x80) {
 emit_rm(cbuf, 0x01, $secondary, RAX_enc); // R/M byte
 emit_d8(cbuf, disp); // Displacement
 } else {
 %}
 enc_class enc_rethrow()
 %{
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0xE9); // jmp entry
 emit_d32_reloc(cbuf,
-(int) (OptoRuntime::rethrow_stub() - cbuf.code_end() - 4),
+(int) (OptoRuntime::rethrow_stub() - cbuf.insts_end() - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 %}
 enc_class absF_encoding(regF dst)
 %{
 int dstenc = $dst$$reg;
 address signmask_address = (address) StubRoutines::x86::float_sign_mask();
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 if (dstenc >= 8) {
 emit_opcode(cbuf, Assembler::REX_R);
 dstenc -= 8;
 }
 // XXX reg_mem doesn't support RIP-relative addressing yet
 enc_class absD_encoding(regD dst)
 %{
 int dstenc = $dst$$reg;
 address signmask_address = (address) StubRoutines::x86::double_sign_mask();
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0x66);
 if (dstenc >= 8) {
 emit_opcode(cbuf, Assembler::REX_R);
 dstenc -= 8;
 }
 enc_class negF_encoding(regF dst)
 %{
 int dstenc = $dst$$reg;
 address signflip_address = (address) StubRoutines::x86::float_sign_flip();
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 if (dstenc >= 8) {
 emit_opcode(cbuf, Assembler::REX_R);
 dstenc -= 8;
 }
 // XXX reg_mem doesn't support RIP-relative addressing yet
 enc_class negD_encoding(regD dst)
 %{
 int dstenc = $dst$$reg;
 address signflip_address = (address) StubRoutines::x86::double_sign_flip();
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0x66);
 if (dstenc >= 8) {
 emit_opcode(cbuf, Assembler::REX_R);
 dstenc -= 8;
 }
 emit_opcode(cbuf, 0x0F);
 emit_opcode(cbuf, 0x11);
 encode_RegMem(cbuf, srcenc, RSP_enc, 0x4, 0, 0, false); // 2 bytes
 // call f2i_fixup
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0xE8);
 emit_d32_reloc(cbuf,
 (int)
-(StubRoutines::x86::f2i_fixup() - cbuf.code_end() - 4),
+(StubRoutines::x86::f2i_fixup() - cbuf.insts_end() - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 // popq $dst
 if (dstenc >= 8) {
 int dstenc = $dst$$reg;
 int srcenc = $src$$reg;
 address const_address = (address) StubRoutines::x86::double_sign_flip();
 // cmpq $dst, [0x8000000000000000]
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, dstenc < 8 ? Assembler::REX_W : Assembler::REX_WR);
 emit_opcode(cbuf, 0x39);
 // XXX reg_mem doesn't support RIP-relative addressing yet
 emit_rm(cbuf, 0x0, dstenc & 7, 0x5); // 00 reg 101
 emit_d32_reloc(cbuf, const_address);
 emit_opcode(cbuf, 0x0F);
 emit_opcode(cbuf, 0x11);
 encode_RegMem(cbuf, srcenc, RSP_enc, 0x4, 0, 0, false); // 2 bytes
 // call f2l_fixup
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0xE8);
 emit_d32_reloc(cbuf,
 (int)
-(StubRoutines::x86::f2l_fixup() - cbuf.code_end() - 4),
+(StubRoutines::x86::f2l_fixup() - cbuf.insts_end() - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 // popq $dst
 if (dstenc >= 8) {
 emit_opcode(cbuf, 0x0F);
 emit_opcode(cbuf, 0x11);
 encode_RegMem(cbuf, srcenc, RSP_enc, 0x4, 0, 0, false); // 2 bytes
 // call d2i_fixup
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0xE8);
 emit_d32_reloc(cbuf,
 (int)
-(StubRoutines::x86::d2i_fixup() - cbuf.code_end() - 4),
+(StubRoutines::x86::d2i_fixup() - cbuf.insts_end() - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 // popq $dst
 if (dstenc >= 8) {
 int dstenc = $dst$$reg;
 int srcenc = $src$$reg;
 address const_address = (address) StubRoutines::x86::double_sign_flip();
 // cmpq $dst, [0x8000000000000000]
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, dstenc < 8 ? Assembler::REX_W : Assembler::REX_WR);
 emit_opcode(cbuf, 0x39);
 // XXX reg_mem doesn't support RIP-relative addressing yet
 emit_rm(cbuf, 0x0, dstenc & 7, 0x5); // 00 reg 101
 emit_d32_reloc(cbuf, const_address);
 emit_opcode(cbuf, 0x0F);
 emit_opcode(cbuf, 0x11);
 encode_RegMem(cbuf, srcenc, RSP_enc, 0x4, 0, 0, false); // 2 bytes
 // call d2l_fixup
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
 emit_opcode(cbuf, 0xE8);
 emit_d32_reloc(cbuf,
 (int)
-(StubRoutines::x86::d2l_fixup() - cbuf.code_end() - 4),
+(StubRoutines::x86::d2l_fixup() - cbuf.insts_end() - 4),
 runtime_call_Relocation::spec(),
 RELOC_DISP32);
 // popq $dst
 if (dstenc >= 8) {
 // RFLAGS in the process.
 enc_class enc_safepoint_poll
 %{
 // testl %rax, off(%rip) // Opcode + ModRM + Disp32 == 6 bytes
 // XXX reg_mem doesn't support RIP-relative addressing yet
-cbuf.set_inst_mark();
+cbuf.set_insts_mark();
-cbuf.relocate(cbuf.inst_mark(), relocInfo::poll_type, 0); // XXX
+cbuf.relocate(cbuf.insts_mark(), relocInfo::poll_type, 0); // XXX
 emit_opcode(cbuf, 0x85); // testl
 emit_rm(cbuf, 0x0, RAX_enc, 0x5); // 00 rax 101 == 0x5
-// cbuf.inst_mark() is beginning of instruction
+// cbuf.insts_mark() is beginning of instruction
 emit_d32_reloc(cbuf, os::get_polling_page());
 //                    relocInfo::poll_type,
 %}
 %}
 $$$emit8$primary;
 emit_cc(cbuf, $secondary, Assembler::parity);
 int parity_disp = -1;
 if ($cop$$cmpcode == Assembler::notEqual) {
 // the two jumps 6 bytes apart so the jump distances are too
-parity_disp = l ? (l->loc_pos() - (cbuf.code_size() + 4)) : 0;
+parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
 } else if ($cop$$cmpcode == Assembler::equal) {
 parity_disp = 6;
 } else {
 ShouldNotReachHere();
 }
 emit_d32(cbuf, parity_disp);
 $$$emit8$primary;
 emit_cc(cbuf, $secondary, $cop$$cmpcode);
-int disp = l ? (l->loc_pos() - (cbuf.code_size() + 4)) : 0;
+int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
 emit_d32(cbuf, disp);
 %}
 ins_pipe(pipe_jcc);
 ins_pc_relative(1);
 %}
 ins_encode %{
 Label* l = $labl$$label;
 emit_cc(cbuf, $primary, Assembler::parity);
 int parity_disp = -1;
 if ($cop$$cmpcode == Assembler::notEqual) {
-parity_disp = l ? (l->loc_pos() - (cbuf.code_size() + 1)) : 0;
+parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
 } else if ($cop$$cmpcode == Assembler::equal) {
 parity_disp = 2;
 } else {
 ShouldNotReachHere();
 }
 emit_d8(cbuf, parity_disp);
 emit_cc(cbuf, $primary, $cop$$cmpcode);
-int disp = l ? (l->loc_pos() - (cbuf.code_size() + 1)) : 0;
+int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
 emit_d8(cbuf, disp);
 assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
 assert(-128 <= parity_disp && parity_disp <= 127, "Displacement too large for short jmp");
 %}
 ins_pipe(pipe_jcc);

changeset 6418	6671edbd230e
parent 6272	94a20ad0e9de
child 6753	74ad1f54eab7