--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp Wed Mar 25 15:22:44 2015 +0000
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp Wed Mar 25 15:18:37 2015 -0700
@@ -544,8 +544,16 @@
}
void TemplateTable::iload() {
+ iload_internal();
+}
+
+void TemplateTable::nofast_iload() {
+ iload_internal(may_not_rewrite);
+}
+
+void TemplateTable::iload_internal(RewriteControl rc) {
transition(vtos, itos);
- if (RewriteFrequentPairs) {
+ if (RewriteFrequentPairs && rc == may_rewrite) {
Label rewrite, done;
const Register bc = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
LP64_ONLY(assert(rbx != bc, "register damaged"));
@@ -816,6 +824,14 @@
}
void TemplateTable::aload_0() {
+ aload_0_internal();
+}
+
+void TemplateTable::nofast_aload_0() {
+ aload_0_internal(may_not_rewrite);
+}
+
+void TemplateTable::aload_0_internal(RewriteControl rc) {
transition(vtos, atos);
// According to bytecode histograms, the pairs:
//
@@ -838,7 +854,7 @@
// aload_0, iload_1
// These bytecodes with a small amount of code are most profitable
// to rewrite
- if (RewriteFrequentPairs) {
+ if (RewriteFrequentPairs && rc == may_rewrite) {
Label rewrite, done;
const Register bc = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
@@ -2492,14 +2508,21 @@
assert_different_registers(Rcache, index, temp);
Label resolved;
- assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
- __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, temp, byte_no, 1, index_size);
- __ cmpl(temp, (int) bytecode()); // have we resolved this bytecode?
- __ jcc(Assembler::equal, resolved);
+
+ Bytecodes::Code code = bytecode();
+ switch (code) {
+ case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
+ case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+ }
+
+ assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+ __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, temp, byte_no, 1, index_size);
+ __ cmpl(temp, code); // have we resolved this bytecode?
+ __ jcc(Assembler::equal, resolved);
// resolve first time through
address entry;
- switch (bytecode()) {
+ switch (code) {
case Bytecodes::_getstatic : // fall through
case Bytecodes::_putstatic : // fall through
case Bytecodes::_getfield : // fall through
@@ -2511,10 +2534,10 @@
case Bytecodes::_invokehandle : entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invokehandle); break;
case Bytecodes::_invokedynamic : entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invokedynamic); break;
default:
- fatal(err_msg("unexpected bytecode: %s", Bytecodes::name(bytecode())));
+ fatal(err_msg("unexpected bytecode: %s", Bytecodes::name(code)));
break;
}
- __ movl(temp, (int)bytecode());
+ __ movl(temp, code);
__ call_VM(noreg, entry, temp);
// Update registers with resolved info
__ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
@@ -2629,7 +2652,7 @@
__ verify_oop(r);
}
-void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
+void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteControl rc) {
transition(vtos, vtos);
const Register cache = rcx;
@@ -2661,7 +2684,7 @@
__ load_signed_byte(rax, field);
__ push(btos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_bgetfield, bc, rbx);
}
__ jmp(Done);
@@ -2672,7 +2695,7 @@
// atos
__ load_heap_oop(rax, field);
__ push(atos);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_agetfield, bc, rbx);
}
__ jmp(Done);
@@ -2684,7 +2707,7 @@
__ movl(rax, field);
__ push(itos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_igetfield, bc, rbx);
}
__ jmp(Done);
@@ -2696,7 +2719,7 @@
__ load_unsigned_short(rax, field);
__ push(ctos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_cgetfield, bc, rbx);
}
__ jmp(Done);
@@ -2708,7 +2731,7 @@
__ load_signed_short(rax, field);
__ push(stos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_sgetfield, bc, rbx);
}
__ jmp(Done);
@@ -2732,7 +2755,7 @@
__ push(ltos);
// Rewrite bytecode to be faster
- LP64_ONLY(if (!is_static) patch_bytecode(Bytecodes::_fast_lgetfield, bc, rbx));
+ LP64_ONLY(if (!is_static && rc == may_rewrite) patch_bytecode(Bytecodes::_fast_lgetfield, bc, rbx));
__ jmp(Done);
__ bind(notLong);
@@ -2744,7 +2767,7 @@
NOT_LP64(__ fld_s(field));
__ push(ftos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_fgetfield, bc, rbx);
}
__ jmp(Done);
@@ -2759,7 +2782,7 @@
NOT_LP64(__ fld_d(field));
__ push(dtos);
// Rewrite bytecode to be faster
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_dgetfield, bc, rbx);
}
#ifdef ASSERT
@@ -2780,6 +2803,10 @@
getfield_or_static(byte_no, false);
}
+void TemplateTable::nofast_getfield(int byte_no) {
+ getfield_or_static(byte_no, false, may_not_rewrite);
+}
+
void TemplateTable::getstatic(int byte_no) {
getfield_or_static(byte_no, true);
}
@@ -2871,7 +2898,7 @@
}
}
-void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
+void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteControl rc) {
transition(vtos, vtos);
const Register cache = rcx;
@@ -2912,7 +2939,7 @@
__ pop(btos);
if (!is_static) pop_and_check_object(obj);
__ movb(field, rax);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_bputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -2928,7 +2955,7 @@
if (!is_static) pop_and_check_object(obj);
// Store into the field
do_oop_store(_masm, field, rax, _bs->kind(), false);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_aputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -2943,7 +2970,7 @@
__ pop(itos);
if (!is_static) pop_and_check_object(obj);
__ movl(field, rax);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_iputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -2958,7 +2985,7 @@
__ pop(ctos);
if (!is_static) pop_and_check_object(obj);
__ movw(field, rax);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_cputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -2973,7 +3000,7 @@
__ pop(stos);
if (!is_static) pop_and_check_object(obj);
__ movw(field, rax);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_sputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -2989,7 +3016,7 @@
__ pop(ltos);
if (!is_static) pop_and_check_object(obj);
__ movq(field, rax);
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -3036,7 +3063,7 @@
if (!is_static) pop_and_check_object(obj);
NOT_LP64( __ fstp_s(field);)
LP64_ONLY( __ movflt(field, xmm0);)
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_fputfield, bc, rbx, true, byte_no);
}
__ jmp(Done);
@@ -3054,7 +3081,7 @@
if (!is_static) pop_and_check_object(obj);
NOT_LP64( __ fstp_d(field);)
LP64_ONLY( __ movdbl(field, xmm0);)
- if (!is_static) {
+ if (!is_static && rc == may_rewrite) {
patch_bytecode(Bytecodes::_fast_dputfield, bc, rbx, true, byte_no);
}
}
@@ -3080,6 +3107,10 @@
putfield_or_static(byte_no, false);
}
+void TemplateTable::nofast_putfield(int byte_no) {
+ putfield_or_static(byte_no, false, may_not_rewrite);
+}
+
void TemplateTable::putstatic(int byte_no) {
putfield_or_static(byte_no, true);
}