annotate src/share/vm/runtime/vframeArray.cpp @ 2607:008adfd6d850

Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction. This is necessary to ensure correct continuation in the interpreter when the stateBefore is used as a deoptimization point.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Fri, 06 May 2011 17:47:17 +0200
parents d25d4ca69222
children 5ca1332171c8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 /*
2142
8012aa3ccede 4926272: methodOopDesc::method_from_bcp is unsafe
never
parents: 1972
diff changeset
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 *
a61af66fc99e Initial load
duke
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 * published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 *
a61af66fc99e Initial load
duke
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 * accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 *
a61af66fc99e Initial load
duke
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 *
1552
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1506
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1506
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1506
diff changeset
21 * questions.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
22 *
a61af66fc99e Initial load
duke
parents:
diff changeset
23 */
a61af66fc99e Initial load
duke
parents:
diff changeset
24
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
25 #include "precompiled.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
26 #include "classfile/vmSymbols.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
27 #include "interpreter/interpreter.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
28 #include "memory/allocation.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
29 #include "memory/resourceArea.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
30 #include "memory/universe.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
31 #include "oops/methodDataOop.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
32 #include "oops/oop.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
33 #include "prims/jvmtiThreadState.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
34 #include "runtime/handles.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
35 #include "runtime/monitorChunk.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
36 #include "runtime/sharedRuntime.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
37 #include "runtime/vframe.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
38 #include "runtime/vframeArray.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
39 #include "runtime/vframe_hp.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
40 #include "utilities/events.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
41 #ifdef COMPILER2
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
42 #include "opto/runtime.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1814
diff changeset
43 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
44
a61af66fc99e Initial load
duke
parents:
diff changeset
45
a61af66fc99e Initial load
duke
parents:
diff changeset
46 int vframeArrayElement:: bci(void) const { return (_bci == SynchronizationEntryBCI ? 0 : _bci); }
a61af66fc99e Initial load
duke
parents:
diff changeset
47
a61af66fc99e Initial load
duke
parents:
diff changeset
48 void vframeArrayElement::free_monitors(JavaThread* jt) {
a61af66fc99e Initial load
duke
parents:
diff changeset
49 if (_monitors != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
50 MonitorChunk* chunk = _monitors;
a61af66fc99e Initial load
duke
parents:
diff changeset
51 _monitors = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
52 jt->remove_monitor_chunk(chunk);
a61af66fc99e Initial load
duke
parents:
diff changeset
53 delete chunk;
a61af66fc99e Initial load
duke
parents:
diff changeset
54 }
a61af66fc99e Initial load
duke
parents:
diff changeset
55 }
a61af66fc99e Initial load
duke
parents:
diff changeset
56
a61af66fc99e Initial load
duke
parents:
diff changeset
57 void vframeArrayElement::fill_in(compiledVFrame* vf) {
a61af66fc99e Initial load
duke
parents:
diff changeset
58
a61af66fc99e Initial load
duke
parents:
diff changeset
59 // Copy the information from the compiled vframe to the
a61af66fc99e Initial load
duke
parents:
diff changeset
60 // interpreter frame we will be creating to replace vf
a61af66fc99e Initial load
duke
parents:
diff changeset
61
a61af66fc99e Initial load
duke
parents:
diff changeset
62 _method = vf->method();
a61af66fc99e Initial load
duke
parents:
diff changeset
63 _bci = vf->raw_bci();
900
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
64 _reexecute = vf->should_reexecute();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
65
a61af66fc99e Initial load
duke
parents:
diff changeset
66 int index;
a61af66fc99e Initial load
duke
parents:
diff changeset
67
a61af66fc99e Initial load
duke
parents:
diff changeset
68 // Get the monitors off-stack
a61af66fc99e Initial load
duke
parents:
diff changeset
69
a61af66fc99e Initial load
duke
parents:
diff changeset
70 GrowableArray<MonitorInfo*>* list = vf->monitors();
a61af66fc99e Initial load
duke
parents:
diff changeset
71 if (list->is_empty()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
72 _monitors = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
73 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
74
a61af66fc99e Initial load
duke
parents:
diff changeset
75 // Allocate monitor chunk
a61af66fc99e Initial load
duke
parents:
diff changeset
76 _monitors = new MonitorChunk(list->length());
a61af66fc99e Initial load
duke
parents:
diff changeset
77 vf->thread()->add_monitor_chunk(_monitors);
a61af66fc99e Initial load
duke
parents:
diff changeset
78
a61af66fc99e Initial load
duke
parents:
diff changeset
79 // Migrate the BasicLocks from the stack to the monitor chunk
a61af66fc99e Initial load
duke
parents:
diff changeset
80 for (index = 0; index < list->length(); index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
81 MonitorInfo* monitor = list->at(index);
818
b109e761e927 6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14
kvn
parents: 0
diff changeset
82 assert(!monitor->owner_is_scalar_replaced(), "object should be reallocated already");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
83 assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased");
a61af66fc99e Initial load
duke
parents:
diff changeset
84 BasicObjectLock* dest = _monitors->at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
85 dest->set_obj(monitor->owner());
a61af66fc99e Initial load
duke
parents:
diff changeset
86 monitor->lock()->move_to(monitor->owner(), dest->lock());
a61af66fc99e Initial load
duke
parents:
diff changeset
87 }
a61af66fc99e Initial load
duke
parents:
diff changeset
88 }
a61af66fc99e Initial load
duke
parents:
diff changeset
89
a61af66fc99e Initial load
duke
parents:
diff changeset
90 // Convert the vframe locals and expressions to off stack
a61af66fc99e Initial load
duke
parents:
diff changeset
91 // values. Because we will not gc all oops can be converted to
a61af66fc99e Initial load
duke
parents:
diff changeset
92 // intptr_t (i.e. a stack slot) and we are fine. This is
a61af66fc99e Initial load
duke
parents:
diff changeset
93 // good since we are inside a HandleMark and the oops in our
a61af66fc99e Initial load
duke
parents:
diff changeset
94 // collection would go away between packing them here and
a61af66fc99e Initial load
duke
parents:
diff changeset
95 // unpacking them in unpack_on_stack.
a61af66fc99e Initial load
duke
parents:
diff changeset
96
a61af66fc99e Initial load
duke
parents:
diff changeset
97 // First the locals go off-stack
a61af66fc99e Initial load
duke
parents:
diff changeset
98
a61af66fc99e Initial load
duke
parents:
diff changeset
99 // FIXME this seems silly it creates a StackValueCollection
a61af66fc99e Initial load
duke
parents:
diff changeset
100 // in order to get the size to then copy them and
a61af66fc99e Initial load
duke
parents:
diff changeset
101 // convert the types to intptr_t size slots. Seems like it
a61af66fc99e Initial load
duke
parents:
diff changeset
102 // could do it in place... Still uses less memory than the
a61af66fc99e Initial load
duke
parents:
diff changeset
103 // old way though
a61af66fc99e Initial load
duke
parents:
diff changeset
104
a61af66fc99e Initial load
duke
parents:
diff changeset
105 StackValueCollection *locs = vf->locals();
a61af66fc99e Initial load
duke
parents:
diff changeset
106 _locals = new StackValueCollection(locs->size());
a61af66fc99e Initial load
duke
parents:
diff changeset
107 for(index = 0; index < locs->size(); index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
108 StackValue* value = locs->at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
109 switch(value->type()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
110 case T_OBJECT:
818
b109e761e927 6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14
kvn
parents: 0
diff changeset
111 assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
112 // preserve object type
a61af66fc99e Initial load
duke
parents:
diff changeset
113 _locals->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
a61af66fc99e Initial load
duke
parents:
diff changeset
114 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
115 case T_CONFLICT:
a61af66fc99e Initial load
duke
parents:
diff changeset
116 // A dead local. Will be initialized to null/zero.
a61af66fc99e Initial load
duke
parents:
diff changeset
117 _locals->add( new StackValue());
a61af66fc99e Initial load
duke
parents:
diff changeset
118 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
119 case T_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
120 _locals->add( new StackValue(value->get_int()));
a61af66fc99e Initial load
duke
parents:
diff changeset
121 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
122 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
123 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
124 }
a61af66fc99e Initial load
duke
parents:
diff changeset
125 }
a61af66fc99e Initial load
duke
parents:
diff changeset
126
a61af66fc99e Initial load
duke
parents:
diff changeset
127 // Now the expressions off-stack
a61af66fc99e Initial load
duke
parents:
diff changeset
128 // Same silliness as above
a61af66fc99e Initial load
duke
parents:
diff changeset
129
a61af66fc99e Initial load
duke
parents:
diff changeset
130 StackValueCollection *exprs = vf->expressions();
a61af66fc99e Initial load
duke
parents:
diff changeset
131 _expressions = new StackValueCollection(exprs->size());
a61af66fc99e Initial load
duke
parents:
diff changeset
132 for(index = 0; index < exprs->size(); index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
133 StackValue* value = exprs->at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
134 switch(value->type()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
135 case T_OBJECT:
818
b109e761e927 6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14
kvn
parents: 0
diff changeset
136 assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
137 // preserve object type
a61af66fc99e Initial load
duke
parents:
diff changeset
138 _expressions->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
a61af66fc99e Initial load
duke
parents:
diff changeset
139 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
140 case T_CONFLICT:
a61af66fc99e Initial load
duke
parents:
diff changeset
141 // A dead stack element. Will be initialized to null/zero.
a61af66fc99e Initial load
duke
parents:
diff changeset
142 // This can occur when the compiler emits a state in which stack
a61af66fc99e Initial load
duke
parents:
diff changeset
143 // elements are known to be dead (because of an imminent exception).
a61af66fc99e Initial load
duke
parents:
diff changeset
144 _expressions->add( new StackValue());
a61af66fc99e Initial load
duke
parents:
diff changeset
145 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
146 case T_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
147 _expressions->add( new StackValue(value->get_int()));
a61af66fc99e Initial load
duke
parents:
diff changeset
148 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
149 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
150 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
151 }
a61af66fc99e Initial load
duke
parents:
diff changeset
152 }
a61af66fc99e Initial load
duke
parents:
diff changeset
153 }
a61af66fc99e Initial load
duke
parents:
diff changeset
154
a61af66fc99e Initial load
duke
parents:
diff changeset
155 int unpack_counter = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
156
a61af66fc99e Initial load
duke
parents:
diff changeset
157 void vframeArrayElement::unpack_on_stack(int callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
158 int callee_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
159 frame* caller,
a61af66fc99e Initial load
duke
parents:
diff changeset
160 bool is_top_frame,
a61af66fc99e Initial load
duke
parents:
diff changeset
161 int exec_mode) {
a61af66fc99e Initial load
duke
parents:
diff changeset
162 JavaThread* thread = (JavaThread*) Thread::current();
a61af66fc99e Initial load
duke
parents:
diff changeset
163
a61af66fc99e Initial load
duke
parents:
diff changeset
164 // Look at bci and decide on bcp and continuation pc
a61af66fc99e Initial load
duke
parents:
diff changeset
165 address bcp;
a61af66fc99e Initial load
duke
parents:
diff changeset
166 // C++ interpreter doesn't need a pc since it will figure out what to do when it
a61af66fc99e Initial load
duke
parents:
diff changeset
167 // begins execution
a61af66fc99e Initial load
duke
parents:
diff changeset
168 address pc;
900
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
169 bool use_next_mdp = false; // true if we should use the mdp associated with the next bci
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
170 // rather than the one associated with bcp
0
a61af66fc99e Initial load
duke
parents:
diff changeset
171 if (raw_bci() == SynchronizationEntryBCI) {
a61af66fc99e Initial load
duke
parents:
diff changeset
172 // We are deoptimizing while hanging in prologue code for synchronized method
a61af66fc99e Initial load
duke
parents:
diff changeset
173 bcp = method()->bcp_from(0); // first byte code
a61af66fc99e Initial load
duke
parents:
diff changeset
174 pc = Interpreter::deopt_entry(vtos, 0); // step = 0 since we don't skip current bytecode
900
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
175 } else if (should_reexecute()) { //reexecute this bytecode
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
176 assert(is_top_frame, "reexecute allowed only for the top frame");
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
177 bcp = method()->bcp_from(bci());
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
178 pc = Interpreter::deopt_reexecute_entry(method(), bcp);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
179 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
180 bcp = method()->bcp_from(bci());
900
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
181 pc = Interpreter::deopt_continue_after_entry(method(), bcp, callee_parameters, is_top_frame);
9987d9d5eb0e 6833129: specjvm98 fails with NullPointerException in the compiler with -XX:DeoptimizeALot
cfang
parents: 818
diff changeset
182 use_next_mdp = true;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
183 }
a61af66fc99e Initial load
duke
parents:
diff changeset
184 assert(Bytecodes::is_defined(*bcp), "must be a valid bytecode");
a61af66fc99e Initial load
duke
parents:
diff changeset
185
a61af66fc99e Initial load
duke
parents:
diff changeset
186 // Monitorenter and pending exceptions:
a61af66fc99e Initial load
duke
parents:
diff changeset
187 //
a61af66fc99e Initial load
duke
parents:
diff changeset
188 // For Compiler2, there should be no pending exception when deoptimizing at monitorenter
a61af66fc99e Initial load
duke
parents:
diff changeset
189 // because there is no safepoint at the null pointer check (it is either handled explicitly
a61af66fc99e Initial load
duke
parents:
diff changeset
190 // or prior to the monitorenter) and asynchronous exceptions are not made "pending" by the
a61af66fc99e Initial load
duke
parents:
diff changeset
191 // runtime interface for the slow case (see JRT_ENTRY_FOR_MONITORENTER). If an asynchronous
a61af66fc99e Initial load
duke
parents:
diff changeset
192 // exception was processed, the bytecode pointer would have to be extended one bytecode beyond
a61af66fc99e Initial load
duke
parents:
diff changeset
193 // the monitorenter to place it in the proper exception range.
a61af66fc99e Initial load
duke
parents:
diff changeset
194 //
a61af66fc99e Initial load
duke
parents:
diff changeset
195 // For Compiler1, deoptimization can occur while throwing a NullPointerException at monitorenter,
a61af66fc99e Initial load
duke
parents:
diff changeset
196 // in which case bcp should point to the monitorenter since it is within the exception's range.
a61af66fc99e Initial load
duke
parents:
diff changeset
197
a61af66fc99e Initial load
duke
parents:
diff changeset
198 assert(*bcp != Bytecodes::_monitorenter || is_top_frame, "a _monitorenter must be a top frame");
1814
fd5d4527cdf5 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
iveresov
parents: 1603
diff changeset
199 assert(thread->deopt_nmethod() != NULL, "nmethod should be known");
fd5d4527cdf5 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
iveresov
parents: 1603
diff changeset
200 guarantee(!(thread->deopt_nmethod()->is_compiled_by_c2() &&
fd5d4527cdf5 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
iveresov
parents: 1603
diff changeset
201 *bcp == Bytecodes::_monitorenter &&
fd5d4527cdf5 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
iveresov
parents: 1603
diff changeset
202 exec_mode == Deoptimization::Unpack_exception),
fd5d4527cdf5 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
iveresov
parents: 1603
diff changeset
203 "shouldn't get exception during monitorenter");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
204
a61af66fc99e Initial load
duke
parents:
diff changeset
205 int popframe_preserved_args_size_in_bytes = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
206 int popframe_preserved_args_size_in_words = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
207 if (is_top_frame) {
1255
e3a4305c6bc3 6925249: assert(last_sp < (intptr_t*) interpreter_frame_monitor_begin(),"bad tos")
kvn
parents: 903
diff changeset
208 JvmtiThreadState *state = thread->jvmti_thread_state();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
209 if (JvmtiExport::can_pop_frame() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
210 (thread->has_pending_popframe() || thread->popframe_forcing_deopt_reexecution())) {
a61af66fc99e Initial load
duke
parents:
diff changeset
211 if (thread->has_pending_popframe()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
212 // Pop top frame after deoptimization
a61af66fc99e Initial load
duke
parents:
diff changeset
213 #ifndef CC_INTERP
a61af66fc99e Initial load
duke
parents:
diff changeset
214 pc = Interpreter::remove_activation_preserving_args_entry();
a61af66fc99e Initial load
duke
parents:
diff changeset
215 #else
a61af66fc99e Initial load
duke
parents:
diff changeset
216 // Do an uncommon trap type entry. c++ interpreter will know
a61af66fc99e Initial load
duke
parents:
diff changeset
217 // to pop frame and preserve the args
a61af66fc99e Initial load
duke
parents:
diff changeset
218 pc = Interpreter::deopt_entry(vtos, 0);
a61af66fc99e Initial load
duke
parents:
diff changeset
219 use_next_mdp = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
220 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
221 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
222 // Reexecute invoke in top frame
a61af66fc99e Initial load
duke
parents:
diff changeset
223 pc = Interpreter::deopt_entry(vtos, 0);
a61af66fc99e Initial load
duke
parents:
diff changeset
224 use_next_mdp = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
225 popframe_preserved_args_size_in_bytes = in_bytes(thread->popframe_preserved_args_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
226 // Note: the PopFrame-related extension of the expression stack size is done in
a61af66fc99e Initial load
duke
parents:
diff changeset
227 // Deoptimization::fetch_unroll_info_helper
a61af66fc99e Initial load
duke
parents:
diff changeset
228 popframe_preserved_args_size_in_words = in_words(thread->popframe_preserved_args_size_in_words());
a61af66fc99e Initial load
duke
parents:
diff changeset
229 }
a61af66fc99e Initial load
duke
parents:
diff changeset
230 } else if (JvmtiExport::can_force_early_return() && state != NULL && state->is_earlyret_pending()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
231 // Force early return from top frame after deoptimization
a61af66fc99e Initial load
duke
parents:
diff changeset
232 #ifndef CC_INTERP
a61af66fc99e Initial load
duke
parents:
diff changeset
233 pc = Interpreter::remove_activation_early_entry(state->earlyret_tos());
a61af66fc99e Initial load
duke
parents:
diff changeset
234 #else
a61af66fc99e Initial load
duke
parents:
diff changeset
235 // TBD: Need to implement ForceEarlyReturn for CC_INTERP (ia64)
a61af66fc99e Initial load
duke
parents:
diff changeset
236 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
237 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
238 // Possibly override the previous pc computation of the top (youngest) frame
a61af66fc99e Initial load
duke
parents:
diff changeset
239 switch (exec_mode) {
a61af66fc99e Initial load
duke
parents:
diff changeset
240 case Deoptimization::Unpack_deopt:
a61af66fc99e Initial load
duke
parents:
diff changeset
241 // use what we've got
a61af66fc99e Initial load
duke
parents:
diff changeset
242 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
243 case Deoptimization::Unpack_exception:
a61af66fc99e Initial load
duke
parents:
diff changeset
244 // exception is pending
1295
3cf667df43ef 6919934: JSR 292 needs to support x86 C1
twisti
parents: 1255
diff changeset
245 pc = SharedRuntime::raw_exception_handler_for_return_address(thread, pc);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
246 // [phh] We're going to end up in some handler or other, so it doesn't
a61af66fc99e Initial load
duke
parents:
diff changeset
247 // matter what mdp we point to. See exception_handler_for_exception()
a61af66fc99e Initial load
duke
parents:
diff changeset
248 // in interpreterRuntime.cpp.
a61af66fc99e Initial load
duke
parents:
diff changeset
249 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
250 case Deoptimization::Unpack_uncommon_trap:
a61af66fc99e Initial load
duke
parents:
diff changeset
251 case Deoptimization::Unpack_reexecute:
a61af66fc99e Initial load
duke
parents:
diff changeset
252 // redo last byte code
a61af66fc99e Initial load
duke
parents:
diff changeset
253 pc = Interpreter::deopt_entry(vtos, 0);
a61af66fc99e Initial load
duke
parents:
diff changeset
254 use_next_mdp = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
255 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
256 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
257 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
258 }
a61af66fc99e Initial load
duke
parents:
diff changeset
259 }
a61af66fc99e Initial load
duke
parents:
diff changeset
260 }
a61af66fc99e Initial load
duke
parents:
diff changeset
261
a61af66fc99e Initial load
duke
parents:
diff changeset
262 // Setup the interpreter frame
a61af66fc99e Initial load
duke
parents:
diff changeset
263
a61af66fc99e Initial load
duke
parents:
diff changeset
264 assert(method() != NULL, "method must exist");
a61af66fc99e Initial load
duke
parents:
diff changeset
265 int temps = expressions()->size();
a61af66fc99e Initial load
duke
parents:
diff changeset
266
a61af66fc99e Initial load
duke
parents:
diff changeset
267 int locks = monitors() == NULL ? 0 : monitors()->number_of_monitors();
a61af66fc99e Initial load
duke
parents:
diff changeset
268
a61af66fc99e Initial load
duke
parents:
diff changeset
269 Interpreter::layout_activation(method(),
a61af66fc99e Initial load
duke
parents:
diff changeset
270 temps + callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
271 popframe_preserved_args_size_in_words,
a61af66fc99e Initial load
duke
parents:
diff changeset
272 locks,
a61af66fc99e Initial load
duke
parents:
diff changeset
273 callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
274 callee_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
275 caller,
a61af66fc99e Initial load
duke
parents:
diff changeset
276 iframe(),
a61af66fc99e Initial load
duke
parents:
diff changeset
277 is_top_frame);
a61af66fc99e Initial load
duke
parents:
diff changeset
278
a61af66fc99e Initial load
duke
parents:
diff changeset
279 // Update the pc in the frame object and overwrite the temporary pc
a61af66fc99e Initial load
duke
parents:
diff changeset
280 // we placed in the skeletal frame now that we finally know the
a61af66fc99e Initial load
duke
parents:
diff changeset
281 // exact interpreter address we should use.
a61af66fc99e Initial load
duke
parents:
diff changeset
282
a61af66fc99e Initial load
duke
parents:
diff changeset
283 _frame.patch_pc(thread, pc);
a61af66fc99e Initial load
duke
parents:
diff changeset
284
a61af66fc99e Initial load
duke
parents:
diff changeset
285 assert (!method()->is_synchronized() || locks > 0, "synchronized methods must have monitors");
a61af66fc99e Initial load
duke
parents:
diff changeset
286
a61af66fc99e Initial load
duke
parents:
diff changeset
287 BasicObjectLock* top = iframe()->interpreter_frame_monitor_begin();
a61af66fc99e Initial load
duke
parents:
diff changeset
288 for (int index = 0; index < locks; index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
289 top = iframe()->previous_monitor_in_interpreter_frame(top);
a61af66fc99e Initial load
duke
parents:
diff changeset
290 BasicObjectLock* src = _monitors->at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
291 top->set_obj(src->obj());
a61af66fc99e Initial load
duke
parents:
diff changeset
292 src->lock()->move_to(src->obj(), top->lock());
a61af66fc99e Initial load
duke
parents:
diff changeset
293 }
a61af66fc99e Initial load
duke
parents:
diff changeset
294 if (ProfileInterpreter) {
a61af66fc99e Initial load
duke
parents:
diff changeset
295 iframe()->interpreter_frame_set_mdx(0); // clear out the mdp.
a61af66fc99e Initial load
duke
parents:
diff changeset
296 }
a61af66fc99e Initial load
duke
parents:
diff changeset
297 iframe()->interpreter_frame_set_bcx((intptr_t)bcp); // cannot use bcp because frame is not initialized yet
a61af66fc99e Initial load
duke
parents:
diff changeset
298 if (ProfileInterpreter) {
a61af66fc99e Initial load
duke
parents:
diff changeset
299 methodDataOop mdo = method()->method_data();
a61af66fc99e Initial load
duke
parents:
diff changeset
300 if (mdo != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
301 int bci = iframe()->interpreter_frame_bci();
a61af66fc99e Initial load
duke
parents:
diff changeset
302 if (use_next_mdp) ++bci;
a61af66fc99e Initial load
duke
parents:
diff changeset
303 address mdp = mdo->bci_to_dp(bci);
a61af66fc99e Initial load
duke
parents:
diff changeset
304 iframe()->interpreter_frame_set_mdp(mdp);
a61af66fc99e Initial load
duke
parents:
diff changeset
305 }
a61af66fc99e Initial load
duke
parents:
diff changeset
306 }
2607
008adfd6d850 Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2181
diff changeset
307
008adfd6d850 Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2181
diff changeset
308 if (TraceDeoptimization) {
008adfd6d850 Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2181
diff changeset
309 tty->print_cr("Expressions size: %d", expressions()->size());
008adfd6d850 Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction.
Thomas Wuerthinger <thomas@wuerthinger.net>
parents: 2181
diff changeset
310 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
311
a61af66fc99e Initial load
duke
parents:
diff changeset
312 // Unpack expression stack
a61af66fc99e Initial load
duke
parents:
diff changeset
313 // If this is an intermediate frame (i.e. not top frame) then this
a61af66fc99e Initial load
duke
parents:
diff changeset
314 // only unpacks the part of the expression stack not used by callee
a61af66fc99e Initial load
duke
parents:
diff changeset
315 // as parameters. The callee parameters are unpacked as part of the
a61af66fc99e Initial load
duke
parents:
diff changeset
316 // callee locals.
a61af66fc99e Initial load
duke
parents:
diff changeset
317 int i;
a61af66fc99e Initial load
duke
parents:
diff changeset
318 for(i = 0; i < expressions()->size(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
319 StackValue *value = expressions()->at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
320 intptr_t* addr = iframe()->interpreter_frame_expression_stack_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
321 switch(value->type()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
322 case T_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
323 *addr = value->get_int();
1936
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
324 #ifndef PRODUCT
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
325 if (TraceDeoptimization) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
326 tty->print_cr("Reconstructed expression %d (INT): %d", i, (int)(*addr));
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
327 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
328 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
329 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
330 case T_OBJECT:
a61af66fc99e Initial load
duke
parents:
diff changeset
331 *addr = value->get_int(T_OBJECT);
1936
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
332 #ifndef PRODUCT
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
333 if (TraceDeoptimization) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
334 tty->print("Reconstructed expression %d (OBJECT): ", i);
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
335 oop o = (oop)(*addr);
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
336 if (o == NULL) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
337 tty->print_cr("NULL");
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
338 } else {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
339 tty->print_cr(err_msg("%s", o->blueprint()->name()->as_C_string()));
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
340 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
341 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
342 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
343 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
344 case T_CONFLICT:
a61af66fc99e Initial load
duke
parents:
diff changeset
345 // A dead stack slot. Initialize to null in case it is an oop.
a61af66fc99e Initial load
duke
parents:
diff changeset
346 *addr = NULL_WORD;
a61af66fc99e Initial load
duke
parents:
diff changeset
347 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
348 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
349 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
350 }
a61af66fc99e Initial load
duke
parents:
diff changeset
351 }
a61af66fc99e Initial load
duke
parents:
diff changeset
352
a61af66fc99e Initial load
duke
parents:
diff changeset
353
a61af66fc99e Initial load
duke
parents:
diff changeset
354 // Unpack the locals
a61af66fc99e Initial load
duke
parents:
diff changeset
355 for(i = 0; i < locals()->size(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
356 StackValue *value = locals()->at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
357 intptr_t* addr = iframe()->interpreter_frame_local_at(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
358 switch(value->type()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
359 case T_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
360 *addr = value->get_int();
1936
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
361 #ifndef PRODUCT
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
362 if (TraceDeoptimization) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
363 tty->print_cr("Reconstructed local %d (INT): %d", i, (int)(*addr));
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
364 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
365 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
366 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
367 case T_OBJECT:
a61af66fc99e Initial load
duke
parents:
diff changeset
368 *addr = value->get_int(T_OBJECT);
1936
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
369 #ifndef PRODUCT
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
370 if (TraceDeoptimization) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
371 tty->print("Reconstructed local %d (OBJECT): ", i);
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
372 oop o = (oop)(*addr);
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
373 if (o == NULL) {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
374 tty->print_cr("NULL");
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
375 } else {
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
376 tty->print_cr(err_msg("%s", o->blueprint()->name()->as_C_string()));
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
377 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
378 }
8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1814
diff changeset
379 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
380 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
381 case T_CONFLICT:
a61af66fc99e Initial load
duke
parents:
diff changeset
382 // A dead location. If it is an oop then we need a NULL to prevent GC from following it
a61af66fc99e Initial load
duke
parents:
diff changeset
383 *addr = NULL_WORD;
a61af66fc99e Initial load
duke
parents:
diff changeset
384 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
385 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
386 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
387 }
a61af66fc99e Initial load
duke
parents:
diff changeset
388 }
a61af66fc99e Initial load
duke
parents:
diff changeset
389
a61af66fc99e Initial load
duke
parents:
diff changeset
390 if (is_top_frame && JvmtiExport::can_pop_frame() && thread->popframe_forcing_deopt_reexecution()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
391 // An interpreted frame was popped but it returns to a deoptimized
a61af66fc99e Initial load
duke
parents:
diff changeset
392 // frame. The incoming arguments to the interpreted activation
a61af66fc99e Initial load
duke
parents:
diff changeset
393 // were preserved in thread-local storage by the
a61af66fc99e Initial load
duke
parents:
diff changeset
394 // remove_activation_preserving_args_entry in the interpreter; now
a61af66fc99e Initial load
duke
parents:
diff changeset
395 // we put them back into the just-unpacked interpreter frame.
a61af66fc99e Initial load
duke
parents:
diff changeset
396 // Note that this assumes that the locals arena grows toward lower
a61af66fc99e Initial load
duke
parents:
diff changeset
397 // addresses.
a61af66fc99e Initial load
duke
parents:
diff changeset
398 if (popframe_preserved_args_size_in_words != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
399 void* saved_args = thread->popframe_preserved_args();
a61af66fc99e Initial load
duke
parents:
diff changeset
400 assert(saved_args != NULL, "must have been saved by interpreter");
a61af66fc99e Initial load
duke
parents:
diff changeset
401 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
402 assert(popframe_preserved_args_size_in_words <=
1506
2338d41fbd81 6943304: remove tagged stack interpreter
twisti
parents: 1295
diff changeset
403 iframe()->interpreter_frame_expression_stack_size()*Interpreter::stackElementWords,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
404 "expression stack size should have been extended");
a61af66fc99e Initial load
duke
parents:
diff changeset
405 #endif // ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
406 int top_element = iframe()->interpreter_frame_expression_stack_size()-1;
a61af66fc99e Initial load
duke
parents:
diff changeset
407 intptr_t* base;
a61af66fc99e Initial load
duke
parents:
diff changeset
408 if (frame::interpreter_frame_expression_stack_direction() < 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
409 base = iframe()->interpreter_frame_expression_stack_at(top_element);
a61af66fc99e Initial load
duke
parents:
diff changeset
410 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
411 base = iframe()->interpreter_frame_expression_stack();
a61af66fc99e Initial load
duke
parents:
diff changeset
412 }
1603
d93949c5bdcc 6730276: JDI_REGRESSION tests fail with "Error: count must be non-zero" error on x86
kvn
parents: 1552
diff changeset
413 Copy::conjoint_jbytes(saved_args,
d93949c5bdcc 6730276: JDI_REGRESSION tests fail with "Error: count must be non-zero" error on x86
kvn
parents: 1552
diff changeset
414 base,
d93949c5bdcc 6730276: JDI_REGRESSION tests fail with "Error: count must be non-zero" error on x86
kvn
parents: 1552
diff changeset
415 popframe_preserved_args_size_in_bytes);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
416 thread->popframe_free_preserved_args();
a61af66fc99e Initial load
duke
parents:
diff changeset
417 }
a61af66fc99e Initial load
duke
parents:
diff changeset
418 }
a61af66fc99e Initial load
duke
parents:
diff changeset
419
a61af66fc99e Initial load
duke
parents:
diff changeset
420 #ifndef PRODUCT
a61af66fc99e Initial load
duke
parents:
diff changeset
421 if (TraceDeoptimization && Verbose) {
a61af66fc99e Initial load
duke
parents:
diff changeset
422 ttyLocker ttyl;
a61af66fc99e Initial load
duke
parents:
diff changeset
423 tty->print_cr("[%d Interpreted Frame]", ++unpack_counter);
a61af66fc99e Initial load
duke
parents:
diff changeset
424 iframe()->print_on(tty);
a61af66fc99e Initial load
duke
parents:
diff changeset
425 RegisterMap map(thread);
a61af66fc99e Initial load
duke
parents:
diff changeset
426 vframe* f = vframe::new_vframe(iframe(), &map, thread);
a61af66fc99e Initial load
duke
parents:
diff changeset
427 f->print();
a61af66fc99e Initial load
duke
parents:
diff changeset
428
a61af66fc99e Initial load
duke
parents:
diff changeset
429 tty->print_cr("locals size %d", locals()->size());
a61af66fc99e Initial load
duke
parents:
diff changeset
430 tty->print_cr("expression size %d", expressions()->size());
a61af66fc99e Initial load
duke
parents:
diff changeset
431
a61af66fc99e Initial load
duke
parents:
diff changeset
432 method()->print_value();
a61af66fc99e Initial load
duke
parents:
diff changeset
433 tty->cr();
a61af66fc99e Initial load
duke
parents:
diff changeset
434 // method()->print_codes();
a61af66fc99e Initial load
duke
parents:
diff changeset
435 } else if (TraceDeoptimization) {
a61af66fc99e Initial load
duke
parents:
diff changeset
436 tty->print(" ");
a61af66fc99e Initial load
duke
parents:
diff changeset
437 method()->print_value();
2142
8012aa3ccede 4926272: methodOopDesc::method_from_bcp is unsafe
never
parents: 1972
diff changeset
438 Bytecodes::Code code = Bytecodes::java_code_at(method(), bcp);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
439 int bci = method()->bci_from(bcp);
a61af66fc99e Initial load
duke
parents:
diff changeset
440 tty->print(" - %s", Bytecodes::name(code));
a61af66fc99e Initial load
duke
parents:
diff changeset
441 tty->print(" @ bci %d ", bci);
a61af66fc99e Initial load
duke
parents:
diff changeset
442 tty->print_cr("sp = " PTR_FORMAT, iframe()->sp());
a61af66fc99e Initial load
duke
parents:
diff changeset
443 }
a61af66fc99e Initial load
duke
parents:
diff changeset
444 #endif // PRODUCT
a61af66fc99e Initial load
duke
parents:
diff changeset
445
a61af66fc99e Initial load
duke
parents:
diff changeset
446 // The expression stack and locals are in the resource area don't leave
a61af66fc99e Initial load
duke
parents:
diff changeset
447 // a dangling pointer in the vframeArray we leave around for debug
a61af66fc99e Initial load
duke
parents:
diff changeset
448 // purposes
a61af66fc99e Initial load
duke
parents:
diff changeset
449
a61af66fc99e Initial load
duke
parents:
diff changeset
450 _locals = _expressions = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
451
a61af66fc99e Initial load
duke
parents:
diff changeset
452 }
a61af66fc99e Initial load
duke
parents:
diff changeset
453
a61af66fc99e Initial load
duke
parents:
diff changeset
454 int vframeArrayElement::on_stack_size(int callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
455 int callee_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
456 bool is_top_frame,
a61af66fc99e Initial load
duke
parents:
diff changeset
457 int popframe_extra_stack_expression_els) const {
a61af66fc99e Initial load
duke
parents:
diff changeset
458 assert(method()->max_locals() == locals()->size(), "just checking");
a61af66fc99e Initial load
duke
parents:
diff changeset
459 int locks = monitors() == NULL ? 0 : monitors()->number_of_monitors();
a61af66fc99e Initial load
duke
parents:
diff changeset
460 int temps = expressions()->size();
a61af66fc99e Initial load
duke
parents:
diff changeset
461 return Interpreter::size_activation(method(),
a61af66fc99e Initial load
duke
parents:
diff changeset
462 temps + callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
463 popframe_extra_stack_expression_els,
a61af66fc99e Initial load
duke
parents:
diff changeset
464 locks,
a61af66fc99e Initial load
duke
parents:
diff changeset
465 callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
466 callee_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
467 is_top_frame);
a61af66fc99e Initial load
duke
parents:
diff changeset
468 }
a61af66fc99e Initial load
duke
parents:
diff changeset
469
a61af66fc99e Initial load
duke
parents:
diff changeset
470
a61af66fc99e Initial load
duke
parents:
diff changeset
471
a61af66fc99e Initial load
duke
parents:
diff changeset
472 vframeArray* vframeArray::allocate(JavaThread* thread, int frame_size, GrowableArray<compiledVFrame*>* chunk,
a61af66fc99e Initial load
duke
parents:
diff changeset
473 RegisterMap *reg_map, frame sender, frame caller, frame self) {
a61af66fc99e Initial load
duke
parents:
diff changeset
474
a61af66fc99e Initial load
duke
parents:
diff changeset
475 // Allocate the vframeArray
a61af66fc99e Initial load
duke
parents:
diff changeset
476 vframeArray * result = (vframeArray*) AllocateHeap(sizeof(vframeArray) + // fixed part
a61af66fc99e Initial load
duke
parents:
diff changeset
477 sizeof(vframeArrayElement) * (chunk->length() - 1), // variable part
a61af66fc99e Initial load
duke
parents:
diff changeset
478 "vframeArray::allocate");
a61af66fc99e Initial load
duke
parents:
diff changeset
479 result->_frames = chunk->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
480 result->_owner_thread = thread;
a61af66fc99e Initial load
duke
parents:
diff changeset
481 result->_sender = sender;
a61af66fc99e Initial load
duke
parents:
diff changeset
482 result->_caller = caller;
a61af66fc99e Initial load
duke
parents:
diff changeset
483 result->_original = self;
a61af66fc99e Initial load
duke
parents:
diff changeset
484 result->set_unroll_block(NULL); // initialize it
a61af66fc99e Initial load
duke
parents:
diff changeset
485 result->fill_in(thread, frame_size, chunk, reg_map);
a61af66fc99e Initial load
duke
parents:
diff changeset
486 return result;
a61af66fc99e Initial load
duke
parents:
diff changeset
487 }
a61af66fc99e Initial load
duke
parents:
diff changeset
488
a61af66fc99e Initial load
duke
parents:
diff changeset
489 void vframeArray::fill_in(JavaThread* thread,
a61af66fc99e Initial load
duke
parents:
diff changeset
490 int frame_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
491 GrowableArray<compiledVFrame*>* chunk,
a61af66fc99e Initial load
duke
parents:
diff changeset
492 const RegisterMap *reg_map) {
a61af66fc99e Initial load
duke
parents:
diff changeset
493 // Set owner first, it is used when adding monitor chunks
a61af66fc99e Initial load
duke
parents:
diff changeset
494
a61af66fc99e Initial load
duke
parents:
diff changeset
495 _frame_size = frame_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
496 for(int i = 0; i < chunk->length(); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
497 element(i)->fill_in(chunk->at(i));
a61af66fc99e Initial load
duke
parents:
diff changeset
498 }
a61af66fc99e Initial load
duke
parents:
diff changeset
499
a61af66fc99e Initial load
duke
parents:
diff changeset
500 // Copy registers for callee-saved registers
a61af66fc99e Initial load
duke
parents:
diff changeset
501 if (reg_map != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
502 for(int i = 0; i < RegisterMap::reg_count; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
503 #ifdef AMD64
a61af66fc99e Initial load
duke
parents:
diff changeset
504 // The register map has one entry for every int (32-bit value), so
a61af66fc99e Initial load
duke
parents:
diff changeset
505 // 64-bit physical registers have two entries in the map, one for
a61af66fc99e Initial load
duke
parents:
diff changeset
506 // each half. Ignore the high halves of 64-bit registers, just like
a61af66fc99e Initial load
duke
parents:
diff changeset
507 // frame::oopmapreg_to_location does.
a61af66fc99e Initial load
duke
parents:
diff changeset
508 //
a61af66fc99e Initial load
duke
parents:
diff changeset
509 // [phh] FIXME: this is a temporary hack! This code *should* work
a61af66fc99e Initial load
duke
parents:
diff changeset
510 // correctly w/o this hack, possibly by changing RegisterMap::pd_location
a61af66fc99e Initial load
duke
parents:
diff changeset
511 // in frame_amd64.cpp and the values of the phantom high half registers
a61af66fc99e Initial load
duke
parents:
diff changeset
512 // in amd64.ad.
a61af66fc99e Initial load
duke
parents:
diff changeset
513 // if (VMReg::Name(i) < SharedInfo::stack0 && is_even(i)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
514 intptr_t* src = (intptr_t*) reg_map->location(VMRegImpl::as_VMReg(i));
a61af66fc99e Initial load
duke
parents:
diff changeset
515 _callee_registers[i] = src != NULL ? *src : NULL_WORD;
a61af66fc99e Initial load
duke
parents:
diff changeset
516 // } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
517 // jint* src = (jint*) reg_map->location(VMReg::Name(i));
a61af66fc99e Initial load
duke
parents:
diff changeset
518 // _callee_registers[i] = src != NULL ? *src : NULL_WORD;
a61af66fc99e Initial load
duke
parents:
diff changeset
519 // }
a61af66fc99e Initial load
duke
parents:
diff changeset
520 #else
a61af66fc99e Initial load
duke
parents:
diff changeset
521 jint* src = (jint*) reg_map->location(VMRegImpl::as_VMReg(i));
a61af66fc99e Initial load
duke
parents:
diff changeset
522 _callee_registers[i] = src != NULL ? *src : NULL_WORD;
a61af66fc99e Initial load
duke
parents:
diff changeset
523 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
524 if (src == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
525 set_location_valid(i, false);
a61af66fc99e Initial load
duke
parents:
diff changeset
526 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
527 set_location_valid(i, true);
a61af66fc99e Initial load
duke
parents:
diff changeset
528 jint* dst = (jint*) register_location(i);
a61af66fc99e Initial load
duke
parents:
diff changeset
529 *dst = *src;
a61af66fc99e Initial load
duke
parents:
diff changeset
530 }
a61af66fc99e Initial load
duke
parents:
diff changeset
531 }
a61af66fc99e Initial load
duke
parents:
diff changeset
532 }
a61af66fc99e Initial load
duke
parents:
diff changeset
533 }
a61af66fc99e Initial load
duke
parents:
diff changeset
534
a61af66fc99e Initial load
duke
parents:
diff changeset
535 void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode) {
a61af66fc99e Initial load
duke
parents:
diff changeset
536 // stack picture
a61af66fc99e Initial load
duke
parents:
diff changeset
537 // unpack_frame
a61af66fc99e Initial load
duke
parents:
diff changeset
538 // [new interpreter frames ] (frames are skeletal but walkable)
a61af66fc99e Initial load
duke
parents:
diff changeset
539 // caller_frame
a61af66fc99e Initial load
duke
parents:
diff changeset
540 //
a61af66fc99e Initial load
duke
parents:
diff changeset
541 // This routine fills in the missing data for the skeletal interpreter frames
a61af66fc99e Initial load
duke
parents:
diff changeset
542 // in the above picture.
a61af66fc99e Initial load
duke
parents:
diff changeset
543
a61af66fc99e Initial load
duke
parents:
diff changeset
544 // Find the skeletal interpreter frames to unpack into
a61af66fc99e Initial load
duke
parents:
diff changeset
545 RegisterMap map(JavaThread::current(), false);
a61af66fc99e Initial load
duke
parents:
diff changeset
546 // Get the youngest frame we will unpack (last to be unpacked)
a61af66fc99e Initial load
duke
parents:
diff changeset
547 frame me = unpack_frame.sender(&map);
a61af66fc99e Initial load
duke
parents:
diff changeset
548 int index;
a61af66fc99e Initial load
duke
parents:
diff changeset
549 for (index = 0; index < frames(); index++ ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
550 *element(index)->iframe() = me;
a61af66fc99e Initial load
duke
parents:
diff changeset
551 // Get the caller frame (possibly skeletal)
a61af66fc99e Initial load
duke
parents:
diff changeset
552 me = me.sender(&map);
a61af66fc99e Initial load
duke
parents:
diff changeset
553 }
a61af66fc99e Initial load
duke
parents:
diff changeset
554
a61af66fc99e Initial load
duke
parents:
diff changeset
555 frame caller_frame = me;
a61af66fc99e Initial load
duke
parents:
diff changeset
556
a61af66fc99e Initial load
duke
parents:
diff changeset
557 // Do the unpacking of interpreter frames; the frame at index 0 represents the top activation, so it has no callee
a61af66fc99e Initial load
duke
parents:
diff changeset
558
a61af66fc99e Initial load
duke
parents:
diff changeset
559 // Unpack the frames from the oldest (frames() -1) to the youngest (0)
a61af66fc99e Initial load
duke
parents:
diff changeset
560
a61af66fc99e Initial load
duke
parents:
diff changeset
561 for (index = frames() - 1; index >= 0 ; index--) {
a61af66fc99e Initial load
duke
parents:
diff changeset
562 int callee_parameters = index == 0 ? 0 : element(index-1)->method()->size_of_parameters();
a61af66fc99e Initial load
duke
parents:
diff changeset
563 int callee_locals = index == 0 ? 0 : element(index-1)->method()->max_locals();
a61af66fc99e Initial load
duke
parents:
diff changeset
564 element(index)->unpack_on_stack(callee_parameters,
a61af66fc99e Initial load
duke
parents:
diff changeset
565 callee_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
566 &caller_frame,
a61af66fc99e Initial load
duke
parents:
diff changeset
567 index == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
568 exec_mode);
a61af66fc99e Initial load
duke
parents:
diff changeset
569 if (index == frames() - 1) {
a61af66fc99e Initial load
duke
parents:
diff changeset
570 Deoptimization::unwind_callee_save_values(element(index)->iframe(), this);
a61af66fc99e Initial load
duke
parents:
diff changeset
571 }
a61af66fc99e Initial load
duke
parents:
diff changeset
572 caller_frame = *element(index)->iframe();
a61af66fc99e Initial load
duke
parents:
diff changeset
573 }
a61af66fc99e Initial load
duke
parents:
diff changeset
574
a61af66fc99e Initial load
duke
parents:
diff changeset
575
a61af66fc99e Initial load
duke
parents:
diff changeset
576 deallocate_monitor_chunks();
a61af66fc99e Initial load
duke
parents:
diff changeset
577 }
a61af66fc99e Initial load
duke
parents:
diff changeset
578
a61af66fc99e Initial load
duke
parents:
diff changeset
579 void vframeArray::deallocate_monitor_chunks() {
a61af66fc99e Initial load
duke
parents:
diff changeset
580 JavaThread* jt = JavaThread::current();
a61af66fc99e Initial load
duke
parents:
diff changeset
581 for (int index = 0; index < frames(); index++ ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
582 element(index)->free_monitors(jt);
a61af66fc99e Initial load
duke
parents:
diff changeset
583 }
a61af66fc99e Initial load
duke
parents:
diff changeset
584 }
a61af66fc99e Initial load
duke
parents:
diff changeset
585
a61af66fc99e Initial load
duke
parents:
diff changeset
586 #ifndef PRODUCT
a61af66fc99e Initial load
duke
parents:
diff changeset
587
a61af66fc99e Initial load
duke
parents:
diff changeset
588 bool vframeArray::structural_compare(JavaThread* thread, GrowableArray<compiledVFrame*>* chunk) {
a61af66fc99e Initial load
duke
parents:
diff changeset
589 if (owner_thread() != thread) return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
590 int index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
591 #if 0 // FIXME can't do this comparison
a61af66fc99e Initial load
duke
parents:
diff changeset
592
a61af66fc99e Initial load
duke
parents:
diff changeset
593 // Compare only within vframe array.
a61af66fc99e Initial load
duke
parents:
diff changeset
594 for (deoptimizedVFrame* vf = deoptimizedVFrame::cast(vframe_at(first_index())); vf; vf = vf->deoptimized_sender_or_null()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
595 if (index >= chunk->length() || !vf->structural_compare(chunk->at(index))) return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
596 index++;
a61af66fc99e Initial load
duke
parents:
diff changeset
597 }
a61af66fc99e Initial load
duke
parents:
diff changeset
598 if (index != chunk->length()) return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
599 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
600
a61af66fc99e Initial load
duke
parents:
diff changeset
601 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
602 }
a61af66fc99e Initial load
duke
parents:
diff changeset
603
a61af66fc99e Initial load
duke
parents:
diff changeset
604 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
605
a61af66fc99e Initial load
duke
parents:
diff changeset
606 address vframeArray::register_location(int i) const {
a61af66fc99e Initial load
duke
parents:
diff changeset
607 assert(0 <= i && i < RegisterMap::reg_count, "index out of bounds");
a61af66fc99e Initial load
duke
parents:
diff changeset
608 return (address) & _callee_registers[i];
a61af66fc99e Initial load
duke
parents:
diff changeset
609 }
a61af66fc99e Initial load
duke
parents:
diff changeset
610
a61af66fc99e Initial load
duke
parents:
diff changeset
611
a61af66fc99e Initial load
duke
parents:
diff changeset
612 #ifndef PRODUCT
a61af66fc99e Initial load
duke
parents:
diff changeset
613
a61af66fc99e Initial load
duke
parents:
diff changeset
614 // Printing
a61af66fc99e Initial load
duke
parents:
diff changeset
615
a61af66fc99e Initial load
duke
parents:
diff changeset
616 // Note: we cannot have print_on as const, as we allocate inside the method
a61af66fc99e Initial load
duke
parents:
diff changeset
617 void vframeArray::print_on_2(outputStream* st) {
a61af66fc99e Initial load
duke
parents:
diff changeset
618 st->print_cr(" - sp: " INTPTR_FORMAT, sp());
a61af66fc99e Initial load
duke
parents:
diff changeset
619 st->print(" - thread: ");
a61af66fc99e Initial load
duke
parents:
diff changeset
620 Thread::current()->print();
a61af66fc99e Initial load
duke
parents:
diff changeset
621 st->print_cr(" - frame size: %d", frame_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
622 for (int index = 0; index < frames() ; index++ ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
623 element(index)->print(st);
a61af66fc99e Initial load
duke
parents:
diff changeset
624 }
a61af66fc99e Initial load
duke
parents:
diff changeset
625 }
a61af66fc99e Initial load
duke
parents:
diff changeset
626
a61af66fc99e Initial load
duke
parents:
diff changeset
627 void vframeArrayElement::print(outputStream* st) {
1255
e3a4305c6bc3 6925249: assert(last_sp < (intptr_t*) interpreter_frame_monitor_begin(),"bad tos")
kvn
parents: 903
diff changeset
628 st->print_cr(" - interpreter_frame -> sp: " INTPTR_FORMAT, iframe()->sp());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
629 }
a61af66fc99e Initial load
duke
parents:
diff changeset
630
a61af66fc99e Initial load
duke
parents:
diff changeset
631 void vframeArray::print_value_on(outputStream* st) const {
a61af66fc99e Initial load
duke
parents:
diff changeset
632 st->print_cr("vframeArray [%d] ", frames());
a61af66fc99e Initial load
duke
parents:
diff changeset
633 }
a61af66fc99e Initial load
duke
parents:
diff changeset
634
a61af66fc99e Initial load
duke
parents:
diff changeset
635
a61af66fc99e Initial load
duke
parents:
diff changeset
636 #endif