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 1998-2005 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 | // native method calls |
duke@435 | 26 | |
duke@435 | 27 | class SignatureHandlerGenerator: public NativeSignatureIterator { |
duke@435 | 28 | private: |
duke@435 | 29 | MacroAssembler* _masm; |
duke@435 | 30 | #ifdef AMD64 |
duke@435 | 31 | #ifdef _WIN64 |
duke@435 | 32 | unsigned int _num_args; |
duke@435 | 33 | #else |
duke@435 | 34 | unsigned int _num_fp_args; |
duke@435 | 35 | unsigned int _num_int_args; |
duke@435 | 36 | #endif // _WIN64 |
duke@435 | 37 | int _stack_offset; |
duke@435 | 38 | #else |
duke@435 | 39 | void move(int from_offset, int to_offset); |
duke@435 | 40 | void box(int from_offset, int to_offset); |
duke@435 | 41 | #endif // AMD64 |
duke@435 | 42 | |
duke@435 | 43 | void pass_int(); |
duke@435 | 44 | void pass_long(); |
duke@435 | 45 | void pass_float(); |
duke@435 | 46 | #ifdef AMD64 |
duke@435 | 47 | void pass_double(); |
duke@435 | 48 | #endif // AMD64 |
duke@435 | 49 | void pass_object(); |
duke@435 | 50 | |
duke@435 | 51 | public: |
duke@435 | 52 | // Creation |
duke@435 | 53 | SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer) : NativeSignatureIterator(method) { |
duke@435 | 54 | _masm = new MacroAssembler(buffer); |
duke@435 | 55 | #ifdef AMD64 |
duke@435 | 56 | #ifdef _WIN64 |
duke@435 | 57 | _num_args = (method->is_static() ? 1 : 0); |
duke@435 | 58 | _stack_offset = (Argument::n_int_register_parameters_c+1)* wordSize; // don't overwrite return address |
duke@435 | 59 | #else |
duke@435 | 60 | _num_int_args = (method->is_static() ? 1 : 0); |
duke@435 | 61 | _num_fp_args = 0; |
duke@435 | 62 | _stack_offset = wordSize; // don't overwrite return address |
duke@435 | 63 | #endif // _WIN64 |
duke@435 | 64 | #endif // AMD64 |
duke@435 | 65 | } |
duke@435 | 66 | |
duke@435 | 67 | // Code generation |
duke@435 | 68 | void generate(uint64_t fingerprint); |
duke@435 | 69 | |
duke@435 | 70 | // Code generation support |
duke@435 | 71 | static Register from(); |
duke@435 | 72 | static Register to(); |
duke@435 | 73 | static Register temp(); |
duke@435 | 74 | }; |