--- a/indy.patch Wed Nov 12 22:22:46 2008 -0800
+++ b/indy.patch Wed Nov 12 22:25:14 2008 -0800
@@ -153,7 +153,7 @@ diff --git a/src/cpu/sparc/vm/templateTa
diff --git a/src/cpu/sparc/vm/templateTable_sparc.cpp b/src/cpu/sparc/vm/templateTable_sparc.cpp
--- a/src/cpu/sparc/vm/templateTable_sparc.cpp
+++ b/src/cpu/sparc/vm/templateTable_sparc.cpp
-@@ -3053,6 +3053,20 @@
+@@ -3125,6 +3125,20 @@
}
@@ -271,7 +271,7 @@ diff --git a/src/cpu/x86/vm/interp_masm_
diff --git a/src/cpu/x86/vm/interp_masm_x86_64.cpp b/src/cpu/x86/vm/interp_masm_x86_64.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp
-@@ -195,12 +195,27 @@
+@@ -185,12 +185,27 @@
}
@@ -302,7 +302,7 @@ diff --git a/src/cpu/x86/vm/interp_masm_
movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
// convert from field index to ConstantPoolCacheEntry index
-@@ -210,10 +225,10 @@
+@@ -200,10 +215,10 @@
void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache,
Register tmp,
@@ -316,7 +316,7 @@ diff --git a/src/cpu/x86/vm/interp_masm_
assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
// convert from field index to ConstantPoolCacheEntry index
// and from word offset to byte offset
-@@ -1298,7 +1313,8 @@
+@@ -1288,7 +1303,8 @@
void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
Register mdp,
@@ -326,7 +326,7 @@ diff --git a/src/cpu/x86/vm/interp_masm_
if (ProfileInterpreter) {
Label profile_continue;
-@@ -1308,8 +1324,15 @@
+@@ -1298,8 +1314,15 @@
// We are making a call. Increment the count.
increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
@@ -592,7 +592,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
diff --git a/src/cpu/x86/vm/templateTable_x86_32.cpp b/src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp
-@@ -134,12 +134,12 @@
+@@ -206,12 +206,12 @@
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), scratch, rsi, bc);
#ifndef ASSERT
__ jmpb(patch_done);
@@ -609,7 +609,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
Label okay;
__ load_unsigned_byte(scratch, at_bcp(0));
__ cmpl(scratch, (int)Bytecodes::java_code(bytecode));
-@@ -2026,6 +2026,7 @@
+@@ -2105,6 +2105,7 @@
void TemplateTable::resolve_cache_and_index(int byte_no, Register Rcache, Register index) {
assert(byte_no == 1 || byte_no == 2, "byte_no out of range");
@@ -617,7 +617,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
Register temp = rbx;
-@@ -2033,13 +2034,19 @@
+@@ -2112,13 +2113,19 @@
const int shift_count = (1 + byte_no)*BitsPerByte;
Label resolved;
@@ -644,7 +644,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// resolve first time through
address entry;
-@@ -2052,12 +2059,13 @@
+@@ -2131,12 +2138,13 @@
case Bytecodes::_invokespecial : // fall through
case Bytecodes::_invokestatic : // fall through
case Bytecodes::_invokeinterface: entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invoke); break;
@@ -659,7 +659,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
__ bind(resolved);
}
-@@ -2794,9 +2802,14 @@
+@@ -2881,9 +2889,14 @@
}
@@ -675,7 +675,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
const bool is_invokevirtual = code == Bytecodes::_invokevirtual;
const bool is_invokespecial = code == Bytecodes::_invokespecial;
const bool load_receiver = code != Bytecodes::_invokestatic;
-@@ -2806,6 +2819,9 @@
+@@ -2893,6 +2906,9 @@
const Register recv = rcx;
const Register flags = rdx;
assert_different_registers(method, index, recv, flags);
@@ -685,7 +685,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// save 'interpreter return address'
__ save_bcp();
-@@ -2817,8 +2833,13 @@
+@@ -2904,8 +2920,13 @@
__ movl(recv, flags);
__ andl(recv, 0xFF);
// recv count is 0 based?
@@ -701,7 +701,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// do null check if needed
-@@ -2835,11 +2856,15 @@
+@@ -2922,11 +2943,15 @@
// Make sure we don't need to mask flags for tosBits after the above shift
ConstantPoolCacheEntry::verify_tosBits();
// load return address
@@ -722,7 +722,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// push return address
-@@ -2901,7 +2926,7 @@
+@@ -2988,7 +3013,7 @@
void TemplateTable::invokevirtual(int byte_no) {
transition(vtos, vtos);
@@ -731,7 +731,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// rbx,: index
// rcx: receiver
-@@ -2913,7 +2938,7 @@
+@@ -3000,7 +3025,7 @@
void TemplateTable::invokespecial(int byte_no) {
transition(vtos, vtos);
@@ -740,7 +740,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// do the call
__ verify_oop(rbx);
__ profile_call(rax);
-@@ -2923,7 +2948,7 @@
+@@ -3010,7 +3035,7 @@
void TemplateTable::invokestatic(int byte_no) {
transition(vtos, vtos);
@@ -749,7 +749,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// do the call
__ verify_oop(rbx);
__ profile_call(rax);
-@@ -2939,7 +2964,7 @@
+@@ -3026,7 +3051,7 @@
void TemplateTable::invokeinterface(int byte_no) {
transition(vtos, vtos);
@@ -758,7 +758,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// rax,: Interface
// rbx,: index
-@@ -3089,6 +3114,79 @@
+@@ -3176,6 +3201,79 @@
// rcx: receiver
// rbx,: methodOop
__ jump_from_interpreted(rbx, rdx);
@@ -854,7 +854,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
diff --git a/src/cpu/x86/vm/templateTable_x86_64.cpp b/src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp
-@@ -146,12 +146,12 @@
+@@ -209,12 +209,12 @@
scratch, r13, bc);
#ifndef ASSERT
__ jmpb(patch_done);
@@ -871,7 +871,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
Label okay;
__ load_unsigned_byte(scratch, at_bcp(0));
__ cmpl(scratch, (int) Bytecodes::java_code(bytecode));
-@@ -1991,6 +1991,7 @@
+@@ -2058,6 +2058,7 @@
Register Rcache,
Register index) {
assert(byte_no == 1 || byte_no == 2, "byte_no out of range");
@@ -879,7 +879,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
const Register temp = rbx;
assert_different_registers(Rcache, index, temp);
-@@ -1998,15 +1999,24 @@
+@@ -2065,15 +2066,24 @@
const int shift_count = (1 + byte_no) * BitsPerByte;
Label resolved;
__ get_cache_and_index_at_bcp(Rcache, index, 1);
@@ -913,7 +913,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// resolve first time through
address entry;
-@@ -2023,6 +2033,9 @@
+@@ -2090,6 +2100,9 @@
case Bytecodes::_invokeinterface:
entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_invoke);
break;
@@ -923,7 +923,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
default:
ShouldNotReachHere();
break;
-@@ -2031,7 +2044,7 @@
+@@ -2098,7 +2111,7 @@
__ call_VM(noreg, entry, temp);
// Update registers with resolved info
@@ -932,7 +932,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
__ bind(resolved);
}
-@@ -2766,10 +2779,14 @@
+@@ -2834,10 +2847,14 @@
void TemplateTable::prepare_invoke(Register method,
Register index,
@@ -949,7 +949,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
const bool is_invokevirtual = code == Bytecodes::_invokevirtual;
const bool is_invokespecial = code == Bytecodes::_invokespecial;
const bool load_receiver = code != Bytecodes::_invokestatic;
-@@ -2779,6 +2796,9 @@
+@@ -2847,6 +2864,9 @@
const Register recv = rcx;
const Register flags = rdx;
assert_different_registers(method, index, recv, flags);
@@ -959,7 +959,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// save 'interpreter return address'
__ save_bcp();
-@@ -2790,9 +2810,14 @@
+@@ -2858,9 +2878,14 @@
__ movl(recv, flags);
__ andl(recv, 0xFF);
if (TaggedStackInterpreter) __ shll(recv, 1); // index*2
@@ -977,7 +977,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// do null check if needed
-@@ -2810,10 +2835,15 @@
+@@ -2878,10 +2903,15 @@
ConstantPoolCacheEntry::verify_tosBits();
// load return address
{
@@ -997,7 +997,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// push return address
-@@ -2879,7 +2909,7 @@
+@@ -2947,7 +2977,7 @@
void TemplateTable::invokevirtual(int byte_no) {
transition(vtos, vtos);
@@ -1006,7 +1006,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// rbx: index
// rcx: receiver
-@@ -2891,7 +2921,7 @@
+@@ -2959,7 +2989,7 @@
void TemplateTable::invokespecial(int byte_no) {
transition(vtos, vtos);
@@ -1015,7 +1015,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// do the call
__ verify_oop(rbx);
__ profile_call(rax);
-@@ -2901,7 +2931,7 @@
+@@ -2969,7 +2999,7 @@
void TemplateTable::invokestatic(int byte_no) {
transition(vtos, vtos);
@@ -1024,7 +1024,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// do the call
__ verify_oop(rbx);
__ profile_call(rax);
-@@ -2915,7 +2945,7 @@
+@@ -2983,7 +3013,7 @@
void TemplateTable::invokeinterface(int byte_no) {
transition(vtos, vtos);
@@ -1033,7 +1033,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
// rax: Interface
// rbx: index
-@@ -3082,6 +3112,79 @@
+@@ -3150,6 +3180,79 @@
// rcx: receiver
// rbx: methodOop
__ jump_from_interpreted(rbx, rdx);
@@ -1651,7 +1651,7 @@ diff --git a/src/share/vm/includeDB_core
diff --git a/src/share/vm/includeDB_core b/src/share/vm/includeDB_core
--- a/src/share/vm/includeDB_core
+++ b/src/share/vm/includeDB_core
-@@ -4071,6 +4071,7 @@
+@@ -4088,6 +4088,7 @@
templateTable_<arch_model>.cpp interpreterRuntime.hpp
templateTable_<arch_model>.cpp interpreter.hpp
templateTable_<arch_model>.cpp methodDataOop.hpp
@@ -1662,7 +1662,7 @@ diff --git a/src/share/vm/includeDB_gc_p
diff --git a/src/share/vm/includeDB_gc_parallel b/src/share/vm/includeDB_gc_parallel
--- a/src/share/vm/includeDB_gc_parallel
+++ b/src/share/vm/includeDB_gc_parallel
-@@ -37,6 +37,12 @@
+@@ -41,6 +41,12 @@
constantPoolKlass.cpp psPromotionManager.inline.hpp
constantPoolKlass.cpp psScavenge.inline.hpp
constantPoolKlass.cpp parOopClosures.inline.hpp
@@ -2099,7 +2099,7 @@ diff --git a/src/share/vm/interpreter/by
diff --git a/src/share/vm/interpreter/bytecodes.cpp b/src/share/vm/interpreter/bytecodes.cpp
--- a/src/share/vm/interpreter/bytecodes.cpp
+++ b/src/share/vm/interpreter/bytecodes.cpp
-@@ -345,7 +345,7 @@
+@@ -357,7 +357,7 @@
def(_invokespecial , "invokespecial" , "bjj" , NULL , T_ILLEGAL, -1, true);
def(_invokestatic , "invokestatic" , "bjj" , NULL , T_ILLEGAL, 0, true);
def(_invokeinterface , "invokeinterface" , "bjj__", NULL , T_ILLEGAL, -1, true);
@@ -2108,7 +2108,7 @@ diff --git a/src/share/vm/interpreter/by
def(_new , "new" , "bii" , NULL , T_OBJECT , 1, true );
def(_newarray , "newarray" , "bc" , NULL , T_OBJECT , 0, true );
def(_anewarray , "anewarray" , "bii" , NULL , T_OBJECT , 0, true );
-@@ -396,6 +396,9 @@
+@@ -408,6 +408,9 @@
// Faster method invocation.
def(_fast_invokevfinal , "fast_invokevfinal" , "bjj" , NULL , T_ILLEGAL, -1, true, _invokevirtual );
@@ -2871,7 +2871,7 @@ diff --git a/src/share/vm/interpreter/te
diff --git a/src/share/vm/interpreter/templateTable.cpp b/src/share/vm/interpreter/templateTable.cpp
--- a/src/share/vm/interpreter/templateTable.cpp
+++ b/src/share/vm/interpreter/templateTable.cpp
-@@ -500,6 +500,8 @@
+@@ -503,6 +503,8 @@
def(Bytecodes::_fast_invokevfinal , ubcp|disp|clvm|____, vtos, vtos, fast_invokevfinal , 2 );
@@ -2883,7 +2883,7 @@ diff --git a/src/share/vm/interpreter/te
diff --git a/src/share/vm/interpreter/templateTable.hpp b/src/share/vm/interpreter/templateTable.hpp
--- a/src/share/vm/interpreter/templateTable.hpp
+++ b/src/share/vm/interpreter/templateTable.hpp
-@@ -260,6 +260,7 @@
+@@ -261,6 +261,7 @@
static void invokespecial(int byte_no);
static void invokestatic(int byte_no);
static void invokeinterface(int byte_no);
@@ -3166,7 +3166,7 @@ diff --git a/src/share/vm/oops/generateO
diff --git a/src/share/vm/oops/generateOopMap.cpp b/src/share/vm/oops/generateOopMap.cpp
--- a/src/share/vm/oops/generateOopMap.cpp
+++ b/src/share/vm/oops/generateOopMap.cpp
-@@ -1265,7 +1265,7 @@
+@@ -1253,7 +1253,7 @@
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
case Bytecodes::_invokeinterface:
@@ -3175,7 +3175,7 @@ diff --git a/src/share/vm/oops/generateO
constantPoolOop cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
-@@ -1296,7 +1296,7 @@
+@@ -1284,7 +1284,7 @@
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
case Bytecodes::_invokeinterface:
@@ -3184,7 +3184,7 @@ diff --git a/src/share/vm/oops/generateO
constantPoolOop cp = method()->constants();
int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx);
int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx);
-@@ -1568,7 +1568,7 @@
+@@ -1556,7 +1556,7 @@
case Bytecodes::_invokevirtual:
case Bytecodes::_invokespecial: do_method(false, false, itr->get_index_big(), itr->bci()); break;
case Bytecodes::_invokestatic: do_method(true, false, itr->get_index_big(), itr->bci()); break;
@@ -3196,7 +3196,7 @@ diff --git a/src/share/vm/oops/instanceK
diff --git a/src/share/vm/oops/instanceKlass.cpp b/src/share/vm/oops/instanceKlass.cpp
--- a/src/share/vm/oops/instanceKlass.cpp
+++ b/src/share/vm/oops/instanceKlass.cpp
-@@ -1973,9 +1973,11 @@
+@@ -1996,9 +1996,11 @@
// Printing
@@ -3210,7 +3210,7 @@ diff --git a/src/share/vm/oops/instanceK
fd->print_on(_st);
_st->cr();
} else {
-@@ -1996,7 +1998,7 @@
+@@ -2019,7 +2021,7 @@
value->is_typeArray() &&
offset <= (juint) value->length() &&
offset + length <= (juint) value->length()) {
@@ -3219,7 +3219,7 @@ diff --git a/src/share/vm/oops/instanceK
Handle h_obj(obj);
java_lang_String::print(h_obj, st);
st->cr();
-@@ -2004,22 +2006,22 @@
+@@ -2027,22 +2029,22 @@
}
}
@@ -3247,7 +3247,7 @@ diff --git a/src/share/vm/oops/instanceK
st->cr();
}
}
-@@ -2028,6 +2030,28 @@
+@@ -2051,6 +2053,28 @@
st->print("a ");
name()->print_value_on(st);
obj->print_address_on(st);
@@ -3299,7 +3299,7 @@ diff --git a/src/share/vm/oops/instanceK
// jmethodID support
static jmethodID get_jmethod_id(instanceKlassHandle ik_h, size_t idnum,
jmethodID new_id, jmethodID* new_jmeths);
-@@ -715,6 +721,7 @@
+@@ -723,6 +729,7 @@
oop* adr_inner_classes() const { return (oop*)&this->_inner_classes;}
oop* adr_implementors() const { return (oop*)&this->_implementors[0];}
oop* adr_generic_signature() const { return (oop*)&this->_generic_signature;}
@@ -3616,7 +3616,7 @@ diff --git a/src/share/vm/opto/bytecodeI
diff --git a/src/share/vm/opto/bytecodeInfo.cpp b/src/share/vm/opto/bytecodeInfo.cpp
--- a/src/share/vm/opto/bytecodeInfo.cpp
+++ b/src/share/vm/opto/bytecodeInfo.cpp
-@@ -326,7 +326,7 @@
+@@ -313,7 +313,7 @@
// stricter than callee_holder->is_initialized()
ciBytecodeStream iter(caller_method);
iter.force_bci(caller_bci);
@@ -3724,7 +3724,7 @@ diff --git a/src/share/vm/runtime/argume
diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
-@@ -2535,6 +2535,12 @@
+@@ -2573,6 +2573,12 @@
}
#endif // PRODUCT
@@ -3740,7 +3740,7 @@ diff --git a/src/share/vm/runtime/global
diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp
+++ b/src/share/vm/runtime/globals.hpp
-@@ -3196,6 +3196,12 @@
+@@ -3239,6 +3239,12 @@
develop(bool, TraceMethodHandles, false, \
"trace internal method handle operations") \
\
@@ -3756,7 +3756,7 @@ diff --git a/src/share/vm/runtime/shared
diff --git a/src/share/vm/runtime/sharedRuntime.cpp b/src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp
+++ b/src/share/vm/runtime/sharedRuntime.cpp
-@@ -774,6 +774,7 @@
+@@ -793,6 +793,7 @@
KlassHandle receiver_klass (THREAD, receiver->klass());
klassOop rk = constants->klass_ref_at(bytecode_index, CHECK_(nullHandle));
// klass is already loaded
--- a/meth.patch Wed Nov 12 22:22:46 2008 -0800
+++ b/meth.patch Wed Nov 12 22:25:14 2008 -0800
@@ -1,7 +1,7 @@ diff --git a/src/cpu/sparc/vm/assembler_
diff --git a/src/cpu/sparc/vm/assembler_sparc.cpp b/src/cpu/sparc/vm/assembler_sparc.cpp
--- a/src/cpu/sparc/vm/assembler_sparc.cpp
+++ b/src/cpu/sparc/vm/assembler_sparc.cpp
-@@ -2581,6 +2581,100 @@
+@@ -2614,6 +2614,100 @@
restore();
}
}
@@ -100,8 +100,8 @@ diff --git a/src/cpu/sparc/vm/assembler_
+
+
- void MacroAssembler::biased_locking_enter(Register obj_reg, Register mark_reg, Register temp_reg,
- Label& done, Label* slow_case,
+ void MacroAssembler::biased_locking_enter(Register obj_reg, Register mark_reg,
+ Register temp_reg,
diff --git a/src/cpu/sparc/vm/assembler_sparc.hpp b/src/cpu/sparc/vm/assembler_sparc.hpp
--- a/src/cpu/sparc/vm/assembler_sparc.hpp
+++ b/src/cpu/sparc/vm/assembler_sparc.hpp
@@ -183,7 +183,7 @@ diff --git a/src/cpu/sparc/vm/assembler_
// pp 177
void ldsba( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldsb_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
-@@ -1513,6 +1549,9 @@
+@@ -1517,6 +1553,9 @@
inline void stx( Register d, const Address& a, int offset = 0 );
inline void st( Register d, const Address& a, int offset = 0 );
inline void std( Register d, const Address& a, int offset = 0 );
@@ -193,7 +193,7 @@ diff --git a/src/cpu/sparc/vm/assembler_
// pp 177
-@@ -1889,6 +1928,7 @@
+@@ -1906,6 +1945,7 @@
inline void store_ptr_contents( Register s, Address& a, int offset = 0 );
inline void jumpl_to( Address& a, Register d, int offset = 0 );
inline void jump_to( Address& a, int offset = 0 );
@@ -201,7 +201,7 @@ diff --git a/src/cpu/sparc/vm/assembler_
// ring buffer traceable jumps
-@@ -1923,9 +1963,11 @@
+@@ -1940,9 +1980,11 @@
// st_ptr will perform st for 32 bit VM's and stx for 64 bit VM's
inline void ld_ptr( Register s1, Register s2, Register d );
inline void ld_ptr( Register s1, int simm13a, Register d);
@@ -213,7 +213,7 @@ diff --git a/src/cpu/sparc/vm/assembler_
inline void st_ptr( Register d, const Address& a, int offset = 0 );
// ld_long will perform ld for 32 bit VM's and ldx for 64 bit VM's
-@@ -2232,6 +2274,43 @@
+@@ -2267,6 +2309,43 @@
);
void tlab_refill(Label& retry_tlab, Label& try_eden, Label& slow_case);
@@ -1002,7 +1002,7 @@ diff --git a/src/cpu/x86/vm/assembler_x8
diff --git a/src/cpu/x86/vm/assembler_x86.cpp b/src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp
+++ b/src/cpu/x86/vm/assembler_x86.cpp
-@@ -6878,6 +6878,223 @@
+@@ -7088,6 +7088,223 @@
// call indirectly to solve generation ordering problem
movptr(rax, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
call(rax);
@@ -1307,7 +1307,7 @@ diff --git a/src/cpu/x86/vm/assembler_x8
#endif // ASSERT
// accessors
-@@ -238,6 +288,14 @@
+@@ -240,6 +290,14 @@
static Address make_array(ArrayAddress);
@@ -1322,7 +1322,7 @@ diff --git a/src/cpu/x86/vm/assembler_x8
private:
bool base_needs_rex() const {
-@@ -1696,6 +1754,37 @@
+@@ -1721,6 +1779,37 @@
);
void tlab_refill(Label& retry_tlab, Label& try_eden, Label& slow_case);
@@ -1475,7 +1475,7 @@ diff --git a/src/cpu/x86/vm/interp_masm_
diff --git a/src/cpu/x86/vm/interp_masm_x86_64.cpp b/src/cpu/x86/vm/interp_masm_x86_64.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp
-@@ -613,13 +613,18 @@
+@@ -603,13 +603,18 @@
MacroAssembler::call_VM_leaf_base(entry_point, 3);
}
@@ -2043,7 +2043,7 @@ diff --git a/src/cpu/x86/vm/stubGenerato
diff --git a/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/src/cpu/x86/vm/stubGenerator_x86_32.cpp
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp
+++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp
-@@ -2088,6 +2088,9 @@
+@@ -2170,6 +2170,9 @@
return stub->entry_point();
}
@@ -2053,7 +2053,7 @@ diff --git a/src/cpu/x86/vm/stubGenerato
void create_control_words() {
// Round to nearest, 53-bit mode, exceptions masked
-@@ -2167,6 +2170,16 @@
+@@ -2249,6 +2252,16 @@
// arraycopy stubs used by compilers
generate_arraycopy_stubs();
@@ -2207,7 +2207,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
diff --git a/src/cpu/x86/vm/templateTable_x86_32.cpp b/src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp
-@@ -2034,13 +2034,10 @@
+@@ -2113,13 +2113,10 @@
const int shift_count = (1 + byte_no)*BitsPerByte;
Label resolved;
__ get_cache_and_index_at_bcp(Rcache, index, 1);
@@ -2223,7 +2223,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
__ cmpl(temp, (int)bytecode());
__ jcc(Assembler::equal, resolved);
-@@ -2820,7 +2817,7 @@
+@@ -2907,7 +2904,7 @@
__ movl(recv, flags);
__ andl(recv, 0xFF);
// recv count is 0 based?
@@ -2232,7 +2232,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
__ verify_oop(recv);
}
-@@ -2838,10 +2835,11 @@
+@@ -2925,10 +2922,11 @@
// Make sure we don't need to mask flags for tosBits after the above shift
ConstantPoolCacheEntry::verify_tosBits();
// load return address
@@ -2248,7 +2248,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// push return address
-@@ -2967,6 +2965,57 @@
+@@ -3054,6 +3052,57 @@
// profile this call
__ profile_virtual_call(rdx, rsi, rdi);
@@ -2309,7 +2309,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
diff --git a/src/cpu/x86/vm/templateTable_x86_64.cpp b/src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp
-@@ -2790,7 +2790,7 @@
+@@ -2858,7 +2858,7 @@
__ movl(recv, flags);
__ andl(recv, 0xFF);
if (TaggedStackInterpreter) __ shll(recv, 1); // index*2
@@ -2318,7 +2318,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
-Interpreter::expr_offset_in_bytes(1)));
__ verify_oop(recv);
}
-@@ -2813,7 +2813,7 @@
+@@ -2881,7 +2881,7 @@
ExternalAddress return_5((address)Interpreter::return_5_addrs_by_index_table());
ExternalAddress return_3((address)Interpreter::return_3_addrs_by_index_table());
__ lea(rscratch1, (is_invokeinterface ? return_5 : return_3));
@@ -2327,7 +2327,7 @@ diff --git a/src/cpu/x86/vm/templateTabl
}
// push return address
-@@ -2941,6 +2941,57 @@
+@@ -3009,6 +3009,57 @@
// profile this call
__ profile_virtual_call(rdx, r13, r14);
@@ -2675,7 +2675,7 @@ diff --git a/src/share/vm/classfile/clas
diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp
+++ b/src/share/vm/classfile/classFileParser.cpp
-@@ -1844,6 +1844,11 @@
+@@ -1838,6 +1838,11 @@
_has_vanilla_constructor = true;
}
@@ -3650,7 +3650,7 @@ diff --git a/src/share/vm/gc_implementat
diff --git a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
-@@ -803,6 +803,7 @@
+@@ -799,6 +799,7 @@
if (young_gen()->is_in_reserved(addr)) {
assert(young_gen()->is_in(addr),
"addr should be in allocated part of young gen");
@@ -3669,7 +3669,7 @@ diff --git a/src/share/vm/includeDB_core
assembler_<arch>.cpp objectMonitor.hpp
assembler_<arch>.cpp os.hpp
assembler_<arch>.cpp resourceArea.hpp
-@@ -1269,6 +1270,7 @@
+@@ -1273,6 +1274,7 @@
cpCacheKlass.cpp collectedHeap.hpp
cpCacheKlass.cpp constantPoolOop.hpp
cpCacheKlass.cpp cpCacheKlass.hpp
@@ -3677,7 +3677,7 @@ diff --git a/src/share/vm/includeDB_core
cpCacheKlass.cpp handles.inline.hpp
cpCacheKlass.cpp javaClasses.hpp
cpCacheKlass.cpp markSweep.inline.hpp
-@@ -2193,6 +2195,7 @@
+@@ -2199,6 +2201,7 @@
interpreter_<arch_model>.cpp jvmtiExport.hpp
interpreter_<arch_model>.cpp jvmtiThreadState.hpp
interpreter_<arch_model>.cpp methodDataOop.hpp
@@ -3685,7 +3685,7 @@ diff --git a/src/share/vm/includeDB_core
interpreter_<arch_model>.cpp methodOop.hpp
interpreter_<arch_model>.cpp oop.inline.hpp
interpreter_<arch_model>.cpp sharedRuntime.hpp
-@@ -2797,6 +2800,22 @@
+@@ -2808,6 +2811,22 @@
methodDataOop.hpp orderAccess.hpp
methodDataOop.hpp universe.hpp
@@ -3708,7 +3708,7 @@ diff --git a/src/share/vm/includeDB_core
methodKlass.cpp collectedHeap.inline.hpp
methodKlass.cpp constMethodKlass.hpp
methodKlass.cpp gcLocker.hpp
-@@ -3040,6 +3059,7 @@
+@@ -3057,6 +3076,7 @@
oop.inline.hpp arrayOop.hpp
oop.inline.hpp atomic.hpp
oop.inline.hpp barrierSet.inline.hpp
@@ -3716,7 +3716,7 @@ diff --git a/src/share/vm/includeDB_core
oop.inline.hpp cardTableModRefBS.hpp
oop.inline.hpp collectedHeap.inline.hpp
oop.inline.hpp compactingPermGenGen.hpp
-@@ -3652,6 +3672,7 @@
+@@ -3667,6 +3687,7 @@
sharedRuntime.cpp interpreter.hpp
sharedRuntime.cpp javaCalls.hpp
sharedRuntime.cpp jvmtiExport.hpp
@@ -3724,7 +3724,7 @@ diff --git a/src/share/vm/includeDB_core
sharedRuntime.cpp nativeInst_<arch>.hpp
sharedRuntime.cpp nativeLookup.hpp
sharedRuntime.cpp oop.inline.hpp
-@@ -3835,6 +3856,7 @@
+@@ -3852,6 +3873,7 @@
stubGenerator_<arch_model>.cpp handles.inline.hpp
stubGenerator_<arch_model>.cpp instanceOop.hpp
stubGenerator_<arch_model>.cpp interpreter.hpp
@@ -3735,7 +3735,7 @@ diff --git a/src/share/vm/includeDB_gc_p
diff --git a/src/share/vm/includeDB_gc_parallel b/src/share/vm/includeDB_gc_parallel
--- a/src/share/vm/includeDB_gc_parallel
+++ b/src/share/vm/includeDB_gc_parallel
-@@ -25,6 +25,12 @@
+@@ -29,6 +29,12 @@
collectorPolicy.cpp cmsGCAdaptivePolicyCounters.hpp
compiledICHolderKlass.cpp oop.pcgc.inline.hpp
@@ -3956,7 +3956,7 @@ diff --git a/src/share/vm/memory/dump.cp
diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp
--- a/src/share/vm/memory/dump.cpp
+++ b/src/share/vm/memory/dump.cpp
-@@ -894,6 +894,9 @@
+@@ -928,6 +928,9 @@
// shared classes at runtime, where constraints were previously created.
guarantee(SystemDictionary::constraints()->number_of_entries() == 0,
"loader constraints are not saved");
@@ -4216,7 +4216,7 @@ diff --git a/src/share/vm/oops/oop.hpp b
// printing functions for VM debugging
void print_on(outputStream* st) const; // First level print
void print_value_on(outputStream* st) const; // Second level print.
-@@ -388,4 +391,10 @@
+@@ -397,4 +400,10 @@
static int mark_offset_in_bytes() { return offset_of(oopDesc, _mark); }
static int klass_offset_in_bytes() { return offset_of(oopDesc, _metadata._klass); }
static int klass_gap_offset_in_bytes();
@@ -5148,7 +5148,7 @@ diff --git a/src/share/vm/runtime/argume
diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
-@@ -2535,6 +2535,13 @@
+@@ -2573,6 +2573,13 @@
}
#endif // PRODUCT
@@ -5176,7 +5176,7 @@ diff --git a/src/share/vm/runtime/global
diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp
+++ b/src/share/vm/runtime/globals.hpp
-@@ -3190,6 +3190,12 @@
+@@ -3233,6 +3233,12 @@
product(bool, AnonymousClasses, false, \
"support sun.misc.Unsafe.defineAnonymousClass") \
\
@@ -5210,7 +5210,7 @@ diff --git a/src/share/vm/runtime/shared
diff --git a/src/share/vm/runtime/sharedRuntime.cpp b/src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp
+++ b/src/share/vm/runtime/sharedRuntime.cpp
-@@ -641,48 +641,6 @@
+@@ -660,48 +660,6 @@
JRT_ENTRY(void, SharedRuntime::yield_all(JavaThread* thread, int attempts))
os::yield_all(attempts);
JRT_END
@@ -5259,7 +5259,7 @@ diff --git a/src/share/vm/runtime/shared
JRT_ENTRY_NO_ASYNC(void, SharedRuntime::register_finalizer(JavaThread* thread, oopDesc* obj))
-@@ -1481,9 +1439,72 @@
+@@ -1500,9 +1458,72 @@
return generate_class_cast_message(objName, targetKlass->external_name());
}
@@ -5337,7 +5337,7 @@ diff --git a/src/share/vm/runtime/shared
diff --git a/src/share/vm/runtime/sharedRuntime.hpp b/src/share/vm/runtime/sharedRuntime.hpp
--- a/src/share/vm/runtime/sharedRuntime.hpp
+++ b/src/share/vm/runtime/sharedRuntime.hpp
-@@ -171,9 +171,6 @@
+@@ -177,9 +177,6 @@
static oop retrieve_receiver( symbolHandle sig, frame caller );
@@ -5347,7 +5347,7 @@ diff --git a/src/share/vm/runtime/shared
static void register_finalizer(JavaThread* thread, oopDesc* obj);
// dtrace notifications
-@@ -206,6 +203,27 @@
+@@ -212,6 +209,27 @@
static char* generate_class_cast_message(JavaThread* thr, const char* name);
/**
@@ -5375,7 +5375,7 @@ diff --git a/src/share/vm/runtime/shared
* Fill in the "X cannot be cast to a Y" message for ClassCastException
*
* @param name the name of the class of the object attempted to be cast
-@@ -218,7 +236,8 @@
+@@ -224,7 +242,8 @@
* The caller (or one of it's callers) must use a ResourceMark
* in order to correctly free the result.
*/
--- a/series Wed Nov 12 22:22:46 2008 -0800
+++ b/series Wed Nov 12 22:25:14 2008 -0800
@@ -1,6 +1,6 @@ anonk.patch #-/anonk #+jdk7-b
anonk.patch #-/anonk #+jdk7-b38
-meth.patch #-/meth #+jdk7-b34
-indy.patch #-/indy #+jdk7-b34
+meth.patch #-/meth #+jdk7-b38
+indy.patch #-/indy #+jdk7-b38
annot.patch #-/annot #+jdk7-b30 #-testable
#inti.patch #-/inti #+jdk7-b30 #-buildable
callcc.patch #-/callcc #+jdk7-b30 #-testable