1.1 --- a/src/cpu/zero/vm/sharedRuntime_zero.cpp Sat Aug 06 08:28:08 2011 -0700
1.2 +++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp Mon Aug 08 05:49:04 2011 -0700
1.3 @@ -46,14 +46,6 @@
1.4 #include "shark/sharkCompiler.hpp"
1.5 #endif
1.6
1.7 -DeoptimizationBlob *SharedRuntime::_deopt_blob;
1.8 -SafepointBlob *SharedRuntime::_polling_page_safepoint_handler_blob;
1.9 -SafepointBlob *SharedRuntime::_polling_page_return_handler_blob;
1.10 -RuntimeStub *SharedRuntime::_wrong_method_blob;
1.11 -RuntimeStub *SharedRuntime::_ic_miss_blob;
1.12 -RuntimeStub *SharedRuntime::_resolve_opt_virtual_call_blob;
1.13 -RuntimeStub *SharedRuntime::_resolve_virtual_call_blob;
1.14 -RuntimeStub *SharedRuntime::_resolve_static_call_blob;
1.15
1.16 int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
1.17 VMRegPair *regs,
1.18 @@ -114,22 +106,22 @@
1.19 return SafepointBlob::create(&buffer, NULL, 0);
1.20 }
1.21
1.22 -void SharedRuntime::generate_stubs() {
1.23 - _wrong_method_blob =
1.24 - generate_empty_runtime_stub("wrong_method_stub");
1.25 - _ic_miss_blob =
1.26 - generate_empty_runtime_stub("ic_miss_stub");
1.27 - _resolve_opt_virtual_call_blob =
1.28 - generate_empty_runtime_stub("resolve_opt_virtual_call");
1.29 - _resolve_virtual_call_blob =
1.30 - generate_empty_runtime_stub("resolve_virtual_call");
1.31 - _resolve_static_call_blob =
1.32 - generate_empty_runtime_stub("resolve_static_call");
1.33 +static DeoptimizationBlob* generate_empty_deopt_blob() {
1.34 + CodeBuffer buffer("handler_blob", 0, 0);
1.35 + return DeoptimizationBlob::create(&buffer, NULL, 0, 0, 0, 0);
1.36 +}
1.37
1.38 - _polling_page_safepoint_handler_blob =
1.39 - generate_empty_safepoint_blob();
1.40 - _polling_page_return_handler_blob =
1.41 - generate_empty_safepoint_blob();
1.42 +
1.43 +void SharedRuntime::generate_deopt_blob() {
1.44 + _deopt_blob = generate_empty_deopt_blob();
1.45 +}
1.46 +
1.47 +SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause_return) {
1.48 + return generate_empty_safepoint_blob();
1.49 +}
1.50 +
1.51 +RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
1.52 + return generate_empty_runtime_stub("resolve_blob");
1.53 }
1.54
1.55 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
