Print this page
rev 1081 : imported patch indy-cleanup-6893081.patch
| Split |
Close |
| Expand all |
| Collapse all |
--- old/src/cpu/x86/vm/runtime_x86_32.cpp
+++ new/src/cpu/x86/vm/runtime_x86_32.cpp
1 1 /*
2 2 * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 20 * CA 95054 USA or visit www.sun.com if you need additional information or
21 21 * have any questions.
22 22 *
23 23 */
24 24
25 25
26 26 #include "incls/_precompiled.incl"
27 27 #include "incls/_runtime_x86_32.cpp.incl"
28 28
29 29 #define __ masm->
30 30
31 31 ExceptionBlob* OptoRuntime::_exception_blob;
32 32
33 33 //------------------------------generate_exception_blob---------------------------
34 34 // creates exception blob at the end
35 35 // Using exception blob, this code is jumped from a compiled method.
|
↓ open down ↓ |
35 lines elided |
↑ open up ↑ |
36 36 //
37 37 // Given an exception pc at a call we call into the runtime for the
38 38 // handler in this method. This handler might merely restore state
39 39 // (i.e. callee save registers) unwind the frame and jump to the
40 40 // exception handler for the nmethod if there is no Java level handler
41 41 // for the nmethod.
42 42 //
43 43 // This code is entered with a jmp.
44 44 //
45 45 // Arguments:
46 -// rax,: exception oop
46 +// rax: exception oop
47 47 // rdx: exception pc
48 48 //
49 49 // Results:
50 -// rax,: exception oop
50 +// rax: exception oop
51 51 // rdx: exception pc in caller or ???
52 52 // destination: exception handler of caller
53 53 //
54 54 // Note: the exception pc MUST be at a call (precise debug information)
55 55 // Only register rax, rdx, rcx are not callee saved.
56 56 //
57 57
58 58 void OptoRuntime::generate_exception_blob() {
59 59
60 60 // Capture info about frame layout
61 61 enum layout {
62 62 thread_off, // last_java_sp
63 63 // The frame sender code expects that rbp will be in the "natural" place and
64 64 // will override any oopMap setting for it. We must therefore force the layout
65 65 // so that it agrees with the frame sender code.
66 66 rbp_off,
67 67 return_off, // slot for return address
68 68 framesize
69 69 };
70 70
71 71 // allocate space for the code
72 72 ResourceMark rm;
73 73 // setup code generation tools
74 74 CodeBuffer buffer("exception_blob", 512, 512);
75 75 MacroAssembler* masm = new MacroAssembler(&buffer);
76 76
77 77 OopMapSet *oop_maps = new OopMapSet();
78 78
79 79 address start = __ pc();
80 80
81 81 __ push(rdx);
82 82 __ subptr(rsp, return_off * wordSize); // Prolog!
83 83
84 84 // rbp, location is implicitly known
85 85 __ movptr(Address(rsp,rbp_off *wordSize), rbp);
86 86
87 87 // Store exception in Thread object. We cannot pass any arguments to the
88 88 // handle_exception call, since we do not want to make any assumption
89 89 // about the size of the frame where the exception happened in.
90 90 __ get_thread(rcx);
91 91 __ movptr(Address(rcx, JavaThread::exception_oop_offset()), rax);
92 92 __ movptr(Address(rcx, JavaThread::exception_pc_offset()), rdx);
93 93
94 94 // This call does all the hard work. It checks if an exception handler
95 95 // exists in the method.
96 96 // If so, it returns the handler address.
97 97 // If not, it prepares for stack-unwinding, restoring the callee-save
98 98 // registers of the frame being removed.
99 99 //
100 100 __ movptr(Address(rsp, thread_off * wordSize), rcx); // Thread is first argument
101 101 __ set_last_Java_frame(rcx, noreg, noreg, NULL);
102 102
103 103 __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
104 104
105 105 // No registers to map, rbp is known implicitly
|
↓ open down ↓ |
45 lines elided |
↑ open up ↑ |
106 106 oop_maps->add_gc_map( __ pc() - start, new OopMap( framesize, 0 ));
107 107 __ get_thread(rcx);
108 108 __ reset_last_Java_frame(rcx, false, false);
109 109
110 110 // Restore callee-saved registers
111 111 __ movptr(rbp, Address(rsp, rbp_off * wordSize));
112 112
113 113 __ addptr(rsp, return_off * wordSize); // Epilog!
114 114 __ pop(rdx); // Exception pc
115 115
116 + // rax: exception handler for given <exception oop/exception pc>
116 117
117 - // rax,: exception handler for given <exception oop/exception pc>
118 + // Restore SP from BP if the exception PC is a MethodHandle call.
119 + __ cmpl(Address(rcx, JavaThread::is_method_handle_exception_offset()), 0);
120 + __ cmovptr(Assembler::notEqual, rsp, rbp);
118 121
119 122 // We have a handler in rax, (could be deopt blob)
120 123 // rdx - throwing pc, deopt blob will need it.
121 124
122 125 __ push(rax);
123 126
124 - // rcx contains handler address
125 -
126 - __ get_thread(rcx); // TLS
127 127 // Get the exception
128 128 __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
129 129 // Get the exception pc in case we are deoptimized
130 130 __ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
131 131 #ifdef ASSERT
132 132 __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), NULL_WORD);
133 133 __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
134 134 #endif
135 135 // Clear the exception oop so GC no longer processes it as a root.
136 136 __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
137 137
138 138 __ pop(rcx);
139 139
140 - // rax,: exception oop
140 + // rax: exception oop
141 141 // rcx: exception handler
142 142 // rdx: exception pc
143 143 __ jmp (rcx);
144 144
145 145 // -------------
146 146 // make sure all code is generated
147 147 masm->flush();
148 148
149 149 _exception_blob = ExceptionBlob::create(&buffer, oop_maps, framesize);
150 150 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX