Thu, 08 Apr 2010 10:55:40 +0200
6941529: SharedRuntime::raw_exception_handler_for_return_address must reset thread MethodHandle flag
Summary: During testing a bug was hit when an exception returned to the interpreter and the SP was wrong.
Reviewed-by: kvn, never
duke@435 | 1 | /* |
duke@435 | 2 | * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | #include "incls/_precompiled.incl" |
duke@435 | 26 | #include "incls/_icBuffer_x86.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | int InlineCacheBuffer::ic_stub_code_size() { |
duke@435 | 29 | return NativeMovConstReg::instruction_size + |
duke@435 | 30 | NativeJump::instruction_size + |
duke@435 | 31 | 1; |
duke@435 | 32 | // so that code_end can be set in CodeBuffer |
duke@435 | 33 | // 64bit 16 = 5 + 10 bytes + 1 byte |
duke@435 | 34 | // 32bit 11 = 10 bytes + 1 byte |
duke@435 | 35 | } |
duke@435 | 36 | |
duke@435 | 37 | |
duke@435 | 38 | |
duke@435 | 39 | void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin, oop cached_oop, address entry_point) { |
duke@435 | 40 | ResourceMark rm; |
duke@435 | 41 | CodeBuffer code(code_begin, ic_stub_code_size()); |
duke@435 | 42 | MacroAssembler* masm = new MacroAssembler(&code); |
duke@435 | 43 | // note: even though the code contains an embedded oop, we do not need reloc info |
duke@435 | 44 | // because |
duke@435 | 45 | // (1) the oop is old (i.e., doesn't matter for scavenges) |
duke@435 | 46 | // (2) these ICStubs are removed *before* a GC happens, so the roots disappear |
duke@435 | 47 | assert(cached_oop == NULL || cached_oop->is_perm(), "must be perm oop"); |
duke@435 | 48 | masm->lea(rax, OopAddress((address) cached_oop)); |
duke@435 | 49 | masm->jump(ExternalAddress(entry_point)); |
duke@435 | 50 | } |
duke@435 | 51 | |
duke@435 | 52 | |
duke@435 | 53 | address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { |
duke@435 | 54 | NativeMovConstReg* move = nativeMovConstReg_at(code_begin); // creation also verifies the object |
duke@435 | 55 | NativeJump* jump = nativeJump_at(move->next_instruction_address()); |
duke@435 | 56 | return jump->jump_destination(); |
duke@435 | 57 | } |
duke@435 | 58 | |
duke@435 | 59 | |
duke@435 | 60 | oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) { |
duke@435 | 61 | // creation also verifies the object |
duke@435 | 62 | NativeMovConstReg* move = nativeMovConstReg_at(code_begin); |
duke@435 | 63 | // Verifies the jump |
duke@435 | 64 | NativeJump* jump = nativeJump_at(move->next_instruction_address()); |
duke@435 | 65 | return (oop)move->data(); |
duke@435 | 66 | } |