Mercurial > hg > truffle
annotate src/share/vm/graal/graalRuntime.cpp @ 16679:58622d6b1097
give all aborting threads a chance to print Graal related stack traces
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 04 Aug 2014 14:26:29 +0200 |
| parents | d3fec84757ed |
| children | 4d0d1dc5db00 |
| 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" |
| 7221 | 27 #include "graal/graalRuntime.hpp" |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
28 #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
|
29 #include "graal/graalCompiler.hpp" |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
30 #include "graal/graalJavaAccess.hpp" |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
31 #include "graal/graalEnv.hpp" |
| 7735 | 32 #include "memory/oopFactory.hpp" |
| 33 #include "prims/jvm.h" | |
| 7221 | 34 #include "runtime/biasedLocking.hpp" |
| 7735 | 35 #include "runtime/interfaceSupport.hpp" |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
36 #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
|
37 #include "runtime/reflection.hpp" |
|
8499
96a337d307bd
-More progress in G1 WBs
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8496
diff
changeset
|
38 #include "utilities/debug.hpp" |
| 7221 | 39 |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
40 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
|
41 jobject GraalRuntime::_HotSpotGraalRuntime_instance = NULL; |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
42 |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
43 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
|
44 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
|
45 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
|
46 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
|
47 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
|
48 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
49 JavaThread* THREAD = JavaThread::current(); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
50 { |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
51 ThreadToNativeFromVM trans(THREAD); |
|
15582
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 ResourceMark rm; |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
54 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
|
55 |
|
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
56 graal_compute_offsets(); |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
57 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
58 _external_deopt_i2c_entry = create_external_deopt_i2c(); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
59 |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
60 // 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
|
61 Universe::non_oop_word(); |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
62 |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
63 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
|
64 } |
|
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
|
65 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
|
66 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
|
67 } |
|
15582
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
68 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
69 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
70 BufferBlob* GraalRuntime::initialize_buffer_blob() { |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
71 JavaThread* THREAD = JavaThread::current(); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
72 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
|
73 if (buffer_blob == NULL) { |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
74 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
|
75 if (buffer_blob != NULL) { |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
76 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
|
77 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
78 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
79 return buffer_blob; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
80 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
81 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
82 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
|
83 ResourceMark rm; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
84 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
|
85 CodeBuffer cb(buffer); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
86 short buffer_locs[20]; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
87 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
|
88 MacroAssembler masm(&cb); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
89 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
90 int total_args_passed = 5; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
91 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
92 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
|
93 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
|
94 int i = 0; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
95 sig_bt[i++] = T_INT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
96 sig_bt[i++] = T_LONG; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
97 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
|
98 sig_bt[i++] = T_INT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
99 sig_bt[i++] = T_OBJECT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
100 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
101 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
|
102 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
103 SharedRuntime::gen_i2c_adapter(&masm, total_args_passed, comp_args_on_stack, sig_bt, regs); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
104 masm.flush(); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
105 |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
106 return AdapterBlob::create(&cb)->content_begin(); |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
107 } |
|
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 BasicType GraalRuntime::kindToBasicType(jchar ch) { |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
110 switch(ch) { |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
111 case 'z': return T_BOOLEAN; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
112 case 'b': return T_BYTE; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
113 case 's': return T_SHORT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
114 case 'c': return T_CHAR; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
115 case 'i': return T_INT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
116 case 'f': return T_FLOAT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
117 case 'j': return T_LONG; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
118 case 'd': return T_DOUBLE; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
119 case 'a': return T_OBJECT; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
120 case '-': return T_ILLEGAL; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
121 default: |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
122 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
|
123 break; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
124 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
125 return T_ILLEGAL; |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
126 } |
|
063ec2920d21
made Graal runtime initialization in hosted mode lazy
Doug Simon <doug.simon@oracle.com>
parents:
14731
diff
changeset
|
127 |
| 7221 | 128 // Simple helper to see if the caller of a runtime stub which |
| 129 // entered the VM has been deoptimized | |
| 130 | |
| 131 static bool caller_is_deopted() { | |
| 132 JavaThread* thread = JavaThread::current(); | |
| 133 RegisterMap reg_map(thread, false); | |
| 134 frame runtime_frame = thread->last_frame(); | |
| 135 frame caller_frame = runtime_frame.sender(®_map); | |
| 136 assert(caller_frame.is_compiled_frame(), "must be compiled"); | |
| 137 return caller_frame.is_deoptimized_frame(); | |
| 138 } | |
| 139 | |
| 140 // Stress deoptimization | |
| 141 static void deopt_caller() { | |
| 142 if ( !caller_is_deopted()) { | |
| 143 JavaThread* thread = JavaThread::current(); | |
| 144 RegisterMap reg_map(thread, false); | |
| 145 frame runtime_frame = thread->last_frame(); | |
| 146 frame caller_frame = runtime_frame.sender(®_map); | |
| 147 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); | |
| 148 assert(caller_is_deopted(), "Must be deoptimized"); | |
| 149 } | |
| 150 } | |
| 151 | |
|
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
152 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
|
153 JRT_BLOCK; |
| 7221 | 154 assert(klass->is_klass(), "not a class"); |
| 155 instanceKlassHandle h(thread, klass); | |
| 156 h->check_valid_for_instantiation(true, CHECK); | |
| 157 // make sure klass is initialized | |
| 158 h->initialize(CHECK); | |
| 159 // allocate instance and return via TLS | |
| 160 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
|
161 thread->set_vm_result(obj); |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
162 JRT_BLOCK_END; |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
163 |
|
12366
0991c12c4186
Defer barriers upon slow-path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10953
diff
changeset
|
164 if (GraalDeferredInitBarriers) { |
|
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
165 new_store_pre_barrier(thread); |
|
12366
0991c12c4186
Defer barriers upon slow-path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10953
diff
changeset
|
166 } |
| 7221 | 167 JRT_END |
| 168 | |
|
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
169 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
|
170 JRT_BLOCK; |
| 7221 | 171 // Note: no handle for klass needed since they are not used |
| 172 // anymore after new_objArray() and no GC can happen before. | |
| 173 // (This may have to change if this code changes!) | |
| 174 assert(array_klass->is_klass(), "not a class"); | |
| 175 oop obj; | |
| 176 if (array_klass->oop_is_typeArray()) { | |
| 177 BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type(); | |
| 178 obj = oopFactory::new_typeArray(elt_type, length, CHECK); | |
| 179 } else { | |
| 180 Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); | |
| 181 obj = oopFactory::new_objArray(elem_klass, length, CHECK); | |
| 182 } | |
| 183 thread->set_vm_result(obj); | |
| 184 // This is pretty rare but this runtime patch is stressful to deoptimization | |
| 185 // if we deoptimize here so force a deopt to stress the path. | |
| 186 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
|
187 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
|
188 // 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
|
189 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
|
190 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
|
191 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
|
192 } 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
|
193 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
|
194 } |
| 7221 | 195 } |
|
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
196 JRT_BLOCK_END; |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
197 |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
198 if (GraalDeferredInitBarriers) { |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
199 new_store_pre_barrier(thread); |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
200 } |
|
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
|
201 JRT_END |
| 7221 | 202 |
|
12433
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
203 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
|
204 // 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
|
205 // 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
|
206 // 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
|
207 // GC may take any compensating steps. |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
208 // 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
|
209 |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
210 oop new_obj = thread->vm_result(); |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
211 if (new_obj == NULL) return; |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
212 |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
213 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
|
214 "compiler must check this first"); |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
215 // 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
|
216 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
|
217 thread->set_vm_result(new_obj); |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
218 } |
|
808348377021
Fix inconsistent oops in slow path allocation
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
12372
diff
changeset
|
219 |
| 7221 | 220 JRT_ENTRY(void, GraalRuntime::new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims)) |
| 221 assert(klass->is_klass(), "not a class"); | |
| 222 assert(rank >= 1, "rank must be nonzero"); | |
| 223 oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); | |
| 224 thread->set_vm_result(obj); | |
| 225 JRT_END | |
| 226 | |
|
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
|
227 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
|
228 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
|
229 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
|
230 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
|
231 |
|
13578
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
232 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
|
233 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
|
234 |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
235 if (klass == NULL) { |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
236 ResourceMark rm(THREAD); |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
237 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
|
238 } |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
239 |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
240 // 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
|
241 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
|
242 |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
243 // 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
|
244 klass->initialize(CHECK); |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
245 |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
246 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
|
247 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
|
248 JRT_END |
|
d8143c431d63
Add DynamicNewInstanceNode and use it to intrinsify Unsafe.allocateInstance
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
12668
diff
changeset
|
249 |
| 7221 | 250 extern void vm_exit(int code); |
| 251 | |
| 252 // Enter this method from compiled code handler below. This is where we transition | |
| 253 // to VM mode. This is done as a helper routine so that the method called directly | |
| 254 // from compiled code does not have to transition to VM. This allows the entry | |
| 255 // method to see if the nmethod that we have just looked up a handler for has | |
| 256 // been deoptimized while we were in the vm. This simplifies the assembly code | |
| 257 // cpu directories. | |
| 258 // | |
| 259 // We are entering here from exception stub (via the entry method below) | |
| 260 // If there is a compiled exception handler in this method, we will continue there; | |
| 261 // otherwise we will unwind the stack and continue at the caller of top frame method | |
| 262 // Note: we enter in Java using a special JRT wrapper. This wrapper allows us to | |
| 263 // control the area where we can allow a safepoint. After we exit the safepoint area we can | |
| 264 // check to see if the handler we are going to return is now in a nmethod that has | |
| 265 // been deoptimized. If that is the case we return the deopt blob | |
| 266 // unpack_with_exception entry instead. This makes life for the exception blob easier | |
| 267 // because making that same check and diverting is painful from assembly language. | |
| 268 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm)) | |
| 269 // Reset method handle flag. | |
| 270 thread->set_is_method_handle_return(false); | |
| 271 | |
| 272 Handle exception(thread, ex); | |
| 273 nm = CodeCache::find_nmethod(pc); | |
| 274 assert(nm != NULL, "this is not an nmethod"); | |
| 275 // Adjust the pc as needed/ | |
| 276 if (nm->is_deopt_pc(pc)) { | |
| 277 RegisterMap map(thread, false); | |
| 278 frame exception_frame = thread->last_frame().sender(&map); | |
| 279 // if the frame isn't deopted then pc must not correspond to the caller of last_frame | |
| 280 assert(exception_frame.is_deoptimized_frame(), "must be deopted"); | |
| 281 pc = exception_frame.pc(); | |
| 282 } | |
| 283 #ifdef ASSERT | |
| 284 assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); | |
| 285 assert(exception->is_oop(), "just checking"); | |
| 286 // Check that exception is a subclass of Throwable, otherwise we have a VerifyError | |
| 287 if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { | |
| 288 if (ExitVMOnVerifyError) vm_exit(-1); | |
| 289 ShouldNotReachHere(); | |
| 290 } | |
| 291 #endif | |
| 292 | |
| 293 // Check the stack guard pages and reenable them if necessary and there is | |
| 294 // enough space on the stack to do so. Use fast exceptions only if the guard | |
| 295 // pages are enabled. | |
| 296 bool guard_pages_enabled = thread->stack_yellow_zone_enabled(); | |
| 297 if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack(); | |
| 298 | |
| 299 if (JvmtiExport::can_post_on_exceptions()) { | |
| 300 // To ensure correct notification of exception catches and throws | |
| 301 // we have to deoptimize here. If we attempted to notify the | |
| 302 // catches and throws during this exception lookup it's possible | |
| 303 // we could deoptimize on the way out of the VM and end back in | |
| 304 // the interpreter at the throw site. This would result in double | |
| 305 // notifications since the interpreter would also notify about | |
| 306 // these same catches and throws as it unwound the frame. | |
| 307 | |
| 308 RegisterMap reg_map(thread); | |
| 309 frame stub_frame = thread->last_frame(); | |
| 310 frame caller_frame = stub_frame.sender(®_map); | |
| 311 | |
| 312 // We don't really want to deoptimize the nmethod itself since we | |
| 313 // can actually continue in the exception handler ourselves but I | |
| 314 // don't see an easy way to have the desired effect. | |
| 315 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); | |
| 316 assert(caller_is_deopted(), "Must be deoptimized"); | |
| 317 | |
| 318 return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); | |
| 319 } | |
| 320 | |
| 321 // ExceptionCache is used only for exceptions at call sites and not for implicit exceptions | |
| 322 if (guard_pages_enabled) { | |
| 323 address fast_continuation = nm->handler_for_exception_and_pc(exception, pc); | |
| 324 if (fast_continuation != NULL) { | |
| 325 // Set flag if return address is a method handle call site. | |
| 326 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); | |
| 327 return fast_continuation; | |
| 328 } | |
| 329 } | |
| 330 | |
| 331 // If the stack guard pages are enabled, check whether there is a handler in | |
| 332 // the current method. Otherwise (guard pages disabled), force an unwind and | |
| 333 // skip the exception cache update (i.e., just leave continuation==NULL). | |
| 334 address continuation = NULL; | |
| 335 if (guard_pages_enabled) { | |
| 336 | |
| 337 // New exception handling mechanism can support inlined methods | |
| 338 // with exception handlers since the mappings are from PC to PC | |
| 339 | |
| 340 // debugging support | |
| 341 // tracing | |
| 342 if (TraceExceptions) { | |
| 343 ttyLocker ttyl; | |
| 344 ResourceMark rm; | |
| 345 int offset = pc - nm->code_begin(); | |
| 346 tty->print_cr("Exception <%s> (0x%x) thrown in compiled method <%s> at PC " PTR_FORMAT " [" PTR_FORMAT "+%d] for thread 0x%x", | |
| 347 exception->print_value_string(), (address)exception(), nm->method()->print_value_string(), pc, nm->code_begin(), offset, thread); | |
| 348 } | |
| 349 // for AbortVMOnException flag | |
| 350 NOT_PRODUCT(Exceptions::debug_check_abort(exception)); | |
| 351 | |
| 352 // Clear out the exception oop and pc since looking up an | |
| 353 // exception handler can cause class loading, which might throw an | |
| 354 // exception and those fields are expected to be clear during | |
| 355 // normal bytecode execution. | |
| 356 thread->set_exception_oop(NULL); | |
| 357 thread->set_exception_pc(NULL); | |
| 358 | |
| 359 continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false); | |
| 360 // If an exception was thrown during exception dispatch, the exception oop may have changed | |
| 361 thread->set_exception_oop(exception()); | |
| 362 thread->set_exception_pc(pc); | |
| 363 | |
| 364 // the exception cache is used only by non-implicit exceptions | |
| 365 if (continuation != NULL && !SharedRuntime::deopt_blob()->contains(continuation)) { | |
| 366 nm->add_handler_for_exception_and_pc(exception, pc, continuation); | |
| 367 } | |
| 368 } | |
| 369 | |
| 370 // Set flag if return address is a method handle call site. | |
| 371 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); | |
| 372 | |
| 373 if (TraceExceptions) { | |
| 374 ttyLocker ttyl; | |
| 375 ResourceMark rm; | |
| 376 tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT, | |
| 377 thread, continuation, pc); | |
| 378 } | |
| 379 | |
| 380 return continuation; | |
| 381 JRT_END | |
| 382 | |
| 383 // Enter this method from compiled code only if there is a Java exception handler | |
| 384 // in the method handling the exception. | |
| 385 // We are entering here from exception stub. We don't do a normal VM transition here. | |
| 386 // We do it in a helper. This is so we can check to see if the nmethod we have just | |
| 387 // searched for an exception handler has been deoptimized in the meantime. | |
| 388 address GraalRuntime::exception_handler_for_pc(JavaThread* thread) { | |
| 389 oop exception = thread->exception_oop(); | |
| 390 address pc = thread->exception_pc(); | |
| 391 // Still in Java mode | |
| 392 DEBUG_ONLY(ResetNoHandleMark rnhm); | |
| 393 nmethod* nm = NULL; | |
| 394 address continuation = NULL; | |
| 395 { | |
| 396 // Enter VM mode by calling the helper | |
| 397 ResetNoHandleMark rnhm; | |
| 398 continuation = exception_handler_for_pc_helper(thread, exception, pc, nm); | |
| 399 } | |
| 400 // Back in JAVA, use no oops DON'T safepoint | |
| 401 | |
| 402 // Now check to see if the nmethod we were called from is now deoptimized. | |
| 403 // If so we must return to the deopt blob and deoptimize the nmethod | |
| 404 if (nm != NULL && caller_is_deopted()) { | |
| 405 continuation = SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); | |
| 406 } | |
| 407 | |
| 408 assert(continuation != NULL, "no handler found"); | |
| 409 return continuation; | |
| 410 } | |
| 411 | |
|
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
|
412 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
|
413 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
|
414 thread->set_vm_result(PENDING_EXCEPTION); |
|
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
415 CLEAR_PENDING_EXCEPTION; |
| 7221 | 416 JRT_END |
| 417 | |
|
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
|
418 JRT_ENTRY(void, GraalRuntime::create_out_of_bounds_exception(JavaThread* thread, jint index)) |
| 7221 | 419 char message[jintAsStringSize]; |
| 420 sprintf(message, "%d", index); | |
|
12668
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
421 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
|
422 thread->set_vm_result(PENDING_EXCEPTION); |
|
e27f3169460e
notify JVMTI about exception throws from runtime
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
12435
diff
changeset
|
423 CLEAR_PENDING_EXCEPTION; |
| 7221 | 424 JRT_END |
| 425 | |
|
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
|
426 JRT_ENTRY_NO_ASYNC(void, GraalRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
| 7221 | 427 if (TraceGraal >= 3) { |
| 428 char type[O_BUFLEN]; | |
| 429 obj->klass()->name()->as_C_string(type, O_BUFLEN); | |
| 430 markOop mark = obj->mark(); | |
| 431 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); | |
| 432 tty->flush(); | |
| 433 } | |
| 434 #ifdef ASSERT | |
| 435 if (PrintBiasedLockingStatistics) { | |
| 436 Atomic::inc(BiasedLocking::slow_path_entry_count_addr()); | |
| 437 } | |
| 438 #endif | |
| 439 Handle h_obj(thread, obj); | |
| 440 assert(h_obj()->is_oop(), "must be NULL or an object"); | |
| 441 if (UseBiasedLocking) { | |
| 442 // Retry fast entry if bias is revoked to avoid unnecessary inflation | |
| 443 ObjectSynchronizer::fast_enter(h_obj, lock, true, CHECK); | |
| 444 } else { | |
| 7226 | 445 if (GraalUseFastLocking) { |
| 7221 | 446 // When using fast locking, the compiled code has already tried the fast case |
| 447 ObjectSynchronizer::slow_enter(h_obj, lock, THREAD); | |
| 448 } else { | |
| 449 ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD); | |
| 450 } | |
| 451 } | |
| 452 if (TraceGraal >= 3) { | |
| 453 tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), obj); | |
| 454 } | |
| 455 JRT_END | |
| 456 | |
|
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
|
457 JRT_LEAF(void, GraalRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
| 7221 | 458 assert(thread == JavaThread::current(), "threads must correspond"); |
| 459 assert(thread->last_Java_sp(), "last_Java_sp must be set"); | |
| 460 // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown | |
| 461 EXCEPTION_MARK; | |
| 462 | |
| 463 #ifdef DEBUG | |
| 464 if (!obj->is_oop()) { | |
| 465 ResetNoHandleMark rhm; | |
| 466 nmethod* method = thread->last_frame().cb()->as_nmethod_or_null(); | |
| 467 if (method != NULL) { | |
| 468 tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), obj); | |
| 469 } | |
| 470 thread->print_stack_on(tty); | |
| 471 assert(false, "invalid lock object pointer dected"); | |
| 472 } | |
| 473 #endif | |
| 474 | |
| 7226 | 475 if (GraalUseFastLocking) { |
| 7221 | 476 // When using fast locking, the compiled code has already tried the fast case |
| 477 ObjectSynchronizer::slow_exit(obj, lock, THREAD); | |
| 478 } else { | |
| 479 ObjectSynchronizer::fast_exit(obj, lock, THREAD); | |
| 480 } | |
| 481 if (TraceGraal >= 3) { | |
| 482 char type[O_BUFLEN]; | |
| 483 obj->klass()->name()->as_C_string(type, O_BUFLEN); | |
| 484 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); | |
| 485 tty->flush(); | |
| 486 } | |
| 487 JRT_END | |
| 488 | |
|
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
|
489 JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oopDesc* obj, jint flags)) |
| 7221 | 490 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
|
491 bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); |
| 7221 | 492 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); |
| 493 if (!string) { | |
|
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
494 if (!addr && obj->is_oop_or_null(true)) { |
| 7221 | 495 char buf[O_BUFLEN]; |
|
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
496 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj); |
| 7221 | 497 } else { |
|
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
498 tty->print("%p", (address)obj); |
| 7221 | 499 } |
| 500 } else { | |
| 501 ResourceMark rm; | |
| 502 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); | |
| 503 char *buf = java_lang_String::as_utf8_string(obj); | |
| 504 tty->print(buf); | |
| 505 } | |
| 506 if (newline) { | |
| 507 tty->cr(); | |
| 508 } | |
| 509 JRT_END | |
| 510 | |
|
10434
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
511 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
|
512 thread->satb_mark_queue().enqueue(obj); |
|
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
513 JRT_END |
|
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
514 |
|
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
515 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
|
516 thread->dirty_card_queue().enqueue(card_addr); |
|
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
517 JRT_END |
|
8b22524df53b
Add G1 Barriers' foreign calls
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10072
diff
changeset
|
518 |
|
12356
359f7e70ae7f
Reduce HotSpot diff and fix previous merge
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
10953
diff
changeset
|
519 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
|
520 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
|
521 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
|
522 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
|
523 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
|
524 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
|
525 } |
|
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
526 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
|
527 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
|
528 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
|
529 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
|
530 } |
|
97e282186b5b
Add heap sanity checker with premature hard crash for debugging write barriers
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
10542
diff
changeset
|
531 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
|
532 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
|
533 |
|
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
|
534 JRT_ENTRY(void, GraalRuntime::vm_error(JavaThread* thread, jlong where, jlong format, jlong value)) |
| 7221 | 535 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
|
536 const char *error_msg = where == 0L ? "<internal Graal error>" : (char*) (address) where; |
| 7221 | 537 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
|
538 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
|
539 const char* buf = (char*) (address) format; |
| 7221 | 540 size_t detail_msg_length = strlen(buf) * 2; |
| 541 detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length); | |
| 542 jio_snprintf(detail_msg, detail_msg_length, buf, value); | |
| 543 } | |
| 544 report_vm_error(__FILE__, __LINE__, error_msg, detail_msg); | |
| 545 JRT_END | |
| 546 | |
|
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
|
547 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
|
548 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
|
549 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
|
550 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
|
551 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
|
552 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
|
553 JRT_END |
| 8506 | 554 |
|
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
|
555 JRT_LEAF(void, GraalRuntime::log_printf(JavaThread* thread, oopDesc* format, jlong v1, jlong v2, jlong v3)) |
| 7221 | 556 ResourceMark rm; |
| 557 assert(format != NULL && java_lang_String::is_instance(format), "must be"); | |
| 558 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
|
559 tty->print(buf, v1, v2, v3); |
| 7221 | 560 JRT_END |
| 561 | |
|
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
562 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
|
563 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
|
564 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
|
565 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
|
566 if (cb) { |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
567 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
|
568 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
|
569 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
|
570 return; |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
571 } |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
572 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
|
573 return; |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
574 } |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
575 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
|
576 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
|
577 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
|
578 return; |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
579 } |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
580 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
|
581 } |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
582 } |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
583 |
|
9471
5fa54bf57f8c
replaced exception_handler_nofpu assembler stub with a compiled stub (GRAAL-81)
Doug Simon <doug.simon@oracle.com>
parents:
9457
diff
changeset
|
584 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
|
585 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
|
586 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
|
587 if (vmError) { |
|
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
588 if (buf != NULL) { |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
589 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
|
590 } else { |
|
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
591 fatal("<anonymous error>"); |
|
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 } 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
|
594 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
|
595 } else { |
|
9573
a79e8020ad4b
added Stub.decipher() to print information about values in stubs
Doug Simon <doug.simon@oracle.com>
parents:
9565
diff
changeset
|
596 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
|
597 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
|
598 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
|
599 } |
|
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
|
600 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
|
601 |
|
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
|
602 JRT_ENTRY(void, GraalRuntime::log_primitive(JavaThread* thread, jchar typeChar, jlong value, jboolean newline)) |
| 7221 | 603 union { |
| 604 jlong l; | |
| 605 jdouble d; | |
| 606 jfloat f; | |
| 607 } uu; | |
| 608 uu.l = value; | |
| 609 switch (typeChar) { | |
| 610 case 'z': tty->print(value == 0 ? "false" : "true"); break; | |
| 611 case 'b': tty->print("%d", (jbyte) value); break; | |
| 612 case 'c': tty->print("%c", (jchar) value); break; | |
| 613 case 's': tty->print("%d", (jshort) value); break; | |
| 614 case 'i': tty->print("%d", (jint) value); break; | |
| 615 case 'f': tty->print("%f", uu.f); break; | |
| 616 case 'j': tty->print(INT64_FORMAT, value); break; | |
| 617 case 'd': tty->print("%lf", uu.d); break; | |
| 618 default: assert(false, "unknown typeChar"); break; | |
| 619 } | |
| 620 if (newline) { | |
| 621 tty->cr(); | |
| 622 } | |
| 623 JRT_END | |
| 624 | |
|
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
|
625 JRT_ENTRY(jint, GraalRuntime::identity_hash_code(JavaThread* thread, oopDesc* obj)) |
| 7221 | 626 return (jint) obj->identity_hash(); |
| 627 JRT_END | |
| 628 | |
|
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
|
629 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
|
630 // 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
|
631 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
|
632 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
|
633 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
|
634 if (receiverThread == NULL) { |
|
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
635 // 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
|
636 return JNI_FALSE; |
|
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
637 } else { |
|
682fba1bcf95
add missing null check in is_interrupted
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
13578
diff
changeset
|
638 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
|
639 } |
| 7221 | 640 JRT_END |
| 641 | |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
642 // 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
|
643 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
|
644 return GraalRuntime::get_HotSpotGraalRuntime_jobject(); |
| 7221 | 645 JVM_END |
|
10475
3489047ffea2
Restructure the handling of HotSpotInstalledCode and their link to nmethods.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
10434
diff
changeset
|
646 |
|
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
647 // 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
|
648 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
|
649 HandleMark hm; |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
650 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
|
651 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
|
652 JVM_END |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
653 |
|
15603
b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
Doug Simon <doug.simon@oracle.com>
parents:
15589
diff
changeset
|
654 // 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
|
655 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
|
656 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
|
657 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
|
658 |
|
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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 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
|
664 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
|
665 |
|
16628
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
666 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
|
667 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
|
668 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
|
669 fieldDescriptor fd; |
|
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
670 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
|
671 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
|
672 } |
|
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
673 |
|
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
674 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
|
675 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
|
676 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
|
677 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
|
678 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
|
679 } |
|
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
680 } |
|
d3fec84757ed
improved generated sources up-to-date check by using SHA1 digests
Doug Simon <doug.simon@oracle.com>
parents:
16580
diff
changeset
|
681 |
|
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
682 Handle GraalRuntime::get_HotSpotGraalRuntime() { |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
683 if (JNIHandles::resolve(_HotSpotGraalRuntime_instance) == NULL) { |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 _HotSpotGraalRuntime_instance = JNIHandles::make_global((oop) result.get_jobject()); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
693 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
694 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
|
695 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
696 |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
697 // 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
|
698 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
|
699 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
|
700 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
|
701 |
|
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
|
702 // 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
|
703 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
|
704 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
|
705 KlassHandle hotSpotOptionsClass(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(c))); |
|
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
|
706 return GraalRuntime::parse_arguments(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
|
707 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
|
708 |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
709 jint GraalRuntime::check_arguments(TRAPS) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
710 KlassHandle nullHandle; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
711 parse_arguments(nullHandle, THREAD); |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
712 if (HAS_PENDING_EXCEPTION) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
713 // 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
|
714 // 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
|
715 // 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
|
716 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
|
717 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
|
718 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
|
719 |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
720 parse_arguments(hotSpotOptionsClass, THREAD); |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
721 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
|
722 |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
723 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
|
724 Handle exception = PENDING_EXCEPTION; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
725 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
|
726 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
|
727 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
|
728 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
|
729 } 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
|
730 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
|
731 } |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
732 return JNI_ERR; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
733 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
734 return JNI_OK; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
735 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
736 |
|
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
|
737 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
|
738 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
|
739 |
|
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 // 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
|
741 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
|
742 |
|
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
|
743 // 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
|
744 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
|
745 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
|
746 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
|
747 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
|
748 } |
|
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
|
749 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
|
750 } |
|
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
|
751 |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
752 void GraalRuntime::check_required_value(const char* name, int name_len, const char* value, TRAPS) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
753 if (value == NULL) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
754 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
|
755 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
|
756 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
|
757 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
758 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
759 |
|
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
|
760 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
|
761 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
|
762 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
|
763 size_t name_len; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
764 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
|
765 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
|
766 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
|
767 name_len = strlen(name); |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
768 recognized = set_option(hotSpotOptionsClass, name, (int)name_len, arg, 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
|
769 } 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
|
770 char* sep = strchr(arg, '='); |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
771 name = arg; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
772 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
|
773 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
|
774 name_len = sep - name; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
775 value = sep + 1; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
776 } else { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
777 name_len = strlen(name); |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
778 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
779 recognized = set_option(hotSpotOptionsClass, name, (int)name_len, value, CHECK); |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
780 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
781 |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
782 if (!recognized) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
783 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
|
784 if (!hotSpotOptionsClass.is_null()) { |
|
16291
da8f16efaa4c
explicit conversion to (int), fixes Windows build
Christian Wirth <christian.wirth@oracle.com>
parents:
16275
diff
changeset
|
785 set_option_helper(hotSpotOptionsClass, name, (int)name_len, Handle(), ' ', Handle(), 0L); |
|
16275
7af7db0bbfe9
handle unwinding exception through recursive call properly
Doug Simon <doug.simon@oracle.com>
parents:
16274
diff
changeset
|
786 if (!HAS_PENDING_EXCEPTION) { |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
787 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
|
788 } |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
789 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
790 |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
791 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
|
792 char buf[200]; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
793 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
|
794 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
|
795 } |
|
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
|
796 } |
|
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
|
797 } |
|
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 |
|
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 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
|
800 const char* home = Arguments::get_java_home(); |
|
15894
a9810ed7cad2
explicit conversion to int, fixes windows build
Christian Wirth <christian.wirth@oracle.com>
parents:
15870
diff
changeset
|
801 int path_len = (int)strlen(home) + (int)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
|
802 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
|
803 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
|
804 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
|
805 |
|
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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 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
|
813 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
|
814 } 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
|
815 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
|
816 } |
|
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
|
817 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
|
818 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
|
819 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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 *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
|
825 } |
|
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 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
|
827 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
|
828 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
|
829 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
|
830 } |
|
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
|
831 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
|
832 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
|
833 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
|
834 } 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
|
835 // 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
|
836 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
|
837 } |
|
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 } |
|
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
|
839 } |
|
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 } 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
|
841 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
|
842 } |
|
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 } |
|
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 |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
846 jlong GraalRuntime::parse_primitive_option_value(char spec, const char* name, int name_len, const char* value, TRAPS) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
847 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
|
848 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
|
849 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
|
850 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
|
851 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
|
852 } 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
|
853 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
|
854 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
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 } |
|
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 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
|
862 } |
|
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 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
|
864 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
|
865 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
|
866 } |
|
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 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
|
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 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
|
870 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
|
871 } |
|
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 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
|
873 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
|
874 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
|
875 if (missing) { |
|
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
876 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
|
877 } else { |
|
60c3f610183e
separate error messages for missing versus invalid non-String option values
Doug Simon <doug.simon@oracle.com>
parents:
16273
diff
changeset
|
878 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
|
879 } |
|
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
|
880 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
|
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 |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
883 void GraalRuntime::set_option_helper(KlassHandle hotSpotOptionsClass, char* name, int 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
|
884 Thread* THREAD = Thread::current(); |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
885 Handle name_handle; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
886 if (name != NULL) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
887 if ((int) strlen(name) > name_len) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
888 // 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
|
889 char save = name[name_len]; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
890 name[name_len] = '\0'; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
891 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
|
892 name[name_len] = '='; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
893 if (HAS_PENDING_EXCEPTION) { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
894 return; |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
895 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
896 } else { |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
897 assert((int) strlen(name) == name_len, "must be"); |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
898 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
|
899 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
900 } |
|
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
901 |
|
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
|
902 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
|
903 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
|
904 JavaValue result(T_VOID); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
905 JavaCallArguments args; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
906 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
|
907 args.push_oop(option()); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
908 args.push_int(spec); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
909 args.push_oop(stringValue()); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
910 args.push_long(primitiveValue); |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
911 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
|
912 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
913 |
|
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
|
914 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
|
915 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
|
916 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
|
917 |
|
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 // 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
|
919 // 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
|
920 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
|
921 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
|
922 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
|
923 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
|
924 } |
|
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
|
925 // 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
|
926 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
|
927 |
|
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
|
928 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
|
929 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
|
930 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
|
931 } |
|
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
|
932 |
|
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
|
933 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
|
934 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
|
935 } |
|
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
|
936 |
|
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
937 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
|
938 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
|
939 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
|
940 instanceKlassHandle klass(THREAD, k); |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
941 klass->initialize(CHECK_NH); |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
942 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
|
943 JavaValue result(T_VOID); |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
944 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
|
945 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
|
946 return service; |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
947 } |
|
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
948 |
|
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
949 void GraalRuntime::shutdown() { |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
950 if (_HotSpotGraalRuntime_instance != NULL) { |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
951 JavaThread* THREAD = JavaThread::current(); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
952 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
|
953 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
|
954 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
|
955 JavaValue result(T_VOID); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
956 JavaCallArguments args; |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
957 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
|
958 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
|
959 |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
960 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
|
961 _HotSpotGraalRuntime_instance = NULL; |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
962 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
963 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
964 |
|
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
|
965 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
|
966 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
|
967 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
|
968 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
|
969 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
|
970 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
|
971 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
|
972 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
|
973 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
|
974 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
|
975 } |
|
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
|
976 |
|
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 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
|
978 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
|
979 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
|
980 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
|
981 |
|
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
|
982 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
|
983 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
|
984 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
|
985 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
|
986 } |
|
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
987 |
|
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
988 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
|
989 Thread* THREAD = Thread::current(); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
990 CLEAR_PENDING_EXCEPTION; |
|
16270
d56a09df1a1f
implemented eager checking of Graal options (GRAAL-807)
Doug Simon <doug.simon@oracle.com>
parents:
16006
diff
changeset
|
991 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
|
992 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
|
993 |
|
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
994 // 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
|
995 // 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
|
996 // failures. |
|
58622d6b1097
give all aborting threads a chance to print Graal related stack traces
Doug Simon <doug.simon@oracle.com>
parents:
16628
diff
changeset
|
997 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
|
998 |
|
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
999 vm_abort(dump_core); |
|
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 |
|
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
|
1002 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
|
1003 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
|
1004 } |
|
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1005 |
|
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1006 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
|
1007 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
|
1008 } |
|
ad431bf0de07
added support to load classes from graal.jar with a separate class loader
Doug Simon <doug.simon@oracle.com>
parents:
16291
diff
changeset
|
1009 |
|
16006
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1010 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
|
1011 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
|
1012 if (klass == NULL) { |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1013 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
|
1014 vm_abort(false); |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1015 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1016 return klass; |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1017 } |
|
66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
Doug Simon <doug.simon@oracle.com>
parents:
15916
diff
changeset
|
1018 |
|
15916
6aa352b260f4
removed use of ServiceLoader in runtime initialization
Doug Simon <doug.simon@oracle.com>
parents:
15894
diff
changeset
|
1019 #include "graalRuntime.inline.hpp" |