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 | /* |
twisti@1734 | 2 | * Copyright 1997-2010 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 | // This file holds the platform specific parts of the StubRoutines |
duke@435 | 26 | // definition. See stubRoutines.hpp for a description on how to |
duke@435 | 27 | // extend it. |
duke@435 | 28 | |
duke@435 | 29 | enum platform_dependent_constants { |
duke@435 | 30 | code_size1 = 9000, // simply increase if too small (assembler will crash if too small) |
duke@435 | 31 | code_size2 = 22000 // simply increase if too small (assembler will crash if too small) |
duke@435 | 32 | }; |
duke@435 | 33 | |
twisti@1734 | 34 | // MethodHandles adapters |
twisti@1734 | 35 | enum method_handles_platform_dependent_constants { |
twisti@1734 | 36 | method_handles_adapters_code_size = 5000 |
twisti@1734 | 37 | }; |
twisti@1734 | 38 | |
never@739 | 39 | class x86 { |
duke@435 | 40 | friend class StubGenerator; |
duke@435 | 41 | friend class VMStructs; |
duke@435 | 42 | |
duke@435 | 43 | private: |
duke@435 | 44 | // If we call compiled code directly from the call stub we will |
duke@435 | 45 | // need to adjust the return back to the call stub to a specialized |
duke@435 | 46 | // piece of code that can handle compiled results and cleaning the fpu |
duke@435 | 47 | // stack. The variable holds that location. |
duke@435 | 48 | static address _call_stub_compiled_return; |
duke@435 | 49 | static address _verify_mxcsr_entry; |
duke@435 | 50 | static address _verify_fpu_cntrl_wrd_entry; |
duke@435 | 51 | static jint _mxcsr_std; |
duke@435 | 52 | |
duke@435 | 53 | public: |
duke@435 | 54 | static address verify_mxcsr_entry() { return _verify_mxcsr_entry; } |
duke@435 | 55 | static address verify_fpu_cntrl_wrd_entry() { return _verify_fpu_cntrl_wrd_entry; } |
duke@435 | 56 | |
duke@435 | 57 | static address get_call_stub_compiled_return() { return _call_stub_compiled_return; } |
duke@435 | 58 | static void set_call_stub_compiled_return(address ret) { _call_stub_compiled_return = ret; } |
duke@435 | 59 | }; |
duke@435 | 60 | |
duke@435 | 61 | static bool returns_to_call_stub(address return_pc) { return (return_pc == _call_stub_return_address) || |
never@739 | 62 | return_pc == x86::get_call_stub_compiled_return(); } |