1.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Sep 09 13:47:11 2011 -0700
1.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Sat Sep 10 00:11:04 2011 -0700
1.3 @@ -436,7 +436,7 @@
1.4 #undef __
1.5 #define __ masm->
1.6
1.7 - address generate_throw_exception(const char* name, address runtime_entry, bool restore_saved_exception_pc,
1.8 + address generate_throw_exception(const char* name, address runtime_entry,
1.9 Register arg1 = noreg, Register arg2 = noreg) {
1.10 #ifdef ASSERT
1.11 int insts_size = VerifyThread ? 1 * K : 600;
1.12 @@ -462,11 +462,6 @@
1.13
1.14 int frame_complete = __ offset();
1.15
1.16 - if (restore_saved_exception_pc) {
1.17 - __ ld_ptr(G2_thread, JavaThread::saved_exception_pc_offset(), I7);
1.18 - __ sub(I7, frame::pc_return_offset, I7);
1.19 - }
1.20 -
1.21 // Note that we always have a runtime stub frame on the top of stack by this point
1.22 Register last_java_sp = SP;
1.23 // 64-bit last_java_sp is biased!
1.24 @@ -3418,7 +3413,7 @@
1.25 StubRoutines::_throw_WrongMethodTypeException_entry =
1.26 generate_throw_exception("WrongMethodTypeException throw_exception",
1.27 CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException),
1.28 - false, G5_method_type, G3_method_handle);
1.29 + G5_method_type, G3_method_handle);
1.30 }
1.31
1.32
1.33 @@ -3429,12 +3424,10 @@
1.34 // UseZeroBaseCompressedOops which is defined after heap initialization.
1.35 StubRoutines::Sparc::_partial_subtype_check = generate_partial_subtype_check();
1.36 // These entry points require SharedInfo::stack0 to be set up in non-core builds
1.37 - StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError), false);
1.38 - StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError), false);
1.39 - StubRoutines::_throw_ArithmeticException_entry = generate_throw_exception("ArithmeticException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_ArithmeticException), true);
1.40 - StubRoutines::_throw_NullPointerException_entry = generate_throw_exception("NullPointerException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException), true);
1.41 - StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call), false);
1.42 - StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
1.43 + StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError));
1.44 + StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError));
1.45 + StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call));
1.46 + StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError));
1.47
1.48 StubRoutines::_handler_for_unsafe_access_entry =
1.49 generate_handler_for_unsafe_access();
