1.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Jul 23 13:04:59 2012 -0700
1.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Jul 24 10:51:00 2012 -0700
1.3 @@ -710,9 +710,9 @@
1.4 // Need to differentiate between igetfield, agetfield, bgetfield etc.
1.5 // because they are different sizes.
1.6 // Use the type from the constant pool cache
1.7 - __ shrl(rdx, ConstantPoolCacheEntry::tosBits);
1.8 - // Make sure we don't need to mask rdx for tosBits after the above shift
1.9 - ConstantPoolCacheEntry::verify_tosBits();
1.10 + __ shrl(rdx, ConstantPoolCacheEntry::tos_state_shift);
1.11 + // Make sure we don't need to mask rdx after the above shift
1.12 + ConstantPoolCacheEntry::verify_tos_state_shift();
1.13 __ cmpl(rdx, btos);
1.14 __ jcc(Assembler::notEqual, notByte);
1.15 __ load_signed_byte(rax, field_address);
1.16 @@ -1513,7 +1513,6 @@
1.17 case Interpreter::empty : entry_point = ((InterpreterGenerator*)this)->generate_empty_entry(); break;
1.18 case Interpreter::accessor : entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry(); break;
1.19 case Interpreter::abstract : entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break;
1.20 - case Interpreter::method_handle : entry_point = ((InterpreterGenerator*)this)->generate_method_handle_entry(); break;
1.21
1.22 case Interpreter::java_lang_math_sin : // fall thru
1.23 case Interpreter::java_lang_math_cos : // fall thru
1.24 @@ -1526,7 +1525,9 @@
1.25 case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*)this)->generate_math_entry(kind); break;
1.26 case Interpreter::java_lang_ref_reference_get
1.27 : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
1.28 - default : ShouldNotReachHere(); break;
1.29 + default:
1.30 + fatal(err_msg("unexpected method kind: %d", kind));
1.31 + break;
1.32 }
1.33
1.34 if (entry_point) return entry_point;
