Mercurial > hg > truffle
annotate src/share/vm/graal/graalRuntime.cpp @ 17150:80d021f12b22
fix typo in graalRuntime.cpp
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Thu, 18 Sep 2014 18:56:52 +0200 |
parents | 2d6dd2eebd51 |
children | b8f54c5ec73a |
rev | line source |
---|---|
7221 | 1 /* |
2 * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. | |
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 * | |
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | |
20 * or visit www.oracle.com if you need additional information or have any | |
21 * questions. | |
22 */ | |
23 | |
24 #include "precompiled.hpp" | |
7735 | 25 #include "asm/codeBuffer.hpp" |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
26 #include "compiler/compileBroker.hpp" |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
27 #include "compiler/disassembler.hpp" |
7221 | 28 #include "graal/graalRuntime.hpp" |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
29 #include "graal/graalCompilerToVM.hpp" |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
30 #include "graal/graalCompiler.hpp" |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
31 #include "graal/graalJavaAccess.hpp" |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
32 #include "graal/graalEnv.hpp" |
7735 | 33 #include "memory/oopFactory.hpp" |
34 #include "prims/jvm.h" | |
7221 | 35 #include "runtime/biasedLocking.hpp" |
7735 | 36 #include "runtime/interfaceSupport.hpp" |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
37 #include "runtime/arguments.hpp" |
10542
554f67e4ff3f
Use slow-path stub call instead of deopt in lowering of DynamicNewArrayNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
10475
diff
changeset
|
38 #include "runtime/reflection.hpp" |
8499
96a337d307bd
-More progress in G1 WBs
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8496
diff
changeset
|
39 #include "utilities/debug.hpp" |
7221 | 40 |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
41 address GraalRuntime::_external_deopt_i2c_entry = NULL; |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
42 jobject GraalRuntime::_HotSpotGraalRuntime_instance = NULL; |
16683
4d0d1dc5db00
introduce extra field to record when HotSpotGraalRuntime has been initialized to avoid spurious errors during VM shutdown for short lived applications
Doug Simon <doug.simon@oracle.com>
parents:
16679
diff
changeset
|
43 bool GraalRuntime::_HotSpotGraalRuntime_initialized = false; |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
44 |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
45 void GraalRuntime::initialize_natives(JNIEnv *env, jclass c2vmClass) { |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
46 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end(); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
47 uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
48 AMD64_ONLY(guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)")); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
49 NOT_LP64(error("check TLAB allocation code for address space conflicts")); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
50 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
51 JavaThread* THREAD = JavaThread::current(); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
52 { |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
53 ThreadToNativeFromVM trans(THREAD); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
54 |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
55 ResourceMark rm; |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
56 HandleMark hm; |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
57 |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
58 graal_compute_offsets(); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
59 |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
60 #ifdef TARGET_ARCH_x86 |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
61 #ifdef _LP64 |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
62 // Only supported on x86_64 for now |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
63 _external_deopt_i2c_entry = create_external_deopt_i2c(); |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
64 #endif |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
65 #endif |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
66 |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
67 // Ensure _non_oop_bits is initialized |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
68 Universe::non_oop_word(); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
69 |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
70 env->RegisterNatives(c2vmClass, CompilerToVM_methods, CompilerToVM_methods_count()); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
71 } |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
72 if (HAS_PENDING_EXCEPTION) { |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
73 abort_on_pending_exception(PENDING_EXCEPTION, "Could not register natives"); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
74 } |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
75 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
76 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
77 BufferBlob* GraalRuntime::initialize_buffer_blob() { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
78 JavaThread* THREAD = JavaThread::current(); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
79 BufferBlob* buffer_blob = THREAD->get_buffer_blob(); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
80 if (buffer_blob == NULL) { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
81 buffer_blob = BufferBlob::create("Graal thread-local CodeBuffer", GraalNMethodSizeLimit); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
82 if (buffer_blob != NULL) { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
83 THREAD->set_buffer_blob(buffer_blob); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
84 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
85 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
86 return buffer_blob; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
87 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
88 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
89 address GraalRuntime::create_external_deopt_i2c() { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
90 ResourceMark rm; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
91 BufferBlob* buffer = BufferBlob::create("externalDeopt", 1*K); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
92 CodeBuffer cb(buffer); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
93 short buffer_locs[20]; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
94 cb.insts()->initialize_shared_locs((relocInfo*)buffer_locs, sizeof(buffer_locs)/sizeof(relocInfo)); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
95 MacroAssembler masm(&cb); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
96 |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
97 int total_args_passed = 6; |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
98 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
99 BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_args_passed); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
100 VMRegPair* regs = NEW_RESOURCE_ARRAY(VMRegPair, total_args_passed); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
101 int i = 0; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
102 sig_bt[i++] = T_INT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
103 sig_bt[i++] = T_LONG; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
104 sig_bt[i++] = T_VOID; // long stakes 2 slots |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
105 sig_bt[i++] = T_INT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
106 sig_bt[i++] = T_OBJECT; |
17150
80d021f12b22
fix typo in graalRuntime.cpp
Andreas Woess <andreas.woess@jku.at>
parents:
17033
diff
changeset
|
107 sig_bt[i++] = T_INT; // The number of actual arguments passed to the method. |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
108 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
109 int comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed, false); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
110 |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
111 SharedRuntime::gen_i2c_adapter(&masm, total_args_passed, comp_args_on_stack, sig_bt, regs, total_args_passed - 1); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
112 masm.flush(); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
113 |
17033
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
114 AdapterBlob* adapter = AdapterBlob::create(&cb); |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
115 if (PrintAdapterHandlers) { |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
116 tty->print_cr("Decoding external_deopt_i2c"); |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
117 Disassembler::decode(adapter->code_begin(), adapter->code_end()); |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
118 } |
2d6dd2eebd51
Fixed HSAIL deopt
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16887
diff
changeset
|
119 return adapter->code_begin(); |
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
120 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
121 |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
122 BasicType GraalRuntime::kindToBasicType(jchar ch) { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
123 switch(ch) { |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
124 case 'z': return T_BOOLEAN; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
125 case 'b': return T_BYTE; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
126 case 's': return T_SHORT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
127 case 'c': return T_CHAR; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
128 case 'i': return T_INT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
129 case 'f': return T_FLOAT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
130 case 'j': return T_LONG; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
131 case 'd': return T_DOUBLE; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
132 case 'a': return T_OBJECT; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
133 case '-': return T_ILLEGAL; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
134 default: |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
135 fatal(err_msg("unexpected Kind: %c", ch)); |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
136 break; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
137 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
138 return T_ILLEGAL; |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
139 } |
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
140 |
7221 | 141 // Simple helper to see if the caller of a runtime stub which |
142 // entered the VM has been deoptimized | |
143 | |
144 static bool caller_is_deopted() { | |
145 JavaThread* thread = JavaThread::current(); | |
146 RegisterMap reg_map(thread, false); | |
147 frame runtime_frame = thread->last_frame(); | |
148 frame caller_frame = runtime_frame.sender(®_map); | |
149 assert(caller_frame.is_compiled_frame(), "must be compiled"); | |
150 return caller_frame.is_deoptimized_frame(); | |
151 } | |
152 | |
153 // Stress deoptimization | |
154 static void deopt_caller() { | |
155 if ( !caller_is_deopted()) { | |
156 JavaThread* thread = JavaThread::current(); | |
157 RegisterMap reg_map(thread, false); | |
158 frame runtime_frame = thread->last_frame(); | |
159 frame caller_frame = runtime_frame.sender(®_map); | |
160 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); | |
161 assert(caller_is_deopted(), "Must be deoptimized"); | |
162 } | |
163 } | |
164 | |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
165 JRT_BLOCK_ENTRY(void, GraalRuntime::new_instance(JavaThread* thread, Klass* klass)) |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
166 JRT_BLOCK; |
7221 | 167 assert(klass->is_klass(), "not a class"); |
168 instanceKlassHandle h(thread, klass); | |
169 h->check_valid_for_instantiation(true, CHECK); | |
170 // make sure klass is initialized | |
171 h->initialize(CHECK); | |
172 // allocate instance and return via TLS | |
173 oop obj = h->allocate_instance(CHECK); | |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
174 thread->set_vm_result(obj); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
175 JRT_BLOCK_END; |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
176 |
12366
0991c12c4186
Defer barriers upon slow-path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10953
diff
changeset
|
177 if (GraalDeferredInitBarriers) { |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
178 new_store_pre_barrier(thread); |
12366
0991c12c4186
Defer barriers upon slow-path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10953
diff
changeset
|
179 } |
7221 | 180 JRT_END |
181 | |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
182 JRT_BLOCK_ENTRY(void, GraalRuntime::new_array(JavaThread* thread, Klass* array_klass, jint length)) |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
183 JRT_BLOCK; |
7221 | 184 // Note: no handle for klass needed since they are not used |
185 // anymore after new_objArray() and no GC can happen before. | |
186 // (This may have to change if this code changes!) | |
187 assert(array_klass->is_klass(), "not a class"); | |
188 oop obj; | |
189 if (array_klass->oop_is_typeArray()) { | |
190 BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type(); | |
191 obj = oopFactory::new_typeArray(elt_type, length, CHECK); | |
192 } else { | |
193 Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); | |
194 obj = oopFactory::new_objArray(elem_klass, length, CHECK); | |
195 } | |
196 thread->set_vm_result(obj); | |
197 // This is pretty rare but this runtime patch is stressful to deoptimization | |
198 // if we deoptimize here so force a deopt to stress the path. | |
199 if (DeoptimizeALot) { | |
9338
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
200 static int deopts = 0; |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
201 // Alternate between deoptimizing and raising an error (which will also cause a deopt) |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
202 if (deopts++ % 2 == 0) { |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
203 ResourceMark rm(THREAD); |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
204 THROW(vmSymbols::java_lang_OutOfMemoryError()); |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
205 } else { |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
206 deopt_caller(); |
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
207 } |
7221 | 208 } |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
209 JRT_BLOCK_END; |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
210 |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
211 if (GraalDeferredInitBarriers) { |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
212 new_store_pre_barrier(thread); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
213 } |
9338
0266549ff6e0
added support from compiled stubs to be installed as RuntimeStubs and to be able to directly call C/C++ runtime functions (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9232
diff
changeset
|
214 JRT_END |
7221 | 215 |
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
216 void GraalRuntime::new_store_pre_barrier(JavaThread* thread) { |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
217 // After any safepoint, just before going back to compiled code, |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
218 // we inform the GC that we will be doing initializing writes to |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
219 // this object in the future without emitting card-marks, so |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
220 // GC may take any compensating steps. |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
221 // NOTE: Keep this code consistent with GraphKit::store_barrier. |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
222 |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
223 oop new_obj = thread->vm_result(); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
224 if (new_obj == NULL) return; |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
225 |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
226 assert(Universe::heap()->can_elide_tlab_store_barriers(), |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
227 "compiler must check this first"); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
228 // GC may decide to give back a safer copy of new_obj. |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
229 new_obj = Universe::heap()->new_store_pre_barrier(thread, new_obj); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
230 thread->set_vm_result(new_obj); |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
231 } |
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
232 |
7221 | 233 JRT_ENTRY(void, GraalRuntime::new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims)) |
234 assert(klass->is_klass(), "not a class"); | |
235 assert(rank >= 1, "rank must be nonzero"); | |
236 oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); | |
237 thread->set_vm_result(obj); | |
238 JRT_END | |
239 | |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
240 JRT_ENTRY(void, GraalRuntime::dynamic_new_array(JavaThread* thread, oopDesc* element_mirror, jint length)) |
10542
554f67e4ff3f
Use slow-path stub call instead of deopt in lowering of DynamicNewArrayNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
10475
diff
changeset
|
241 oop obj = Reflection::reflect_new_array(element_mirror, length, CHECK); |
554f67e4ff3f
Use slow-path stub call instead of deopt in lowering of DynamicNewArrayNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
10475
diff
changeset
|
242 thread->set_vm_result(obj); |
554f67e4ff3f
Use slow-path stub call instead of deopt in lowering of DynamicNewArrayNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
10475
diff
changeset
|
243 JRT_END |
554f67e4ff3f
Use slow-path stub call instead of deopt in lowering of DynamicNewArrayNode.
Roland Schatz <roland.schatz@oracle.com>
parents:
10475
diff
changeset
|
244 |
13578
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
245 JRT_ENTRY(void, GraalRuntime::dynamic_new_instance(JavaThread* thread, oopDesc* type_mirror)) |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
246 instanceKlassHandle klass(THREAD, java_lang_Class::as_Klass(type_mirror)); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
247 |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
248 if (klass == NULL) { |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
249 ResourceMark rm(THREAD); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
250 THROW(vmSymbols::java_lang_InstantiationException()); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
251 } |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
252 |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
253 // Create new instance (the receiver) |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
254 klass->check_valid_for_instantiation(false, CHECK); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
255 |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
256 // Make sure klass gets initialized |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
257 klass->initialize(CHECK); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
258 |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
259 oop obj = klass->allocate_instance(CHECK); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
260 thread->set_vm_result(obj); |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
261 JRT_END |
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
262 |
7221 | 263 extern void vm_exit(int code); |
264 | |
265 // Enter this method from compiled code handler below. This is where we transition | |
266 // to VM mode. This is done as a helper routine so that the method called directly | |
267 // from compiled code does not have to transition to VM. This allows the entry | |
268 // method to see if the nmethod that we have just looked up a handler for has | |
269 // been deoptimized while we were in the vm. This simplifies the assembly code | |
270 // cpu directories. | |
271 // | |
272 // We are entering here from exception stub (via the entry method below) | |
273 // If there is a compiled exception handler in this method, we will continue there; | |
274 // otherwise we will unwind the stack and continue at the caller of top frame method | |
275 // Note: we enter in Java using a special JRT wrapper. This wrapper allows us to | |
276 // control the area where we can allow a safepoint. After we exit the safepoint area we can | |
277 // check to see if the handler we are going to return is now in a nmethod that has | |
278 // been deoptimized. If that is the case we return the deopt blob | |
279 // unpack_with_exception entry instead. This makes life for the exception blob easier | |
280 // because making that same check and diverting is painful from assembly language. | |
281 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm)) | |
282 // Reset method handle flag. | |
283 thread->set_is_method_handle_return(false); | |
284 | |
285 Handle exception(thread, ex); | |
286 nm = CodeCache::find_nmethod(pc); | |
287 assert(nm != NULL, "this is not an nmethod"); | |
288 // Adjust the pc as needed/ | |
289 if (nm->is_deopt_pc(pc)) { | |
290 RegisterMap map(thread, false); | |
291 frame exception_frame = thread->last_frame().sender(&map); | |
292 // if the frame isn't deopted then pc must not correspond to the caller of last_frame | |
293 assert(exception_frame.is_deoptimized_frame(), "must be deopted"); | |
294 pc = exception_frame.pc(); | |
295 } | |
296 #ifdef ASSERT | |
297 assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); | |
298 assert(exception->is_oop(), "just checking"); | |
299 // Check that exception is a subclass of Throwable, otherwise we have a VerifyError | |
300 if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { | |
301 if (ExitVMOnVerifyError) vm_exit(-1); | |
302 ShouldNotReachHere(); | |
303 } | |
304 #endif | |
305 | |
306 // Check the stack guard pages and reenable them if necessary and there is | |
307 // enough space on the stack to do so. Use fast exceptions only if the guard | |
308 // pages are enabled. | |
309 bool guard_pages_enabled = thread->stack_yellow_zone_enabled(); | |
310 if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack(); | |
311 | |
312 if (JvmtiExport::can_post_on_exceptions()) { | |
313 // To ensure correct notification of exception catches and throws | |
314 // we have to deoptimize here. If we attempted to notify the | |
315 // catches and throws during this exception lookup it's possible | |
316 // we could deoptimize on the way out of the VM and end back in | |
317 // the interpreter at the throw site. This would result in double | |
318 // notifications since the interpreter would also notify about | |
319 // these same catches and throws as it unwound the frame. | |
320 | |
321 RegisterMap reg_map(thread); | |
322 frame stub_frame = thread->last_frame(); | |
323 frame caller_frame = stub_frame.sender(®_map); | |
324 | |
325 // We don't really want to deoptimize the nmethod itself since we | |
326 // can actually continue in the exception handler ourselves but I | |
327 // don't see an easy way to have the desired effect. | |
328 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); | |
329 assert(caller_is_deopted(), "Must be deoptimized"); | |
330 | |
331 return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); | |
332 } | |
333 | |
334 // ExceptionCache is used only for exceptions at call sites and not for implicit exceptions | |
335 if (guard_pages_enabled) { | |
336 address fast_continuation = nm->handler_for_exception_and_pc(exception, pc); | |
337 if (fast_continuation != NULL) { | |
338 // Set flag if return address is a method handle call site. | |
339 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); | |
340 return fast_continuation; | |
341 } | |
342 } | |
343 | |
344 // If the stack guard pages are enabled, check whether there is a handler in | |
345 // the current method. Otherwise (guard pages disabled), force an unwind and | |
346 // skip the exception cache update (i.e., just leave continuation==NULL). | |
347 address continuation = NULL; | |
348 if (guard_pages_enabled) { | |
349 | |
350 // New exception handling mechanism can support inlined methods | |
351 // with exception handlers since the mappings are from PC to PC | |
352 | |
353 // debugging support | |
354 // tracing | |
355 if (TraceExceptions) { | |
356 ttyLocker ttyl; | |
357 ResourceMark rm; | |
358 int offset = pc - nm->code_begin(); | |
359 tty->print_cr("Exception <%s> (0x%x) thrown in compiled method <%s> at PC " PTR_FORMAT " [" PTR_FORMAT "+%d] for thread 0x%x", | |
360 exception->print_value_string(), (address)exception(), nm->method()->print_value_string(), pc, nm->code_begin(), offset, thread); | |
361 } | |
362 // for AbortVMOnException flag | |
363 NOT_PRODUCT(Exceptions::debug_check_abort(exception)); | |
364 | |
365 // Clear out the exception oop and pc since looking up an | |
366 // exception handler can cause class loading, which might throw an | |
367 // exception and those fields are expected to be clear during | |
368 // normal bytecode execution. | |
369 thread->set_exception_oop(NULL); | |
370 thread->set_exception_pc(NULL); | |
371 | |
372 continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false); | |
373 // If an exception was thrown during exception dispatch, the exception oop may have changed | |
374 thread->set_exception_oop(exception()); | |
375 thread->set_exception_pc(pc); | |
376 | |
377 // the exception cache is used only by non-implicit exceptions | |
378 if (continuation != NULL && !SharedRuntime::deopt_blob()->contains(continuation)) { | |
379 nm->add_handler_for_exception_and_pc(exception, pc, continuation); | |
380 } | |
381 } | |
382 | |
383 // Set flag if return address is a method handle call site. | |
384 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); | |
385 | |
386 if (TraceExceptions) { | |
387 ttyLocker ttyl; | |
388 ResourceMark rm; | |
389 tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT, | |
390 thread, continuation, pc); | |
391 } | |
392 | |
393 return continuation; | |
394 JRT_END | |
395 | |
396 // Enter this method from compiled code only if there is a Java exception handler | |
397 // in the method handling the exception. | |
398 // We are entering here from exception stub. We don't do a normal VM transition here. | |
399 // We do it in a helper. This is so we can check to see if the nmethod we have just | |
400 // searched for an exception handler has been deoptimized in the meantime. | |
401 address GraalRuntime::exception_handler_for_pc(JavaThread* thread) { | |
402 oop exception = thread->exception_oop(); | |
403 address pc = thread->exception_pc(); | |
404 // Still in Java mode | |
405 DEBUG_ONLY(ResetNoHandleMark rnhm); | |
406 nmethod* nm = NULL; | |
407 address continuation = NULL; | |
408 { | |
409 // Enter VM mode by calling the helper | |
410 ResetNoHandleMark rnhm; | |
411 continuation = exception_handler_for_pc_helper(thread, exception, pc, nm); | |
412 } | |
413 // Back in JAVA, use no oops DON'T safepoint | |
414 | |
415 // Now check to see if the nmethod we were called from is now deoptimized. | |
416 // If so we must return to the deopt blob and deoptimize the nmethod | |
417 if (nm != NULL && caller_is_deopted()) { | |
418 continuation = SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); | |
419 } | |
420 | |
421 assert(continuation != NULL, "no handler found"); | |
422 return continuation; | |
423 } | |
424 | |
7911
983f7bdb85ff
removed redundant graal_ prefix from Graal specific functions and variable in native code
Doug Simon <doug.simon@oracle.com>
parents:
7735
diff
changeset
|
425 JRT_ENTRY(void, GraalRuntime::create_null_exception(JavaThread* thread)) |
12668
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
426 SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_NullPointerException()); |
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
427 thread->set_vm_result(PENDING_EXCEPTION); |
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
428 CLEAR_PENDING_EXCEPTION; |
7221 | 429 JRT_END |
430 | |
7911
983f7bdb85ff
removed redundant graal_ prefix from Graal specific functions and variable in native code
Doug Simon <doug.simon@oracle.com>
parents:
7735
diff
changeset
|
431 JRT_ENTRY(void, GraalRuntime::create_out_of_bounds_exception(JavaThread* thread, jint index)) |
7221 | 432 char message[jintAsStringSize]; |
433 sprintf(message, "%d", index); | |
12668
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
434 SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message); |
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
435 thread->set_vm_result(PENDING_EXCEPTION); |
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
436 CLEAR_PENDING_EXCEPTION; |
7221 | 437 JRT_END |
438 | |
7911
983f7bdb85ff
removed redundant graal_ prefix from Graal specific functions and variable in native code
Doug Simon <doug.simon@oracle.com>
parents:
7735
diff
changeset
|
439 JRT_ENTRY_NO_ASYNC(void, GraalRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
7221 | 440 if (TraceGraal >= 3) { |
441 char type[O_BUFLEN]; | |
442 obj->klass()->name()->as_C_string(type, O_BUFLEN); | |
443 markOop mark = obj->mark(); | |
444 tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), obj, type, mark, lock); | |
445 tty->flush(); | |
446 } | |
447 #ifdef ASSERT | |
448 if (PrintBiasedLockingStatistics) { | |
449 Atomic::inc(BiasedLocking::slow_path_entry_count_addr()); | |
450 } | |
451 #endif | |
452 Handle h_obj(thread, obj); | |
453 assert(h_obj()->is_oop(), "must be NULL or an object"); | |
454 if (UseBiasedLocking) { | |
455 // Retry fast entry if bias is revoked to avoid unnecessary inflation | |
456 ObjectSynchronizer::fast_enter(h_obj, lock, true, CHECK); | |
457 } else { | |
7226 | 458 if (GraalUseFastLocking) { |
7221 | 459 // When using fast locking, the compiled code has already tried the fast case |
460 ObjectSynchronizer::slow_enter(h_obj, lock, THREAD); | |
461 } else { | |
462 ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD); | |
463 } | |
464 } | |
465 if (TraceGraal >= 3) { | |
466 tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), obj); | |
467 } | |
468 JRT_END | |
469 | |
7911
983f7bdb85ff
removed redundant graal_ prefix from Graal specific functions and variable in native code
Doug Simon <doug.simon@oracle.com>
parents:
7735
diff
changeset
|
470 JRT_LEAF(void, GraalRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
7221 | 471 assert(thread == JavaThread::current(), "threads must correspond"); |
472 assert(thread->last_Java_sp(), "last_Java_sp must be set"); | |
473 // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown | |
474 EXCEPTION_MARK; | |
475 | |
476 #ifdef DEBUG | |
477 if (!obj->is_oop()) { | |
478 ResetNoHandleMark rhm; | |
479 nmethod* method = thread->last_frame().cb()->as_nmethod_or_null(); | |
480 if (method != NULL) { | |
481 tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), obj); | |
482 } | |
483 thread->print_stack_on(tty); | |
484 assert(false, "invalid lock object pointer dected"); | |
485 } | |
486 #endif | |
487 | |
7226 | 488 if (GraalUseFastLocking) { |
7221 | 489 // When using fast locking, the compiled code has already tried the fast case |
490 ObjectSynchronizer::slow_exit(obj, lock, THREAD); | |
491 } else { | |
492 ObjectSynchronizer::fast_exit(obj, lock, THREAD); | |
493 } | |
494 if (TraceGraal >= 3) { | |
495 char type[O_BUFLEN]; | |
496 obj->klass()->name()->as_C_string(type, O_BUFLEN); | |
497 tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), obj, type, obj->mark(), lock); | |
498 tty->flush(); | |
499 } | |
500 JRT_END | |
501 | |
16887
aa412e64808e
logObject and logPrimitive should be leaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16876
diff
changeset
|
502 JRT_LEAF(void, GraalRuntime::log_object(JavaThread* thread, oopDesc* obj, jint flags)) |
7221 | 503 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); |
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
504 bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); |
7221 | 505 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); |
506 if (!string) { | |
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
507 if (!addr && obj->is_oop_or_null(true)) { |
7221 | 508 char buf[O_BUFLEN]; |
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
509 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj); |
7221 | 510 } else { |
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
511 tty->print("%p", (address)obj); |
7221 | 512 } |
513 } else { | |
514 ResourceMark rm; | |
515 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); | |
516 char *buf = java_lang_String::as_utf8_string(obj); | |
517 tty->print(buf); | |
518 } | |
519 if (newline) { | |
520 tty->cr(); | |
521 } | |
522 JRT_END | |
523 | |
10434
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
524 JRT_LEAF(void, GraalRuntime::write_barrier_pre(JavaThread* thread, oopDesc* obj)) |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
525 thread->satb_mark_queue().enqueue(obj); |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
526 JRT_END |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
527 |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
528 JRT_LEAF(void, GraalRuntime::write_barrier_post(JavaThread* thread, void* card_addr)) |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
529 thread->dirty_card_queue().enqueue(card_addr); |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
530 JRT_END |
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
531 |
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
532 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child)) |
10953
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
533 bool ret = true; |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
534 if(!Universe::heap()->is_in_closed_subset(parent)) { |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
535 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent); |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
536 parent->print(); |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
537 ret=false; |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
538 } |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
539 if(!Universe::heap()->is_in_closed_subset(child)) { |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
540 tty->print_cr("Child Object "INTPTR_FORMAT" not in heap", child); |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
541 child->print(); |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
542 ret=false; |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
543 } |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
544 return (jint)ret; |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
545 JRT_END |
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
546 |
14731
0cb5c4d276d4
use raw data support to fix incorrect use of String.intern() for embedding strings in code
Doug Simon <doug.simon@oracle.com>
parents:
14608
diff
changeset
|
547 JRT_ENTRY(void, GraalRuntime::vm_error(JavaThread* thread, jlong where, jlong format, jlong value)) |
7221 | 548 ResourceMark rm; |
14731
0cb5c4d276d4
use raw data support to fix incorrect use of String.intern() for embedding strings in code
Doug Simon <doug.simon@oracle.com>
parents:
14608
diff
changeset
|
549 const char *error_msg = where == 0L ? "<internal Graal error>" : (char*) (address) where; |
7221 | 550 char *detail_msg = NULL; |
14731
0cb5c4d276d4
use raw data support to fix incorrect use of String.intern() for embedding strings in code
Doug Simon <doug.simon@oracle.com>
parents:
14608
diff
changeset
|
551 if (format != 0L) { |
0cb5c4d276d4
use raw data support to fix incorrect use of String.intern() for embedding strings in code
Doug Simon <doug.simon@oracle.com>
parents:
14608
diff
changeset
|
552 const char* buf = (char*) (address) format; |
7221 | 553 size_t detail_msg_length = strlen(buf) * 2; |
554 detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length); | |
555 jio_snprintf(detail_msg, detail_msg_length, buf, value); | |
556 } | |
557 report_vm_error(__FILE__, __LINE__, error_msg, detail_msg); | |
558 JRT_END | |
559 | |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
560 JRT_LEAF(oopDesc*, GraalRuntime::load_and_clear_exception(JavaThread* thread)) |
9820
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
561 oop exception = thread->exception_oop(); |
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
562 assert(exception != NULL, "npe"); |
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
563 thread->set_exception_oop(NULL); |
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
564 thread->set_exception_pc(0); |
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
565 return exception; |
1b60f639ac4b
implemented alternative implementation for loading the exception object from the thread at the start of an exception dispatcher
Doug Simon <doug.simon@oracle.com>
parents:
9596
diff
changeset
|
566 JRT_END |
8506 | 567 |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
568 JRT_LEAF(void, GraalRuntime::log_printf(JavaThread* thread, oopDesc* format, jlong v1, jlong v2, jlong v3)) |
7221 | 569 ResourceMark rm; |
570 assert(format != NULL && java_lang_String::is_instance(format), "must be"); | |
571 char *buf = java_lang_String::as_utf8_string(format); | |
7235
a6bd253a770f
expanded LOG_PRINTF stub to handle up to 3 arguments in addition to the format string
Doug Simon <doug.simon@oracle.com>
parents:
7226
diff
changeset
|
572 tty->print(buf, v1, v2, v3); |
7221 | 573 JRT_END |
574 | |
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
575 static void decipher(jlong v, bool ignoreZero) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
576 if (v != 0 || !ignoreZero) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
577 void* p = (void *)(address) v; |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
578 CodeBlob* cb = CodeCache::find_blob(p); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
579 if (cb) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
580 if (cb->is_nmethod()) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
581 char buf[O_BUFLEN]; |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
582 tty->print("%s [%p+%d]", cb->as_nmethod_or_null()->method()->name_and_sig_as_C_string(buf, O_BUFLEN), cb->code_begin(), (address)v - cb->code_begin()); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
583 return; |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
584 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
585 cb->print_value_on(tty); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
586 return; |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
587 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
588 if (Universe::heap()->is_in(p)) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
589 oop obj = oop(p); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
590 obj->print_value_on(tty); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
591 return; |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
592 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
593 tty->print("%p [long: %d, double %f, char %c]", v, v, v, v); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
594 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
595 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
596 |
9471
5fa54bf57f8c
replaced exception_handler_nofpu assembler stub with a compiled stub (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9457
diff
changeset
|
597 JRT_LEAF(void, GraalRuntime::vm_message(jboolean vmError, jlong format, jlong v1, jlong v2, jlong v3)) |
9232
bb2447c64055
strings used in compiled stubs are lowered to malloc'ed C strings so that there are no embedded oops (for the strings) in the resulting installed code
Doug Simon <doug.simon@oracle.com>
parents:
8506
diff
changeset
|
598 ResourceMark rm; |
bb2447c64055
strings used in compiled stubs are lowered to malloc'ed C strings so that there are no embedded oops (for the strings) in the resulting installed code
Doug Simon <doug.simon@oracle.com>
parents:
8506
diff
changeset
|
599 char *buf = (char*) (address) format; |
9471
5fa54bf57f8c
replaced exception_handler_nofpu assembler stub with a compiled stub (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9457
diff
changeset
|
600 if (vmError) { |
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
601 if (buf != NULL) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
602 fatal(err_msg(buf, v1, v2, v3)); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
603 } else { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
604 fatal("<anonymous error>"); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
605 } |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
606 } else if (buf != NULL) { |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
607 tty->print(buf, v1, v2, v3); |
9471
5fa54bf57f8c
replaced exception_handler_nofpu assembler stub with a compiled stub (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9457
diff
changeset
|
608 } else { |
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
609 assert(v2 == 0, "v2 != 0"); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
610 assert(v3 == 0, "v3 != 0"); |
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
611 decipher(v1, false); |
9471
5fa54bf57f8c
replaced exception_handler_nofpu assembler stub with a compiled stub (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9457
diff
changeset
|
612 } |
9232
bb2447c64055
strings used in compiled stubs are lowered to malloc'ed C strings so that there are no embedded oops (for the strings) in the resulting installed code
Doug Simon <doug.simon@oracle.com>
parents:
8506
diff
changeset
|
613 JRT_END |
bb2447c64055
strings used in compiled stubs are lowered to malloc'ed C strings so that there are no embedded oops (for the strings) in the resulting installed code
Doug Simon <doug.simon@oracle.com>
parents:
8506
diff
changeset
|
614 |
16887
aa412e64808e
logObject and logPrimitive should be leaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
16876
diff
changeset
|
615 JRT_LEAF(void, GraalRuntime::log_primitive(JavaThread* thread, jchar typeChar, jlong value, jboolean newline)) |
7221 | 616 union { |
617 jlong l; | |
618 jdouble d; | |
619 jfloat f; | |
620 } uu; | |
621 uu.l = value; | |
622 switch (typeChar) { | |
623 case 'z': tty->print(value == 0 ? "false" : "true"); break; | |
624 case 'b': tty->print("%d", (jbyte) value); break; | |
625 case 'c': tty->print("%c", (jchar) value); break; | |
626 case 's': tty->print("%d", (jshort) value); break; | |
627 case 'i': tty->print("%d", (jint) value); break; | |
628 case 'f': tty->print("%f", uu.f); break; | |
629 case 'j': tty->print(INT64_FORMAT, value); break; | |
630 case 'd': tty->print("%lf", uu.d); break; | |
631 default: assert(false, "unknown typeChar"); break; | |
632 } | |
633 if (newline) { | |
634 tty->cr(); | |
635 } | |
636 JRT_END | |
637 | |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
638 JRT_ENTRY(jint, GraalRuntime::identity_hash_code(JavaThread* thread, oopDesc* obj)) |
7221 | 639 return (jint) obj->identity_hash(); |
640 JRT_END | |
641 | |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
642 JRT_ENTRY(jboolean, GraalRuntime::thread_is_interrupted(JavaThread* thread, oopDesc* receiver, jboolean clear_interrupted)) |
7220
fcae6d960acd
added more compiler intrinsics
Christian Haeubl <haeubl@ssw.jku.at>
parents:
7216
diff
changeset
|
643 // Ensure that the C++ Thread and OSThread structures aren't freed before we operate |
fcae6d960acd
added more compiler intrinsics
Christian Haeubl <haeubl@ssw.jku.at>
parents:
7216
diff
changeset
|
644 Handle receiverHandle(thread, receiver); |
12423
370b5f07f9e2
The runtime entries need to use oopDesc* rather than oop in their signature
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12372
diff
changeset
|
645 MutexLockerEx ml(thread->threadObj() == (void*)receiver ? NULL : Threads_lock); |
7386
707e9cca11de
fixed HotSpot windows build
Christian Haeubl <haeubl@ssw.jku.at>
parents:
7235
diff
changeset
|
646 JavaThread* receiverThread = java_lang_Thread::thread(receiverHandle()); |
14608
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
647 if (receiverThread == NULL) { |
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
648 // The other thread may exit during this process, which is ok so return false. |
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
649 return JNI_FALSE; |
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
650 } else { |
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
651 return (jint) Thread::is_interrupted(receiverThread, clear_interrupted != 0); |
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
652 } |
7221 | 653 JRT_END |
654 | |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
655 // private static GraalRuntime Graal.initializeRuntime() |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
656 JVM_ENTRY(jobject, JVM_GetGraalRuntime(JNIEnv *env, jclass c)) |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
657 return GraalRuntime::get_HotSpotGraalRuntime_jobject(); |
7221 | 658 JVM_END |
10475
3489047ffea2
Restructure the handling of HotSpotInstalledCode and their link to nmethods.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
10434
diff
changeset
|
659 |
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
660 // private static String[] Graal.getServiceImpls(Class service) |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
661 JVM_ENTRY(jobject, JVM_GetGraalServiceImpls(JNIEnv *env, jclass c, jclass serviceClass)) |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
662 HandleMark hm; |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
663 KlassHandle serviceKlass(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(serviceClass))); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
664 return JNIHandles::make_local(THREAD, GraalRuntime::get_service_impls(serviceKlass, THREAD)()); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
665 JVM_END |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
666 |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
667 // private static TruffleRuntime Truffle.createRuntime() |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
668 JVM_ENTRY(jobject, JVM_CreateTruffleRuntime(JNIEnv *env, jclass c)) |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
669 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime", CHECK_NULL); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
670 KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
671 |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
672 TempNewSymbol makeInstance = SymbolTable::new_symbol("makeInstance", CHECK_NULL); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
673 TempNewSymbol sig = SymbolTable::new_symbol("()Lcom/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime;", CHECK_NULL); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
674 JavaValue result(T_OBJECT); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
675 JavaCalls::call_static(&result, klass, makeInstance, sig, CHECK_NULL); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
676 return JNIHandles::make_local((oop) result.get_jobject()); |
10475
3489047ffea2
Restructure the handling of HotSpotInstalledCode and their link to nmethods.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
10434
diff
changeset
|
677 JVM_END |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
678 |
16691
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
679 // private static NativeFunctionInterfaceRuntime.createInterface() |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
680 JVM_ENTRY(jobject, JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c)) |
16717
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
681 const char* backendName = NULL; |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
682 #ifdef TARGET_ARCH_x86 |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
683 #ifdef _LP64 |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
684 backendName = "com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend"; |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
685 #endif |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
686 #endif |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
687 |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
688 if (backendName == NULL) { |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
689 return NULL; |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
690 } |
91e7d77cfb81
NFI: initialization only if platform is x86
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16691
diff
changeset
|
691 TempNewSymbol name = SymbolTable::new_symbol(backendName, CHECK_NULL); |
16691
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
692 KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
693 |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
694 TempNewSymbol makeInstance = SymbolTable::new_symbol("createNativeFunctionInterface", CHECK_NULL); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
695 TempNewSymbol sig = SymbolTable::new_symbol("()Lcom/oracle/nfi/api/NativeFunctionInterface;", CHECK_NULL); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
696 JavaValue result(T_OBJECT); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
697 JavaCalls::call_static(&result, klass, makeInstance, sig, CHECK_NULL); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
698 return JNIHandles::make_local((oop) result.get_jobject()); |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
699 JVM_END |
dd8449afc086
GNFI: move GNFI interfaces to oracle.nfi - interface does not depend on graal
Matthias Grimmer <grimmer@ssw.jku.at>
parents:
16683
diff
changeset
|
700 |
16628
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
701 void GraalRuntime::check_generated_sources_sha1(TRAPS) { |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
702 TempNewSymbol name = SymbolTable::new_symbol("GeneratedSourcesSha1", CHECK_ABORT); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
703 KlassHandle klass = load_required_class(name); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
704 fieldDescriptor fd; |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
705 if (!InstanceKlass::cast(klass())->find_field(vmSymbols::value_name(), vmSymbols::string_signature(), true, &fd)) { |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
706 THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), "GeneratedSourcesSha1.value"); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
707 } |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
708 |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
709 Symbol* value = java_lang_String::as_symbol(klass->java_mirror()->obj_field(fd.offset()), CHECK); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
710 if (!value->equals(_generated_sources_sha1)) { |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
711 char buf[200]; |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
712 jio_snprintf(buf, sizeof(buf), "Generated sources SHA1 check failed (%s != %s) - need to rebuild the VM", value->as_C_string(), _generated_sources_sha1); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
713 THROW_MSG(vmSymbols::java_lang_InternalError(), buf); |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
714 } |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
715 } |
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
716 |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
717 Handle GraalRuntime::get_HotSpotGraalRuntime() { |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
718 if (JNIHandles::resolve(_HotSpotGraalRuntime_instance) == NULL) { |
16683
4d0d1dc5db00
introduce extra field to record when HotSpotGraalRuntime has been initialized to avoid spurious errors during VM shutdown for short lived applications
Doug Simon <doug.simon@oracle.com>
parents:
16679
diff
changeset
|
719 guarantee(!_HotSpotGraalRuntime_initialized, "cannot reinitialize HotSpotGraalRuntime"); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
720 Thread* THREAD = Thread::current(); |
16628
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
721 check_generated_sources_sha1(CHECK_ABORT_(Handle())); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
722 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", CHECK_ABORT_(Handle())); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
723 KlassHandle klass = load_required_class(name); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
724 TempNewSymbol runtime = SymbolTable::new_symbol("runtime", CHECK_ABORT_(Handle())); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
725 TempNewSymbol sig = SymbolTable::new_symbol("()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;", CHECK_ABORT_(Handle())); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
726 JavaValue result(T_OBJECT); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
727 JavaCalls::call_static(&result, klass, runtime, sig, CHECK_ABORT_(Handle())); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
728 _HotSpotGraalRuntime_instance = JNIHandles::make_global((oop) result.get_jobject()); |
16683
4d0d1dc5db00
introduce extra field to record when HotSpotGraalRuntime has been initialized to avoid spurious errors during VM shutdown for short lived applications
Doug Simon <doug.simon@oracle.com>
parents:
16679
diff
changeset
|
729 _HotSpotGraalRuntime_initialized = true; |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
730 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
731 return Handle(JNIHandles::resolve_non_null(_HotSpotGraalRuntime_instance)); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
732 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
733 |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
734 // private static void CompilerToVMImpl.init() |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
735 JVM_ENTRY(void, JVM_InitializeGraalNatives(JNIEnv *env, jclass c2vmClass)) |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
736 GraalRuntime::initialize_natives(env, c2vmClass); |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
737 JVM_END |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
738 |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
739 // private static boolean HotSpotOptions.parseVMOptions() |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
740 JVM_ENTRY(jboolean, JVM_ParseGraalOptions(JNIEnv *env, jclass c)) |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
741 HandleMark hm; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
742 KlassHandle hotSpotOptionsClass(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(c))); |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
743 bool result = GraalRuntime::parse_arguments(hotSpotOptionsClass, CHECK_false); |
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
744 return result; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
745 JVM_END |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
746 |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
747 jint GraalRuntime::check_arguments(TRAPS) { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
748 KlassHandle nullHandle; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
749 parse_arguments(nullHandle, THREAD); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
750 if (HAS_PENDING_EXCEPTION) { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
751 // Errors in parsing Graal arguments cause exceptions. |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
752 // We now load and initialize HotSpotOptions which in turn |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
753 // causes argument parsing to be redone with better error messages. |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
754 CLEAR_PENDING_EXCEPTION; |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
755 TempNewSymbol name = SymbolTable::new_symbol("Lcom/oracle/graal/hotspot/HotSpotOptions;", CHECK_ABORT_(JNI_ERR)); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
756 instanceKlassHandle hotSpotOptionsClass = resolve_or_fail(name, CHECK_ABORT_(JNI_ERR)); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
757 |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
758 parse_arguments(hotSpotOptionsClass, THREAD); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
759 assert(HAS_PENDING_EXCEPTION, "must be"); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
760 |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
761 ResourceMark rm; |
16273
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
762 Handle exception = PENDING_EXCEPTION; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
763 CLEAR_PENDING_EXCEPTION; |
16273
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
764 oop message = java_lang_Throwable::message(exception); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
765 if (message != NULL) { |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
766 tty->print_cr("Error parsing Graal options: %s", java_lang_String::as_utf8_string(message)); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
767 } else { |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
768 call_printStackTrace(exception, THREAD); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
769 } |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
770 return JNI_ERR; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
771 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
772 return JNI_OK; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
773 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
774 |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
775 bool GraalRuntime::parse_arguments(KlassHandle hotSpotOptionsClass, TRAPS) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
776 ResourceMark rm(THREAD); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
777 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
778 // Process option overrides from graal.options first |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
779 parse_graal_options_file(hotSpotOptionsClass, CHECK_false); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
780 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
781 // Now process options on the command line |
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
782 int numOptions = Arguments::num_graal_args(); |
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
783 for (int i = 0; i < numOptions; i++) { |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
784 char* arg = Arguments::graal_args_array()[i]; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
785 parse_argument(hotSpotOptionsClass, arg, CHECK_false); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
786 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
787 return CITime || CITimeEach; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
788 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
789 |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
790 void GraalRuntime::check_required_value(const char* name, size_t name_len, const char* value, TRAPS) { |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
791 if (value == NULL) { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
792 char buf[200]; |
16273
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
793 jio_snprintf(buf, sizeof(buf), "Must use '-G:%.*s=<value>' format for %.*s option", name_len, name, name_len, name); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
794 THROW_MSG(vmSymbols::java_lang_InternalError(), buf); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
795 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
796 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
797 |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
798 void GraalRuntime::parse_argument(KlassHandle hotSpotOptionsClass, char* arg, TRAPS) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
799 char first = arg[0]; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
800 char* name; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
801 size_t name_len; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
802 bool recognized = true; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
803 if (first == '+' || first == '-') { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
804 name = arg + 1; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
805 name_len = strlen(name); |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
806 recognized = set_option_bool(hotSpotOptionsClass, name, name_len, first, CHECK); |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
807 } else { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
808 char* sep = strchr(arg, '='); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
809 name = arg; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
810 char* value = NULL; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
811 if (sep != NULL) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
812 name_len = sep - name; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
813 value = sep + 1; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
814 } else { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
815 name_len = strlen(name); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
816 } |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
817 recognized = set_option(hotSpotOptionsClass, name, name_len, value, CHECK); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
818 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
819 |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
820 if (!recognized) { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
821 bool throw_err = hotSpotOptionsClass.is_null(); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
822 if (!hotSpotOptionsClass.is_null()) { |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
823 set_option_helper(hotSpotOptionsClass, name, name_len, Handle(), ' ', Handle(), 0L); |
16275
7af7db0bbfe9
handle unwinding exception through recursive call properly
Doug Simon <doug.simon@oracle.com>
parents:
16274
diff
changeset
|
824 if (!HAS_PENDING_EXCEPTION) { |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
825 throw_err = true; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
826 } |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
827 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
828 |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
829 if (throw_err) { |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
830 char buf[200]; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
831 jio_snprintf(buf, sizeof(buf), "Unrecognized Graal option %.*s", name_len, name); |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
832 THROW_MSG(vmSymbols::java_lang_InternalError(), buf); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
833 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
834 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
835 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
836 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
837 void GraalRuntime::parse_graal_options_file(KlassHandle hotSpotOptionsClass, TRAPS) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
838 const char* home = Arguments::get_java_home(); |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
839 size_t path_len = strlen(home) + strlen("/lib/graal.options") + 1; |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
840 char* path = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, path_len); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
841 char sep = os::file_separator()[0]; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
842 sprintf(path, "%s%clib%cgraal.options", home, sep, sep); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
843 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
844 struct stat st; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
845 if (os::stat(path, &st) == 0) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
846 int file_handle = os::open(path, 0, 0); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
847 if (file_handle != -1) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
848 char* buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, st.st_size); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
849 int num_read = (int) os::read(file_handle, (char*) buffer, st.st_size); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
850 if (num_read == -1) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
851 warning("Error reading file %s due to %s", path, strerror(errno)); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
852 } else if (num_read != st.st_size) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
853 warning("Only read %d of %d bytes from %s", num_read, st.st_size, path); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
854 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
855 os::close(file_handle); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
856 if (num_read == st.st_size) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
857 char* line = buffer; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
858 int lineNo = 1; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
859 while (line - buffer < num_read) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
860 char* nl = strchr(line, '\n'); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
861 if (nl != NULL) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
862 *nl = '\0'; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
863 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
864 parse_argument(hotSpotOptionsClass, line, THREAD); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
865 if (HAS_PENDING_EXCEPTION) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
866 warning("Error in %s:%d", path, lineNo); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
867 return; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
868 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
869 if (nl != NULL) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
870 line = nl + 1; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
871 lineNo++; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
872 } else { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
873 // File without newline at the end |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
874 break; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
875 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
876 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
877 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
878 } else { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
879 warning("Error opening file %s due to %s", path, strerror(errno)); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
880 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
881 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
882 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
883 |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
884 jlong GraalRuntime::parse_primitive_option_value(char spec, const char* name, size_t name_len, const char* value, TRAPS) { |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
885 check_required_value(name, name_len, value, CHECK_(0L)); |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
886 union { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
887 jint i; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
888 jlong l; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
889 double d; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
890 } uu; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
891 uu.l = 0L; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
892 char dummy; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
893 switch (spec) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
894 case 'd': |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
895 case 'f': { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
896 if (sscanf(value, "%lf%c", &uu.d, &dummy) == 1) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
897 return uu.l; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
898 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
899 break; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
900 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
901 case 'i': { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
902 if (sscanf(value, "%d%c", &uu.i, &dummy) == 1) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
903 return uu.l; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
904 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
905 break; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
906 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
907 default: |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
908 ShouldNotReachHere(); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
909 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
910 ResourceMark rm(THREAD); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
911 char buf[200]; |
16274
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
912 bool missing = strlen(value) == 0; |
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
913 if (missing) { |
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
914 jio_snprintf(buf, sizeof(buf), "Missing %s value for Graal option %.*s", (spec == 'i' ? "numeric" : "float/double"), name_len, name); |
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
915 } else { |
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
916 jio_snprintf(buf, sizeof(buf), "Invalid %s value for Graal option %.*s: %s", (spec == 'i' ? "numeric" : "float/double"), name_len, name, value); |
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
917 } |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
918 THROW_MSG_(vmSymbols::java_lang_InternalError(), buf, 0L); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
919 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
920 |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
921 void GraalRuntime::set_option_helper(KlassHandle hotSpotOptionsClass, char* name, size_t name_len, Handle option, jchar spec, Handle stringValue, jlong primitiveValue) { |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
922 Thread* THREAD = Thread::current(); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
923 Handle name_handle; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
924 if (name != NULL) { |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
925 if (strlen(name) > name_len) { |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
926 // Temporarily replace '=' with NULL to create the Java string for the option name |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
927 char save = name[name_len]; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
928 name[name_len] = '\0'; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
929 name_handle = java_lang_String::create_from_str(name, THREAD); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
930 name[name_len] = '='; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
931 if (HAS_PENDING_EXCEPTION) { |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
932 return; |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
933 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
934 } else { |
16876
9d4c73b0646e
graalRuntime: name_len shound be a size_t
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16870
diff
changeset
|
935 assert(strlen(name) == name_len, "must be"); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
936 name_handle = java_lang_String::create_from_str(name, CHECK); |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
937 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
938 } |
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
939 |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
940 TempNewSymbol setOption = SymbolTable::new_symbol("setOption", CHECK); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
941 TempNewSymbol sig = SymbolTable::new_symbol("(Ljava/lang/String;Lcom/oracle/graal/options/OptionValue;CLjava/lang/String;J)V", CHECK); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
942 JavaValue result(T_VOID); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
943 JavaCallArguments args; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
944 args.push_oop(name_handle()); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
945 args.push_oop(option()); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
946 args.push_int(spec); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
947 args.push_oop(stringValue()); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
948 args.push_long(primitiveValue); |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
949 JavaCalls::call_static(&result, hotSpotOptionsClass, setOption, sig, &args, CHECK); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
950 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
951 |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
952 Handle GraalRuntime::get_OptionValue(const char* declaringClass, const char* fieldName, const char* fieldSig, TRAPS) { |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
953 TempNewSymbol name = SymbolTable::new_symbol(declaringClass, CHECK_NH); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
954 Klass* klass = resolve_or_fail(name, CHECK_NH); |
15870
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
955 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
956 // The class has been loaded so the field and signature should already be in the symbol |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
957 // table. If they're not there, the field doesn't exist. |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
958 TempNewSymbol fieldname = SymbolTable::probe(fieldName, (int)strlen(fieldName)); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
959 TempNewSymbol signame = SymbolTable::probe(fieldSig, (int)strlen(fieldSig)); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
960 if (fieldname == NULL || signame == NULL) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
961 THROW_MSG_(vmSymbols::java_lang_NoSuchFieldError(), (char*) fieldName, Handle()); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
962 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
963 // Make sure class is initialized before handing id's out to fields |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
964 klass->initialize(CHECK_NH); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
965 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
966 fieldDescriptor fd; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
967 if (!InstanceKlass::cast(klass)->find_field(fieldname, signame, true, &fd)) { |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
968 THROW_MSG_(vmSymbols::java_lang_NoSuchFieldError(), (char*) fieldName, Handle()); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
969 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
970 |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
971 Handle ret = klass->java_mirror()->obj_field(fd.offset()); |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
972 return ret; |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
973 } |
fe608a56e3f7
made HotSpotOptions processing faster by removing use of service loader in VM startup and only doing work for options specified on the command line
Doug Simon <doug.simon@oracle.com>
parents:
15603
diff
changeset
|
974 |
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
975 Handle GraalRuntime::create_Service(const char* name, TRAPS) { |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
976 TempNewSymbol kname = SymbolTable::new_symbol(name, CHECK_NH); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
977 Klass* k = resolve_or_fail(kname, CHECK_NH); |
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
978 instanceKlassHandle klass(THREAD, k); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
979 klass->initialize(CHECK_NH); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
980 klass->check_valid_for_instantiation(true, CHECK_NH); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
981 JavaValue result(T_VOID); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
982 instanceHandle service = klass->allocate_instance_handle(CHECK_NH); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
983 JavaCalls::call_special(&result, service, klass, vmSymbols::object_initializer_name(), vmSymbols::void_method_signature(), THREAD); |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
984 return service; |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
985 } |
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
986 |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
987 void GraalRuntime::shutdown() { |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
988 if (_HotSpotGraalRuntime_instance != NULL) { |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
989 JavaThread* THREAD = JavaThread::current(); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
990 HandleMark hm(THREAD); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
991 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", CHECK_ABORT); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
992 KlassHandle klass = load_required_class(name); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
993 JavaValue result(T_VOID); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
994 JavaCallArguments args; |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
995 args.push_oop(get_HotSpotGraalRuntime()); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
996 JavaCalls::call_special(&result, klass, vmSymbols::shutdown_method_name(), vmSymbols::void_method_signature(), &args, CHECK_ABORT); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
997 |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
998 JNIHandles::destroy_global(_HotSpotGraalRuntime_instance); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
999 _HotSpotGraalRuntime_instance = NULL; |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1000 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1001 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1002 |
16273
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1003 void GraalRuntime::call_printStackTrace(Handle exception, Thread* thread) { |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1004 assert(exception->is_a(SystemDictionary::Throwable_klass()), "Throwable instance expected"); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1005 JavaValue result(T_VOID); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1006 JavaCalls::call_virtual(&result, |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1007 exception, |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1008 KlassHandle(thread, |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1009 SystemDictionary::Throwable_klass()), |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1010 vmSymbols::printStackTrace_name(), |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1011 vmSymbols::void_method_signature(), |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1012 thread); |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1013 } |
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1014 |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1015 oop GraalRuntime::compute_graal_class_loader(TRAPS) { |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1016 assert(UseGraalClassLoader, "must be"); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
1017 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/loader/Factory", CHECK_NULL); |
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
1018 KlassHandle klass = SystemDictionary::resolve_or_null(name, CHECK_NULL); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1019 |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
1020 TempNewSymbol getClassLoader = SymbolTable::new_symbol("newClassLoader", CHECK_NULL); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1021 JavaValue result(T_OBJECT); |
16428
78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
Doug Simon <doug.simon@oracle.com>
parents:
16399
diff
changeset
|
1022 JavaCalls::call_static(&result, klass, getClassLoader, vmSymbols::void_classloader_signature(), CHECK_NULL); |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1023 return (oop) result.get_jobject(); |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1024 } |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1025 |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1026 void GraalRuntime::abort_on_pending_exception(Handle exception, const char* message, bool dump_core) { |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1027 Thread* THREAD = Thread::current(); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1028 CLEAR_PENDING_EXCEPTION; |
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
1029 tty->print_cr(message); |
16273
d6ffc6164830
handle any exception raised during Graal option checking/parsing, not just those with a non-null message
Doug Simon <doug.simon@oracle.com>
parents:
16270
diff
changeset
|
1030 call_printStackTrace(exception, THREAD); |
16679
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1031 |
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1032 // Give other aborting threads to also print their stack traces. |
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1033 // This can be very useful when debugging class initialization |
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1034 // failures. |
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1035 os::sleep(THREAD, 200, false); |
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
1036 |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1037 vm_abort(dump_core); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1038 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1039 |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1040 Klass* GraalRuntime::resolve_or_null(Symbol* name, TRAPS) { |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1041 return SystemDictionary::resolve_or_null(name, SystemDictionary::graal_loader(), Handle(), CHECK_NULL); |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1042 } |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1043 |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1044 Klass* GraalRuntime::resolve_or_fail(Symbol* name, TRAPS) { |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1045 return SystemDictionary::resolve_or_fail(name, SystemDictionary::graal_loader(), Handle(), true, CHECK_NULL); |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1046 } |
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1047 |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1048 Klass* GraalRuntime::load_required_class(Symbol* name) { |
16395
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1049 Klass* klass = resolve_or_null(name, Thread::current()); |
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1050 if (klass == NULL) { |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1051 tty->print_cr("Could not load class %s", name->as_C_string()); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1052 vm_abort(false); |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1053 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1054 return klass; |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1055 } |
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1056 |
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
1057 #include "graalRuntime.inline.hpp" |