1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Mon Aug 23 09:09:36 2010 -0700
1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Aug 25 05:27:54 2010 -0700
1.3 @@ -1124,7 +1124,7 @@
1.4 if (handler_blob == NULL) {
1.5 return NULL;
1.6 }
1.7 - address handler = handler_blob->instructions_begin();
1.8 + address handler = handler_blob->code_begin();
1.9 _handler_blob = handler_blob;
1.10 _handler = handler;
1.11 return handler;
1.12 @@ -1140,7 +1140,7 @@
1.13
1.14 BufferBlob* bb = BufferBlob::create("Signature Handler Temp Buffer",
1.15 SignatureHandlerLibrary::buffer_size);
1.16 - _buffer = bb->instructions_begin();
1.17 + _buffer = bb->code_begin();
1.18
1.19 _fingerprints = new(ResourceObj::C_HEAP)GrowableArray<uint64_t>(32, true);
1.20 _handlers = new(ResourceObj::C_HEAP)GrowableArray<address>(32, true);
1.21 @@ -1148,16 +1148,16 @@
1.22
1.23 address SignatureHandlerLibrary::set_handler(CodeBuffer* buffer) {
1.24 address handler = _handler;
1.25 - int code_size = buffer->pure_code_size();
1.26 - if (handler + code_size > _handler_blob->instructions_end()) {
1.27 + int insts_size = buffer->pure_insts_size();
1.28 + if (handler + insts_size > _handler_blob->code_end()) {
1.29 // get a new handler blob
1.30 handler = set_handler_blob();
1.31 }
1.32 if (handler != NULL) {
1.33 - memcpy(handler, buffer->code_begin(), code_size);
1.34 + memcpy(handler, buffer->insts_begin(), insts_size);
1.35 pd_set_handler(handler);
1.36 - ICache::invalidate_range(handler, code_size);
1.37 - _handler = handler + code_size;
1.38 + ICache::invalidate_range(handler, insts_size);
1.39 + _handler = handler + insts_size;
1.40 }
1.41 return handler;
1.42 }
1.43 @@ -1196,8 +1196,8 @@
1.44 (method->is_static() ? "static" : "receiver"),
1.45 method->name_and_sig_as_C_string(),
1.46 fingerprint,
1.47 - buffer.code_size());
1.48 - Disassembler::decode(handler, handler + buffer.code_size());
1.49 + buffer.insts_size());
1.50 + Disassembler::decode(handler, handler + buffer.insts_size());
1.51 #ifndef PRODUCT
1.52 tty->print_cr(" --- associated result handler ---");
1.53 address rh_begin = Interpreter::result_handler(method()->result_type());
