Mercurial > hg > truffle
annotate src/cpu/x86/vm/frame_x86.cpp @ 8803:a649f6511c04
8010084: Race in runtime/NMT/BaselineWithParameter.java
Summary: Added a waitFor() on the process
Reviewed-by: mgerdin, sla, zgu
author | ctornqvi |
---|---|
date | Wed, 20 Mar 2013 08:17:55 +0100 |
parents | 47bc9800972c |
children | b9a918201d47 f2110083203d |
rev | line source |
---|---|
0 | 1 /* |
4806
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1513
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1513
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:
1513
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
26 #include "interpreter/interpreter.hpp" | |
27 #include "memory/resourceArea.hpp" | |
28 #include "oops/markOop.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
29 #include "oops/method.hpp" |
1972 | 30 #include "oops/oop.inline.hpp" |
4868 | 31 #include "prims/methodHandles.hpp" |
1972 | 32 #include "runtime/frame.inline.hpp" |
33 #include "runtime/handles.inline.hpp" | |
34 #include "runtime/javaCalls.hpp" | |
35 #include "runtime/monitorChunk.hpp" | |
36 #include "runtime/signature.hpp" | |
37 #include "runtime/stubCodeGenerator.hpp" | |
38 #include "runtime/stubRoutines.hpp" | |
39 #include "vmreg_x86.inline.hpp" | |
40 #ifdef COMPILER1 | |
41 #include "c1/c1_Runtime1.hpp" | |
42 #include "runtime/vframeArray.hpp" | |
43 #endif | |
0 | 44 |
45 #ifdef ASSERT | |
46 void RegisterMap::check_location_valid() { | |
47 } | |
48 #endif | |
49 | |
50 | |
51 // Profiling/safepoint support | |
52 | |
53 bool frame::safe_for_sender(JavaThread *thread) { | |
54 address sp = (address)_sp; | |
55 address fp = (address)_fp; | |
56 address unextended_sp = (address)_unextended_sp; | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
57 // sp must be within the stack |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
58 bool sp_safe = (sp <= thread->stack_base()) && |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
59 (sp >= thread->stack_base() - thread->stack_size()); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
60 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
61 if (!sp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
62 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
63 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
64 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
65 // unextended sp must be within the stack and above or equal sp |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
66 bool unextended_sp_safe = (unextended_sp <= thread->stack_base()) && |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
67 (unextended_sp >= sp); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
68 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
69 if (!unextended_sp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
70 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
71 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
72 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
73 // an fp must be within the stack and above (but not equal) sp |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
74 bool fp_safe = (fp <= thread->stack_base()) && (fp > sp); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
75 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
76 // We know sp/unextended_sp are safe only fp is questionable here |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
77 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
78 // If the current frame is known to the code cache then we can attempt to |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
79 // to construct the sender and do some validation of it. This goes a long way |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
80 // toward eliminating issues when we get in frame construction code |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
81 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
82 if (_cb != NULL ) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
83 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
84 // First check if frame is complete and tester is reliable |
0 | 85 // Unfortunately we can only check frame complete for runtime stubs and nmethod |
86 // other generic buffer blobs are more problematic so we just assume they are | |
87 // ok. adapter blobs never have a frame complete and are never ok. | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
88 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
89 if (!_cb->is_frame_complete_at(_pc)) { |
0 | 90 if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) { |
91 return false; | |
92 } | |
93 } | |
8106
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
94 |
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
95 // Could just be some random pointer within the codeBlob |
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
96 if (!_cb->code_contains(_pc)) { |
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
97 return false; |
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
98 } |
ec2eddfed950
8008340: [sampling] assert(upper->pc_offset() >= pc_offset) failed: sanity
rbackman
parents:
7176
diff
changeset
|
99 |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
100 // Entry frame checks |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
101 if (is_entry_frame()) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
102 // an entry frame must have a valid fp. |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
103 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
104 if (!fp_safe) return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
105 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
106 // Validate the JavaCallWrapper an entry frame must have |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
107 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
108 address jcw = (address)entry_frame_call_wrapper(); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
109 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
110 bool jcw_safe = (jcw <= thread->stack_base()) && ( jcw > fp); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
111 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
112 return jcw_safe; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
113 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
114 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
115 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
116 intptr_t* sender_sp = NULL; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
117 address sender_pc = NULL; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
118 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
119 if (is_interpreted_frame()) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
120 // fp must be safe |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
121 if (!fp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
122 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
123 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
124 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
125 sender_pc = (address) this->fp()[return_addr_offset]; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
126 sender_sp = (intptr_t*) addr_at(sender_sp_offset); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
127 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
128 } else { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
129 // must be some sort of compiled/runtime frame |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
130 // fp does not have to be safe (although it could be check for c1?) |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
131 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
132 sender_sp = _unextended_sp + _cb->frame_size(); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
133 // On Intel the return_address is always the word on the stack |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
134 sender_pc = (address) *(sender_sp-1); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
135 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
136 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
137 // We must always be able to find a recognizable pc |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
138 CodeBlob* sender_blob = CodeCache::find_blob_unsafe(sender_pc); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
139 if (sender_pc == NULL || sender_blob == NULL) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
140 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
141 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
142 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
143 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
144 // If the potential sender is the interpreter then we can do some more checking |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
145 if (Interpreter::contains(sender_pc)) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
146 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
147 // ebp is always saved in a recognizable place in any code we generate. However |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
148 // only if the sender is interpreted/call_stub (c1 too?) are we certain that the saved ebp |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
149 // is really a frame pointer. |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
150 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
151 intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
152 bool saved_fp_safe = ((address)saved_fp <= thread->stack_base()) && (saved_fp > sender_sp); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
153 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
154 if (!saved_fp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
155 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
156 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
157 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
158 // construct the potential sender |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
159 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
160 frame sender(sender_sp, saved_fp, sender_pc); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
161 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
162 return sender.is_interpreted_frame_valid(thread); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
163 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
164 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
165 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
166 // Could just be some random pointer within the codeBlob |
1748 | 167 if (!sender_blob->code_contains(sender_pc)) { |
168 return false; | |
169 } | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
170 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
171 // We should never be able to see an adapter if the current frame is something from code cache |
1748 | 172 if (sender_blob->is_adapter_blob()) { |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
173 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
174 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
175 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
176 // Could be the call_stub |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
177 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
178 if (StubRoutines::returns_to_call_stub(sender_pc)) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
179 intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
180 bool saved_fp_safe = ((address)saved_fp <= thread->stack_base()) && (saved_fp > sender_sp); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
181 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
182 if (!saved_fp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
183 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
184 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
185 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
186 // construct the potential sender |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
187 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
188 frame sender(sender_sp, saved_fp, sender_pc); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
189 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
190 // Validate the JavaCallWrapper an entry frame must have |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
191 address jcw = (address)sender.entry_frame_call_wrapper(); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
192 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
193 bool jcw_safe = (jcw <= thread->stack_base()) && ( jcw > (address)sender.fp()); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
194 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
195 return jcw_safe; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
196 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
197 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
198 // If the frame size is 0 something is bad because every nmethod has a non-zero frame size |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
199 // because the return address counts against the callee's frame. |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
200 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
201 if (sender_blob->frame_size() == 0) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
202 assert(!sender_blob->is_nmethod(), "should count return address at least"); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
203 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
204 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
205 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
206 // We should never be able to see anything here except an nmethod. If something in the |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
207 // code cache (current frame) is called by an entity within the code cache that entity |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
208 // should not be anything but the call stub (already covered), the interpreter (already covered) |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
209 // or an nmethod. |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
210 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
211 assert(sender_blob->is_nmethod(), "Impossible call chain"); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
212 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
213 // Could put some more validation for the potential non-interpreted sender |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
214 // frame we'd create by calling sender if I could think of any. Wait for next crash in forte... |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
215 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
216 // One idea is seeing if the sender_pc we have is one that we'd expect to call to current cb |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
217 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
218 // We've validated the potential sender that would be created |
0 | 219 return true; |
220 } | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
221 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
222 // Must be native-compiled frame. Since sender will try and use fp to find |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
223 // linkages it must be safe |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
224 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
225 if (!fp_safe) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
226 return false; |
0 | 227 } |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
228 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
229 // Will the pc we fetch be non-zero (which we'll find at the oldest frame) |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
230 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
231 if ( (address) this->fp()[return_addr_offset] == NULL) return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
232 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
233 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
234 // could try and do some more potential verification of native frame if we could think of some... |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
235 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
236 return true; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
237 |
0 | 238 } |
239 | |
240 | |
241 void frame::patch_pc(Thread* thread, address pc) { | |
4000
0abefdb54d21
7081938: JSR292: assert(magic_number_2() == MAGIC_NUMBER_2) failed
twisti
parents:
3931
diff
changeset
|
242 address* pc_addr = &(((address*) sp())[-1]); |
0 | 243 if (TracePcPatching) { |
4056
448691f285a5
7106944: assert(_pc == *pc_addr) failed may be too strong
twisti
parents:
4000
diff
changeset
|
244 tty->print_cr("patch_pc at address " INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "]", |
4000
0abefdb54d21
7081938: JSR292: assert(magic_number_2() == MAGIC_NUMBER_2) failed
twisti
parents:
3931
diff
changeset
|
245 pc_addr, *pc_addr, pc); |
0 | 246 } |
4056
448691f285a5
7106944: assert(_pc == *pc_addr) failed may be too strong
twisti
parents:
4000
diff
changeset
|
247 // Either the return address is the original one or we are going to |
448691f285a5
7106944: assert(_pc == *pc_addr) failed may be too strong
twisti
parents:
4000
diff
changeset
|
248 // patch in the same address that's already there. |
448691f285a5
7106944: assert(_pc == *pc_addr) failed may be too strong
twisti
parents:
4000
diff
changeset
|
249 assert(_pc == *pc_addr || pc == *pc_addr, "must be"); |
4000
0abefdb54d21
7081938: JSR292: assert(magic_number_2() == MAGIC_NUMBER_2) failed
twisti
parents:
3931
diff
changeset
|
250 *pc_addr = pc; |
0 | 251 _cb = CodeCache::find_blob(pc); |
1204 | 252 address original_pc = nmethod::get_deopt_original_pc(this); |
253 if (original_pc != NULL) { | |
254 assert(original_pc == _pc, "expected original PC to be stored before patching"); | |
0 | 255 _deopt_state = is_deoptimized; |
256 // leave _pc as is | |
257 } else { | |
258 _deopt_state = not_deoptimized; | |
259 _pc = pc; | |
260 } | |
261 } | |
262 | |
263 bool frame::is_interpreted_frame() const { | |
264 return Interpreter::contains(pc()); | |
265 } | |
266 | |
793
eacd97c88873
6848466: frame::frame_size() assertion failure with -XX:+DebugDeoptimization
cfang
parents:
304
diff
changeset
|
267 int frame::frame_size(RegisterMap* map) const { |
eacd97c88873
6848466: frame::frame_size() assertion failure with -XX:+DebugDeoptimization
cfang
parents:
304
diff
changeset
|
268 frame sender = this->sender(map); |
0 | 269 return sender.sp() - sp(); |
270 } | |
271 | |
272 intptr_t* frame::entry_frame_argument_at(int offset) const { | |
273 // convert offset to index to deal with tsi | |
274 int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize); | |
275 // Entry frame's arguments are always in relation to unextended_sp() | |
276 return &unextended_sp()[index]; | |
277 } | |
278 | |
279 // sender_sp | |
280 #ifdef CC_INTERP | |
281 intptr_t* frame::interpreter_frame_sender_sp() const { | |
282 assert(is_interpreted_frame(), "interpreted frame expected"); | |
283 // QQQ why does this specialize method exist if frame::sender_sp() does same thing? | |
284 // seems odd and if we always know interpreted vs. non then sender_sp() is really | |
285 // doing too much work. | |
286 return get_interpreterState()->sender_sp(); | |
287 } | |
288 | |
289 // monitor elements | |
290 | |
291 BasicObjectLock* frame::interpreter_frame_monitor_begin() const { | |
292 return get_interpreterState()->monitor_base(); | |
293 } | |
294 | |
295 BasicObjectLock* frame::interpreter_frame_monitor_end() const { | |
296 return (BasicObjectLock*) get_interpreterState()->stack_base(); | |
297 } | |
298 | |
299 #else // CC_INTERP | |
300 | |
301 intptr_t* frame::interpreter_frame_sender_sp() const { | |
302 assert(is_interpreted_frame(), "interpreted frame expected"); | |
303 return (intptr_t*) at(interpreter_frame_sender_sp_offset); | |
304 } | |
305 | |
306 void frame::set_interpreter_frame_sender_sp(intptr_t* sender_sp) { | |
307 assert(is_interpreted_frame(), "interpreted frame expected"); | |
308 ptr_at_put(interpreter_frame_sender_sp_offset, (intptr_t) sender_sp); | |
309 } | |
310 | |
311 | |
312 // monitor elements | |
313 | |
314 BasicObjectLock* frame::interpreter_frame_monitor_begin() const { | |
315 return (BasicObjectLock*) addr_at(interpreter_frame_monitor_block_bottom_offset); | |
316 } | |
317 | |
318 BasicObjectLock* frame::interpreter_frame_monitor_end() const { | |
319 BasicObjectLock* result = (BasicObjectLock*) *addr_at(interpreter_frame_monitor_block_top_offset); | |
320 // make sure the pointer points inside the frame | |
1488
615a9d95d265
6946056: assert((intptr_t) sp()<=(intptr_t) result,"result must>=than stack pointer"), frame_x86.cpp:295
johnc
parents:
1204
diff
changeset
|
321 assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer"); |
615a9d95d265
6946056: assert((intptr_t) sp()<=(intptr_t) result,"result must>=than stack pointer"), frame_x86.cpp:295
johnc
parents:
1204
diff
changeset
|
322 assert((intptr_t*) result < fp(), "monitor end should be strictly below the frame pointer"); |
0 | 323 return result; |
324 } | |
325 | |
326 void frame::interpreter_frame_set_monitor_end(BasicObjectLock* value) { | |
327 *((BasicObjectLock**)addr_at(interpreter_frame_monitor_block_top_offset)) = value; | |
328 } | |
329 | |
330 // Used by template based interpreter deoptimization | |
331 void frame::interpreter_frame_set_last_sp(intptr_t* sp) { | |
332 *((intptr_t**)addr_at(interpreter_frame_last_sp_offset)) = sp; | |
333 } | |
334 #endif // CC_INTERP | |
335 | |
336 frame frame::sender_for_entry_frame(RegisterMap* map) const { | |
337 assert(map != NULL, "map must be set"); | |
338 // Java frame called from C; skip all C frames and return top C | |
339 // frame of that chunk as the sender | |
340 JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor(); | |
341 assert(!entry_frame_is_first(), "next Java fp must be non zero"); | |
342 assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack"); | |
343 map->clear(); | |
344 assert(map->include_argument_oops(), "should be set by clear"); | |
345 if (jfa->last_Java_pc() != NULL ) { | |
346 frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc()); | |
347 return fr; | |
348 } | |
349 frame fr(jfa->last_Java_sp(), jfa->last_Java_fp()); | |
350 return fr; | |
351 } | |
352 | |
1204 | 353 //------------------------------------------------------------------------------ |
354 // frame::verify_deopt_original_pc | |
355 // | |
356 // Verifies the calculated original PC of a deoptimization PC for the | |
357 // given unextended SP. The unextended SP might also be the saved SP | |
358 // for MethodHandle call sites. | |
8721 | 359 #ifdef ASSERT |
1204 | 360 void frame::verify_deopt_original_pc(nmethod* nm, intptr_t* unextended_sp, bool is_method_handle_return) { |
361 frame fr; | |
362 | |
363 // This is ugly but it's better than to change {get,set}_original_pc | |
364 // to take an SP value as argument. And it's only a debugging | |
365 // method anyway. | |
366 fr._unextended_sp = unextended_sp; | |
367 | |
368 address original_pc = nm->get_original_pc(&fr); | |
1748 | 369 assert(nm->insts_contains(original_pc), "original PC must be in nmethod"); |
1204 | 370 assert(nm->is_method_handle_return(original_pc) == is_method_handle_return, "must be"); |
371 } | |
372 #endif | |
373 | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
374 //------------------------------------------------------------------------------ |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
375 // frame::adjust_unextended_sp |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
376 void frame::adjust_unextended_sp() { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
377 // If we are returning to a compiled MethodHandle call site, the |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
378 // saved_fp will in fact be a saved value of the unextended SP. The |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
379 // simplest way to tell whether we are returning to such a call site |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
380 // is as follows: |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
381 |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
382 nmethod* sender_nm = (_cb == NULL) ? NULL : _cb->as_nmethod_or_null(); |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
383 if (sender_nm != NULL) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
384 // If the sender PC is a deoptimization point, get the original |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
385 // PC. For MethodHandle call site the unextended_sp is stored in |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
386 // saved_fp. |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
387 if (sender_nm->is_deopt_mh_entry(_pc)) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
388 DEBUG_ONLY(verify_deopt_mh_original_pc(sender_nm, _fp)); |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
389 _unextended_sp = _fp; |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
390 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
391 else if (sender_nm->is_deopt_entry(_pc)) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
392 DEBUG_ONLY(verify_deopt_original_pc(sender_nm, _unextended_sp)); |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
393 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
394 else if (sender_nm->is_method_handle_return(_pc)) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
395 _unextended_sp = _fp; |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
396 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
397 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
398 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
399 |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
400 //------------------------------------------------------------------------------ |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
401 // frame::update_map_with_saved_link |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
402 void frame::update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
403 // The interpreter and compiler(s) always save EBP/RBP in a known |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
404 // location on entry. We must record where that location is |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
405 // so this if EBP/RBP was live on callout from c2 we can find |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
406 // the saved copy no matter what it called. |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
407 |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
408 // Since the interpreter always saves EBP/RBP if we record where it is then |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
409 // we don't have to always save EBP/RBP on entry and exit to c2 compiled |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
410 // code, on entry will be enough. |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
411 map->set_location(rbp->as_VMReg(), (address) link_addr); |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
412 #ifdef AMD64 |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
413 // this is weird "H" ought to be at a higher address however the |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
414 // oopMaps seems to have the "H" regs at the same address and the |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
415 // vanilla register. |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
416 // XXXX make this go away |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
417 if (true) { |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
418 map->set_location(rbp->as_VMReg()->next(), (address) link_addr); |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
419 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
420 #endif // AMD64 |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
421 } |
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
422 |
1204 | 423 |
424 //------------------------------------------------------------------------------ | |
425 // frame::sender_for_interpreter_frame | |
0 | 426 frame frame::sender_for_interpreter_frame(RegisterMap* map) const { |
1204 | 427 // SP is the raw SP from the sender after adapter or interpreter |
428 // extension. | |
429 intptr_t* sender_sp = this->sender_sp(); | |
0 | 430 |
431 // This is the sp before any possible extension (adapter/locals). | |
432 intptr_t* unextended_sp = interpreter_frame_sender_sp(); | |
433 | |
434 #ifdef COMPILER2 | |
435 if (map->update_map()) { | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
436 update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset)); |
0 | 437 } |
1204 | 438 #endif // COMPILER2 |
439 | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
440 return frame(sender_sp, unextended_sp, link(), sender_pc()); |
0 | 441 } |
442 | |
443 | |
1204 | 444 //------------------------------------------------------------------------------ |
445 // frame::sender_for_compiled_frame | |
0 | 446 frame frame::sender_for_compiled_frame(RegisterMap* map) const { |
447 assert(map != NULL, "map must be set"); | |
448 | |
449 // frame owned by optimizing compiler | |
450 assert(_cb->frame_size() >= 0, "must have non-zero frame size"); | |
1204 | 451 intptr_t* sender_sp = unextended_sp() + _cb->frame_size(); |
452 intptr_t* unextended_sp = sender_sp; | |
0 | 453 |
454 // On Intel the return_address is always the word on the stack | |
455 address sender_pc = (address) *(sender_sp-1); | |
456 | |
1204 | 457 // This is the saved value of EBP which may or may not really be an FP. |
458 // It is only an FP if the sender is an interpreter frame (or C1?). | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
459 intptr_t** saved_fp_addr = (intptr_t**) (sender_sp - frame::sender_sp_offset); |
1135
e66fd840cb6b
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164)
twisti
parents:
844
diff
changeset
|
460 |
0 | 461 if (map->update_map()) { |
462 // Tell GC to use argument oopmaps for some runtime stubs that need it. | |
463 // For C1, the runtime stub might not have oop maps, so set this flag | |
464 // outside of update_register_map. | |
465 map->set_include_argument_oops(_cb->caller_must_gc_arguments(map->thread())); | |
466 if (_cb->oop_maps() != NULL) { | |
467 OopMapSet::update_register_map(this, map); | |
468 } | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
469 |
1204 | 470 // Since the prolog does the save and restore of EBP there is no oopmap |
0 | 471 // for it so we must fill in its location as if there was an oopmap entry |
472 // since if our caller was compiled code there could be live jvm state in it. | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
473 update_map_with_saved_link(map, saved_fp_addr); |
0 | 474 } |
475 | |
476 assert(sender_sp != sp(), "must have changed"); | |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3336
diff
changeset
|
477 return frame(sender_sp, unextended_sp, *saved_fp_addr, sender_pc); |
0 | 478 } |
479 | |
1204 | 480 |
481 //------------------------------------------------------------------------------ | |
482 // frame::sender | |
0 | 483 frame frame::sender(RegisterMap* map) const { |
484 // Default is we done have to follow them. The sender_for_xxx will | |
485 // update it accordingly | |
486 map->set_include_argument_oops(false); | |
487 | |
488 if (is_entry_frame()) return sender_for_entry_frame(map); | |
489 if (is_interpreted_frame()) return sender_for_interpreter_frame(map); | |
490 assert(_cb == CodeCache::find_blob(pc()),"Must be the same"); | |
491 | |
492 if (_cb != NULL) { | |
493 return sender_for_compiled_frame(map); | |
494 } | |
495 // Must be native-compiled frame, i.e. the marshaling code for native | |
496 // methods that exists in the core system. | |
497 return frame(sender_sp(), link(), sender_pc()); | |
498 } | |
499 | |
500 | |
501 bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) { | |
502 assert(is_interpreted_frame(), "must be interpreter frame"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
503 Method* method = interpreter_frame_method(); |
0 | 504 // When unpacking an optimized frame the frame pointer is |
505 // adjusted with: | |
506 int diff = (method->max_locals() - method->size_of_parameters()) * | |
1506 | 507 Interpreter::stackElementWords; |
0 | 508 return _fp == (fp - diff); |
509 } | |
510 | |
511 void frame::pd_gc_epilog() { | |
512 // nothing done here now | |
513 } | |
514 | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
515 bool frame::is_interpreted_frame_valid(JavaThread* thread) const { |
0 | 516 // QQQ |
517 #ifdef CC_INTERP | |
518 #else | |
519 assert(is_interpreted_frame(), "Not an interpreted frame"); | |
520 // These are reasonable sanity checks | |
521 if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) { | |
522 return false; | |
523 } | |
524 if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) { | |
525 return false; | |
526 } | |
527 if (fp() + interpreter_frame_initial_sp_offset < sp()) { | |
528 return false; | |
529 } | |
530 // These are hacks to keep us out of trouble. | |
531 // The problem with these is that they mask other problems | |
532 if (fp() <= sp()) { // this attempts to deal with unsigned comparison above | |
533 return false; | |
534 } | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
535 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
536 // do some validation of frame elements |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
537 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
538 // first the method |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
539 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
540 Method* m = *interpreter_frame_method_addr(); |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
541 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
542 // validate the method we'd find in this potential sender |
7176
59c790074993
8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
coleenp
parents:
6725
diff
changeset
|
543 if (!m->is_valid_method()) return false; |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
544 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
545 // stack frames shouldn't be much larger than max_stack elements |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
546 |
1506 | 547 if (fp() - sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { |
0 | 548 return false; |
549 } | |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
550 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
551 // validate bci/bcx |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
552 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
553 intptr_t bcx = interpreter_frame_bcx(); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
554 if (m->validate_bci_from_bcx(bcx) < 0) { |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
555 return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
556 } |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
557 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
558 // validate ConstantPoolCache* |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
559 ConstantPoolCache* cp = *interpreter_frame_cache_addr(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
560 if (cp == NULL || !cp->is_metadata()) return false; |
107
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
561 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
562 // validate locals |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
563 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
564 address locals = (address) *interpreter_frame_locals_addr(); |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
565 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
566 if (locals > thread->stack_base() || locals < (address) fp()) return false; |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
567 |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
568 // We'd have to be pretty unlucky to be mislead at this point |
93b6525e3b82
6603919: Stackwalking crash on x86 -server with Sun Studio's collect -j on
sgoldman
parents:
0
diff
changeset
|
569 |
0 | 570 #endif // CC_INTERP |
571 return true; | |
572 } | |
573 | |
574 BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) { | |
575 #ifdef CC_INTERP | |
1681
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
576 // Needed for JVMTI. The result should always be in the |
126ea7725993
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
1552
diff
changeset
|
577 // interpreterState object |
0 | 578 interpreterState istate = get_interpreterState(); |
579 #endif // CC_INTERP | |
580 assert(is_interpreted_frame(), "interpreted frame expected"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
581 Method* method = interpreter_frame_method(); |
0 | 582 BasicType type = method->result_type(); |
583 | |
584 intptr_t* tos_addr; | |
585 if (method->is_native()) { | |
586 // Prior to calling into the runtime to report the method_exit the possible | |
587 // return value is pushed to the native stack. If the result is a jfloat/jdouble | |
588 // then ST0 is saved before EAX/EDX. See the note in generate_native_result | |
589 tos_addr = (intptr_t*)sp(); | |
590 if (type == T_FLOAT || type == T_DOUBLE) { | |
591 // QQQ seems like this code is equivalent on the two platforms | |
592 #ifdef AMD64 | |
593 // This is times two because we do a push(ltos) after pushing XMM0 | |
594 // and that takes two interpreter stack slots. | |
1506 | 595 tos_addr += 2 * Interpreter::stackElementWords; |
0 | 596 #else |
597 tos_addr += 2; | |
598 #endif // AMD64 | |
599 } | |
600 } else { | |
601 tos_addr = (intptr_t*)interpreter_frame_tos_address(); | |
602 } | |
603 | |
604 switch (type) { | |
605 case T_OBJECT : | |
606 case T_ARRAY : { | |
607 oop obj; | |
608 if (method->is_native()) { | |
609 #ifdef CC_INTERP | |
610 obj = istate->_oop_temp; | |
611 #else | |
612 obj = (oop) at(interpreter_frame_oop_temp_offset); | |
613 #endif // CC_INTERP | |
614 } else { | |
615 oop* obj_p = (oop*)tos_addr; | |
616 obj = (obj_p == NULL) ? (oop)NULL : *obj_p; | |
617 } | |
618 assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check"); | |
619 *oop_result = obj; | |
620 break; | |
621 } | |
622 case T_BOOLEAN : value_result->z = *(jboolean*)tos_addr; break; | |
623 case T_BYTE : value_result->b = *(jbyte*)tos_addr; break; | |
624 case T_CHAR : value_result->c = *(jchar*)tos_addr; break; | |
625 case T_SHORT : value_result->s = *(jshort*)tos_addr; break; | |
626 case T_INT : value_result->i = *(jint*)tos_addr; break; | |
627 case T_LONG : value_result->j = *(jlong*)tos_addr; break; | |
628 case T_FLOAT : { | |
629 #ifdef AMD64 | |
630 value_result->f = *(jfloat*)tos_addr; | |
631 #else | |
632 if (method->is_native()) { | |
633 jdouble d = *(jdouble*)tos_addr; // Result was in ST0 so need to convert to jfloat | |
634 value_result->f = (jfloat)d; | |
635 } else { | |
636 value_result->f = *(jfloat*)tos_addr; | |
637 } | |
638 #endif // AMD64 | |
639 break; | |
640 } | |
641 case T_DOUBLE : value_result->d = *(jdouble*)tos_addr; break; | |
642 case T_VOID : /* Nothing to do */ break; | |
643 default : ShouldNotReachHere(); | |
644 } | |
645 | |
646 return type; | |
647 } | |
648 | |
649 | |
650 intptr_t* frame::interpreter_frame_tos_at(jint offset) const { | |
651 int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize); | |
652 return &interpreter_frame_tos_address()[index]; | |
653 } | |
3336
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
654 |
4824
5dbed2f542ff
7120468: SPARC/x86: use frame::describe to enhance trace_method_handle
bdelsart
parents:
4818
diff
changeset
|
655 #ifndef PRODUCT |
3336
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
656 |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
657 #define DESCRIBE_FP_OFFSET(name) \ |
3365
3cfb240033d1
7043301: assert(locals < caller->fp() || locals > (caller->fp() + 16)) failed: locals in save area
never
parents:
3363
diff
changeset
|
658 values.describe(frame_no, fp() + frame::name##_offset, #name) |
3336
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
659 |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
660 void frame::describe_pd(FrameValues& values, int frame_no) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
4868
diff
changeset
|
661 if (is_interpreted_frame()) { |
3336
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
662 DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
663 DESCRIBE_FP_OFFSET(interpreter_frame_last_sp); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
664 DESCRIBE_FP_OFFSET(interpreter_frame_method); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
665 DESCRIBE_FP_OFFSET(interpreter_frame_mdx); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
666 DESCRIBE_FP_OFFSET(interpreter_frame_cache); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
667 DESCRIBE_FP_OFFSET(interpreter_frame_locals); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
668 DESCRIBE_FP_OFFSET(interpreter_frame_bcx); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
669 DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp); |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
670 } |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
671 } |
2e038ad0c1d0
7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
never
parents:
1972
diff
changeset
|
672 #endif |
3931
5432047c7db7
7087445: Improve platform independence of JSR292 shared code
bdelsart
parents:
3365
diff
changeset
|
673 |
5432047c7db7
7087445: Improve platform independence of JSR292 shared code
bdelsart
parents:
3365
diff
changeset
|
674 intptr_t *frame::initial_deoptimization_info() { |
5432047c7db7
7087445: Improve platform independence of JSR292 shared code
bdelsart
parents:
3365
diff
changeset
|
675 // used to reset the saved FP |
5432047c7db7
7087445: Improve platform independence of JSR292 shared code
bdelsart
parents:
3365
diff
changeset
|
676 return fp(); |
5432047c7db7
7087445: Improve platform independence of JSR292 shared code
bdelsart
parents:
3365
diff
changeset
|
677 } |
4806
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
678 |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
679 intptr_t* frame::real_fp() const { |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
680 if (_cb != NULL) { |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
681 // use the frame size if valid |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
682 int size = _cb->frame_size(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
4868
diff
changeset
|
683 if (size > 0) { |
4806
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
684 return unextended_sp() + size; |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
685 } |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
686 } |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
687 // else rely on fp() |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
688 assert(! is_compiled_frame(), "unknown compiled frame size"); |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
689 return fp(); |
eaa9557116a2
7120448: Fix FP values for compiled frames in frame::describe
bdelsart
parents:
4056
diff
changeset
|
690 } |