--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Jun 02 13:36:11 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Fri Jun 03 22:31:43 2011 -0700
@@ -41,24 +41,10 @@
#include "opto/runtime.hpp"
#endif
-DeoptimizationBlob *SharedRuntime::_deopt_blob;
-#ifdef COMPILER2
-UncommonTrapBlob *SharedRuntime::_uncommon_trap_blob;
-ExceptionBlob *OptoRuntime::_exception_blob;
-#endif // COMPILER2
-
-SafepointBlob *SharedRuntime::_polling_page_safepoint_handler_blob;
-SafepointBlob *SharedRuntime::_polling_page_return_handler_blob;
-RuntimeStub* SharedRuntime::_wrong_method_blob;
-RuntimeStub* SharedRuntime::_ic_miss_blob;
-RuntimeStub* SharedRuntime::_resolve_opt_virtual_call_blob;
-RuntimeStub* SharedRuntime::_resolve_virtual_call_blob;
-RuntimeStub* SharedRuntime::_resolve_static_call_blob;
+#define __ masm->
const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
-#define __ masm->
-
class SimpleRuntimeFrame {
public:
@@ -2530,32 +2516,6 @@
}
-//----------------------------generate_ricochet_blob---------------------------
-void SharedRuntime::generate_ricochet_blob() {
- if (!EnableInvokeDynamic) return; // leave it as a null
-
- // allocate space for the code
- ResourceMark rm;
- // setup code generation tools
- CodeBuffer buffer("ricochet_blob", 512, 512);
- MacroAssembler* masm = new MacroAssembler(&buffer);
-
- int frame_size_in_words = -1, bounce_offset = -1, exception_offset = -1;
- MethodHandles::RicochetFrame::generate_ricochet_blob(masm, &frame_size_in_words, &bounce_offset, &exception_offset);
-
- // -------------
- // make sure all code is generated
- masm->flush();
-
- // failed to generate?
- if (frame_size_in_words < 0 || bounce_offset < 0 || exception_offset < 0) {
- assert(false, "bad ricochet blob");
- return;
- }
-
- _ricochet_blob = RicochetBlob::create(&buffer, bounce_offset, exception_offset, frame_size_in_words);
-}
-
//------------------------------generate_deopt_blob----------------------------
void SharedRuntime::generate_deopt_blob() {
// Allocate space for the code
@@ -3046,7 +3006,7 @@
// Generate a special Compile2Runtime blob that saves all registers,
// and setup oopmap.
//
-static SafepointBlob* generate_handler_blob(address call_ptr, bool cause_return) {
+SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause_return) {
assert(StubRoutines::forward_exception_entry() != NULL,
"must be generated before");
@@ -3132,7 +3092,7 @@
// but since this is generic code we don't know what they are and the caller
// must do any gc of the args.
//
-static RuntimeStub* generate_resolve_blob(address destination, const char* name) {
+RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
assert (StubRoutines::forward_exception_entry() != NULL, "must be generated before");
// allocate space for the code
@@ -3209,38 +3169,6 @@
}
-void SharedRuntime::generate_stubs() {
-
- _wrong_method_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::handle_wrong_method),
- "wrong_method_stub");
- _ic_miss_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::handle_wrong_method_ic_miss),
- "ic_miss_stub");
- _resolve_opt_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_opt_virtual_call_C),
- "resolve_opt_virtual_call");
-
- _resolve_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_virtual_call_C),
- "resolve_virtual_call");
-
- _resolve_static_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_static_call_C),
- "resolve_static_call");
- _polling_page_safepoint_handler_blob =
- generate_handler_blob(CAST_FROM_FN_PTR(address,
- SafepointSynchronize::handle_polling_page_exception), false);
-
- _polling_page_return_handler_blob =
- generate_handler_blob(CAST_FROM_FN_PTR(address,
- SafepointSynchronize::handle_polling_page_exception), true);
-
- generate_ricochet_blob();
-
- generate_deopt_blob();
-
-#ifdef COMPILER2
- generate_uncommon_trap_blob();
-#endif // COMPILER2
-}
-
-
#ifdef COMPILER2
// This is here instead of runtime_x86_64.cpp because it uses SimpleRuntimeFrame
//