1.1 --- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Thu Jun 02 13:36:11 2011 -0700
1.2 +++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Fri Jun 03 22:31:43 2011 -0700
1.3 @@ -47,18 +47,6 @@
1.4
1.5 #define __ masm->
1.6
1.7 -#ifdef COMPILER2
1.8 -UncommonTrapBlob* SharedRuntime::_uncommon_trap_blob;
1.9 -#endif // COMPILER2
1.10 -
1.11 -DeoptimizationBlob* SharedRuntime::_deopt_blob;
1.12 -SafepointBlob* SharedRuntime::_polling_page_safepoint_handler_blob;
1.13 -SafepointBlob* SharedRuntime::_polling_page_return_handler_blob;
1.14 -RuntimeStub* SharedRuntime::_wrong_method_blob;
1.15 -RuntimeStub* SharedRuntime::_ic_miss_blob;
1.16 -RuntimeStub* SharedRuntime::_resolve_opt_virtual_call_blob;
1.17 -RuntimeStub* SharedRuntime::_resolve_virtual_call_blob;
1.18 -RuntimeStub* SharedRuntime::_resolve_static_call_blob;
1.19
1.20 class RegisterSaver {
1.21
1.22 @@ -3492,7 +3480,7 @@
1.23 // the 64-bit %o's, then do a save, then fixup the caller's SP (our FP).
1.24 // Tricky, tricky, tricky...
1.25
1.26 -static SafepointBlob* generate_handler_blob(address call_ptr, bool cause_return) {
1.27 +SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause_return) {
1.28 assert (StubRoutines::forward_exception_entry() != NULL, "must be generated before");
1.29
1.30 // allocate space for the code
1.31 @@ -3587,7 +3575,7 @@
1.32 // but since this is generic code we don't know what they are and the caller
1.33 // must do any gc of the args.
1.34 //
1.35 -static RuntimeStub* generate_resolve_blob(address destination, const char* name) {
1.36 +RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
1.37 assert (StubRoutines::forward_exception_entry() != NULL, "must be generated before");
1.38
1.39 // allocate space for the code
1.40 @@ -3677,35 +3665,3 @@
1.41 // frame_size_words or bytes??
1.42 return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_words, oop_maps, true);
1.43 }
1.44 -
1.45 -void SharedRuntime::generate_stubs() {
1.46 -
1.47 - _wrong_method_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::handle_wrong_method),
1.48 - "wrong_method_stub");
1.49 -
1.50 - _ic_miss_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::handle_wrong_method_ic_miss),
1.51 - "ic_miss_stub");
1.52 -
1.53 - _resolve_opt_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_opt_virtual_call_C),
1.54 - "resolve_opt_virtual_call");
1.55 -
1.56 - _resolve_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_virtual_call_C),
1.57 - "resolve_virtual_call");
1.58 -
1.59 - _resolve_static_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_static_call_C),
1.60 - "resolve_static_call");
1.61 -
1.62 - _polling_page_safepoint_handler_blob =
1.63 - generate_handler_blob(CAST_FROM_FN_PTR(address,
1.64 - SafepointSynchronize::handle_polling_page_exception), false);
1.65 -
1.66 - _polling_page_return_handler_blob =
1.67 - generate_handler_blob(CAST_FROM_FN_PTR(address,
1.68 - SafepointSynchronize::handle_polling_page_exception), true);
1.69 -
1.70 - generate_deopt_blob();
1.71 -
1.72 -#ifdef COMPILER2
1.73 - generate_uncommon_trap_blob();
1.74 -#endif // COMPILER2
1.75 -}
