Mercurial > hg > graal-compiler
annotate src/share/vm/jvmci/jvmciRuntime.cpp @ 22054:0e095e2c24e2
Rename com.oracle.jvmci to jdk.internal.jvmci
author | twisti |
---|---|
date | Mon, 22 Jun 2015 12:12:53 -0700 |
parents | 1e0012efac83 |
children |
rev | line source |
---|---|
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1 /* |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
2 * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
4 * |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
5 * This code is free software; you can redistribute it and/or modify it |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
6 * under the terms of the GNU General Public License version 2 only, as |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
7 * published by the Free Software Foundation. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
8 * |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
9 * This code is distributed in the hope that it will be useful, but WITHOUT |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
12 * version 2 for more details (a copy is included in the LICENSE file that |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
13 * accompanied this code). |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
14 * |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
15 * You should have received a copy of the GNU General Public License version |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
16 * 2 along with this work; if not, write to the Free Software Foundation, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
18 * |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
21 * questions. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
22 */ |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
23 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
24 #include "precompiled.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
25 #include "asm/codeBuffer.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
26 #include "compiler/compileBroker.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
27 #include "compiler/disassembler.hpp" |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
28 #include "jvmci/jvmciRuntime.hpp" |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
29 #include "jvmci/jvmciCompilerToVM.hpp" |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
30 #include "jvmci/jvmciCompiler.hpp" |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
31 #include "jvmci/jvmciJavaAccess.hpp" |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
32 #include "jvmci/jvmciEnv.hpp" |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
33 #include "memory/oopFactory.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
34 #include "prims/jvm.h" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
35 #include "runtime/biasedLocking.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
36 #include "runtime/interfaceSupport.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
37 #include "runtime/reflection.hpp" |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
38 #include "utilities/debug.hpp" |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
39 #include "utilities/defaultStream.hpp" |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
40 |
21587
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
41 #if defined(_MSC_VER) |
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
42 #define strtoll _strtoi64 |
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
43 #endif |
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
44 |
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
45 jobject JVMCIRuntime::_HotSpotJVMCIRuntime_instance = NULL; |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
46 bool JVMCIRuntime::_HotSpotJVMCIRuntime_initialized = false; |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
47 bool JVMCIRuntime::_shutdown_called = false; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
48 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
49 void JVMCIRuntime::initialize_natives(JNIEnv *env, jclass c2vmClass) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
50 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
51 uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
52 AMD64_ONLY(guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)")); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
53 NOT_LP64(error("check TLAB allocation code for address space conflicts")); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
54 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
55 ensure_jvmci_class_loader_is_initialized(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
56 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
57 JavaThread* THREAD = JavaThread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
58 { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
59 ThreadToNativeFromVM trans(THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
60 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
61 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
62 HandleMark hm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
63 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
64 jvmci_compute_offsets(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
65 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
66 // Ensure _non_oop_bits is initialized |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
67 Universe::non_oop_word(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
68 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
69 env->RegisterNatives(c2vmClass, CompilerToVM_methods, CompilerToVM_methods_count()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
70 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
71 if (HAS_PENDING_EXCEPTION) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
72 abort_on_pending_exception(PENDING_EXCEPTION, "Could not register natives"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
73 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
74 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
75 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
76 BufferBlob* JVMCIRuntime::initialize_buffer_blob() { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
77 JavaThread* THREAD = JavaThread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
78 BufferBlob* buffer_blob = THREAD->get_buffer_blob(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
79 if (buffer_blob == NULL) { |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
80 buffer_blob = BufferBlob::create("JVMCI thread-local CodeBuffer", JVMCINMethodSizeLimit); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
81 if (buffer_blob != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
82 THREAD->set_buffer_blob(buffer_blob); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
83 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
84 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
85 return buffer_blob; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
86 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
87 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
88 BasicType JVMCIRuntime::kindToBasicType(jchar ch) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
89 switch(ch) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
90 case 'z': return T_BOOLEAN; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
91 case 'b': return T_BYTE; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
92 case 's': return T_SHORT; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
93 case 'c': return T_CHAR; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
94 case 'i': return T_INT; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
95 case 'f': return T_FLOAT; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
96 case 'j': return T_LONG; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
97 case 'd': return T_DOUBLE; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
98 case 'a': return T_OBJECT; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
99 case '-': return T_ILLEGAL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
100 default: |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
101 fatal(err_msg("unexpected Kind: %c", ch)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
102 break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
103 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
104 return T_ILLEGAL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
105 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
106 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
107 // Simple helper to see if the caller of a runtime stub which |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
108 // entered the VM has been deoptimized |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
109 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
110 static bool caller_is_deopted() { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
111 JavaThread* thread = JavaThread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
112 RegisterMap reg_map(thread, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
113 frame runtime_frame = thread->last_frame(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
114 frame caller_frame = runtime_frame.sender(®_map); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
115 assert(caller_frame.is_compiled_frame(), "must be compiled"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
116 return caller_frame.is_deoptimized_frame(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
117 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
118 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
119 // Stress deoptimization |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
120 static void deopt_caller() { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
121 if ( !caller_is_deopted()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
122 JavaThread* thread = JavaThread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
123 RegisterMap reg_map(thread, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
124 frame runtime_frame = thread->last_frame(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
125 frame caller_frame = runtime_frame.sender(®_map); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
126 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
127 assert(caller_is_deopted(), "Must be deoptimized"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
128 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
129 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
130 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
131 JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance(JavaThread* thread, Klass* klass)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
132 JRT_BLOCK; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
133 assert(klass->is_klass(), "not a class"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
134 instanceKlassHandle h(thread, klass); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
135 h->check_valid_for_instantiation(true, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
136 // make sure klass is initialized |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
137 h->initialize(CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
138 // allocate instance and return via TLS |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
139 oop obj = h->allocate_instance(CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
140 thread->set_vm_result(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
141 JRT_BLOCK_END; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
142 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
143 if (JVMCIDeferredInitBarriers) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
144 new_store_pre_barrier(thread); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
145 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
146 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
147 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
148 JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array(JavaThread* thread, Klass* array_klass, jint length)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
149 JRT_BLOCK; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
150 // Note: no handle for klass needed since they are not used |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
151 // anymore after new_objArray() and no GC can happen before. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
152 // (This may have to change if this code changes!) |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
153 assert(array_klass->is_klass(), "not a class"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
154 oop obj; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
155 if (array_klass->oop_is_typeArray()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
156 BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
157 obj = oopFactory::new_typeArray(elt_type, length, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
158 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
159 Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
160 obj = oopFactory::new_objArray(elem_klass, length, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
161 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
162 thread->set_vm_result(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
163 // This is pretty rare but this runtime patch is stressful to deoptimization |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
164 // if we deoptimize here so force a deopt to stress the path. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
165 if (DeoptimizeALot) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
166 static int deopts = 0; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
167 // Alternate between deoptimizing and raising an error (which will also cause a deopt) |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
168 if (deopts++ % 2 == 0) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
169 ResourceMark rm(THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
170 THROW(vmSymbols::java_lang_OutOfMemoryError()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
171 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
172 deopt_caller(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
173 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
174 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
175 JRT_BLOCK_END; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
176 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
177 if (JVMCIDeferredInitBarriers) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
178 new_store_pre_barrier(thread); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
179 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
180 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
181 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
182 void JVMCIRuntime::new_store_pre_barrier(JavaThread* thread) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
183 // After any safepoint, just before going back to compiled code, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
184 // we inform the GC that we will be doing initializing writes to |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
185 // this object in the future without emitting card-marks, so |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
186 // GC may take any compensating steps. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
187 // NOTE: Keep this code consistent with GraphKit::store_barrier. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
188 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
189 oop new_obj = thread->vm_result(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
190 if (new_obj == NULL) return; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
191 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
192 assert(Universe::heap()->can_elide_tlab_store_barriers(), |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
193 "compiler must check this first"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
194 // GC may decide to give back a safer copy of new_obj. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
195 new_obj = Universe::heap()->new_store_pre_barrier(thread, new_obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
196 thread->set_vm_result(new_obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
197 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
198 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
199 JRT_ENTRY(void, JVMCIRuntime::new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
200 assert(klass->is_klass(), "not a class"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
201 assert(rank >= 1, "rank must be nonzero"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
202 oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
203 thread->set_vm_result(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
204 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
205 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
206 JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array(JavaThread* thread, oopDesc* element_mirror, jint length)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
207 oop obj = Reflection::reflect_new_array(element_mirror, length, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
208 thread->set_vm_result(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
209 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
210 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
211 JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance(JavaThread* thread, oopDesc* type_mirror)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
212 instanceKlassHandle klass(THREAD, java_lang_Class::as_Klass(type_mirror)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
213 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
214 if (klass == NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
215 ResourceMark rm(THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
216 THROW(vmSymbols::java_lang_InstantiationException()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
217 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
218 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
219 // Create new instance (the receiver) |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
220 klass->check_valid_for_instantiation(false, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
221 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
222 // Make sure klass gets initialized |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
223 klass->initialize(CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
224 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
225 oop obj = klass->allocate_instance(CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
226 thread->set_vm_result(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
227 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
228 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
229 extern void vm_exit(int code); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
230 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
231 // Enter this method from compiled code handler below. This is where we transition |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
232 // to VM mode. This is done as a helper routine so that the method called directly |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
233 // from compiled code does not have to transition to VM. This allows the entry |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
234 // method to see if the nmethod that we have just looked up a handler for has |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
235 // been deoptimized while we were in the vm. This simplifies the assembly code |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
236 // cpu directories. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
237 // |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
238 // We are entering here from exception stub (via the entry method below) |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
239 // If there is a compiled exception handler in this method, we will continue there; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
240 // otherwise we will unwind the stack and continue at the caller of top frame method |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
241 // Note: we enter in Java using a special JRT wrapper. This wrapper allows us to |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
242 // control the area where we can allow a safepoint. After we exit the safepoint area we can |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
243 // check to see if the handler we are going to return is now in a nmethod that has |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
244 // been deoptimized. If that is the case we return the deopt blob |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
245 // unpack_with_exception entry instead. This makes life for the exception blob easier |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
246 // because making that same check and diverting is painful from assembly language. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
247 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* thread, oopDesc* ex, address pc, nmethod*& nm)) |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
248 // Reset method handle flag. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
249 thread->set_is_method_handle_return(false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
250 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
251 Handle exception(thread, ex); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
252 nm = CodeCache::find_nmethod(pc); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
253 assert(nm != NULL, "this is not an nmethod"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
254 // Adjust the pc as needed/ |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
255 if (nm->is_deopt_pc(pc)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
256 RegisterMap map(thread, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
257 frame exception_frame = thread->last_frame().sender(&map); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
258 // if the frame isn't deopted then pc must not correspond to the caller of last_frame |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
259 assert(exception_frame.is_deoptimized_frame(), "must be deopted"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
260 pc = exception_frame.pc(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
261 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
262 #ifdef ASSERT |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
263 assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
264 assert(exception->is_oop(), "just checking"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
265 // Check that exception is a subclass of Throwable, otherwise we have a VerifyError |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
266 if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
267 if (ExitVMOnVerifyError) vm_exit(-1); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
268 ShouldNotReachHere(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
269 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
270 #endif |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
271 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
272 // Check the stack guard pages and reenable them if necessary and there is |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
273 // enough space on the stack to do so. Use fast exceptions only if the guard |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
274 // pages are enabled. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
275 bool guard_pages_enabled = thread->stack_yellow_zone_enabled(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
276 if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
277 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
278 if (JvmtiExport::can_post_on_exceptions()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
279 // To ensure correct notification of exception catches and throws |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
280 // we have to deoptimize here. If we attempted to notify the |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
281 // catches and throws during this exception lookup it's possible |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
282 // we could deoptimize on the way out of the VM and end back in |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
283 // the interpreter at the throw site. This would result in double |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
284 // notifications since the interpreter would also notify about |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
285 // these same catches and throws as it unwound the frame. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
286 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
287 RegisterMap reg_map(thread); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
288 frame stub_frame = thread->last_frame(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
289 frame caller_frame = stub_frame.sender(®_map); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
290 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
291 // We don't really want to deoptimize the nmethod itself since we |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
292 // can actually continue in the exception handler ourselves but I |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
293 // don't see an easy way to have the desired effect. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
294 Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
295 assert(caller_is_deopted(), "Must be deoptimized"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
296 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
297 return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
298 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
299 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
300 // ExceptionCache is used only for exceptions at call sites and not for implicit exceptions |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
301 if (guard_pages_enabled) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
302 address fast_continuation = nm->handler_for_exception_and_pc(exception, pc); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
303 if (fast_continuation != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
304 // Set flag if return address is a method handle call site. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
305 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
306 return fast_continuation; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
307 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
308 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
309 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
310 // If the stack guard pages are enabled, check whether there is a handler in |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
311 // the current method. Otherwise (guard pages disabled), force an unwind and |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
312 // skip the exception cache update (i.e., just leave continuation==NULL). |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
313 address continuation = NULL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
314 if (guard_pages_enabled) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
315 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
316 // New exception handling mechanism can support inlined methods |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
317 // with exception handlers since the mappings are from PC to PC |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
318 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
319 // debugging support |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
320 // tracing |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
321 if (TraceExceptions) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
322 ttyLocker ttyl; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
323 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
324 tty->print_cr("Exception <%s> (" INTPTR_FORMAT ") thrown in compiled method <%s> at PC " INTPTR_FORMAT " for thread " INTPTR_FORMAT "", |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
325 exception->print_value_string(), p2i((address)exception()), nm->method()->print_value_string(), p2i(pc), p2i(thread)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
326 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
327 // for AbortVMOnException flag |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
328 NOT_PRODUCT(Exceptions::debug_check_abort(exception)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
329 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
330 // Clear out the exception oop and pc since looking up an |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
331 // exception handler can cause class loading, which might throw an |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
332 // exception and those fields are expected to be clear during |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
333 // normal bytecode execution. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
334 thread->clear_exception_oop_and_pc(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
335 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
336 continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
337 // If an exception was thrown during exception dispatch, the exception oop may have changed |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
338 thread->set_exception_oop(exception()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
339 thread->set_exception_pc(pc); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
340 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
341 // the exception cache is used only by non-implicit exceptions |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
342 if (continuation != NULL && !SharedRuntime::deopt_blob()->contains(continuation)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
343 nm->add_handler_for_exception_and_pc(exception, pc, continuation); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
344 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
345 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
346 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
347 // Set flag if return address is a method handle call site. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
348 thread->set_is_method_handle_return(nm->is_method_handle_return(pc)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
349 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
350 if (TraceExceptions) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
351 ttyLocker ttyl; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
352 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
353 tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
354 p2i(thread), p2i(continuation), p2i(pc)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
355 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
356 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
357 return continuation; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
358 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
359 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
360 // Enter this method from compiled code only if there is a Java exception handler |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
361 // in the method handling the exception. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
362 // We are entering here from exception stub. We don't do a normal VM transition here. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
363 // We do it in a helper. This is so we can check to see if the nmethod we have just |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
364 // searched for an exception handler has been deoptimized in the meantime. |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
365 address JVMCIRuntime::exception_handler_for_pc(JavaThread* thread) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
366 oop exception = thread->exception_oop(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
367 address pc = thread->exception_pc(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
368 // Still in Java mode |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
369 DEBUG_ONLY(ResetNoHandleMark rnhm); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
370 nmethod* nm = NULL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
371 address continuation = NULL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
372 { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
373 // Enter VM mode by calling the helper |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
374 ResetNoHandleMark rnhm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
375 continuation = exception_handler_for_pc_helper(thread, exception, pc, nm); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
376 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
377 // Back in JAVA, use no oops DON'T safepoint |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
378 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
379 // Now check to see if the nmethod we were called from is now deoptimized. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
380 // If so we must return to the deopt blob and deoptimize the nmethod |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
381 if (nm != NULL && caller_is_deopted()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
382 continuation = SharedRuntime::deopt_blob()->unpack_with_exception_in_tls(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
383 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
384 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
385 assert(continuation != NULL, "no handler found"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
386 return continuation; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
387 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
388 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
389 JRT_ENTRY(void, JVMCIRuntime::create_null_exception(JavaThread* thread)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
390 SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_NullPointerException()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
391 thread->set_vm_result(PENDING_EXCEPTION); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
392 CLEAR_PENDING_EXCEPTION; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
393 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
394 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
395 JRT_ENTRY(void, JVMCIRuntime::create_out_of_bounds_exception(JavaThread* thread, jint index)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
396 char message[jintAsStringSize]; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
397 sprintf(message, "%d", index); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
398 SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
399 thread->set_vm_result(PENDING_EXCEPTION); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
400 CLEAR_PENDING_EXCEPTION; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
401 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
402 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
403 JRT_ENTRY_NO_ASYNC(void, JVMCIRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
404 if (TraceJVMCI >= 3) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
405 char type[O_BUFLEN]; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
406 obj->klass()->name()->as_C_string(type, O_BUFLEN); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
407 markOop mark = obj->mark(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
408 tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
409 tty->flush(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
410 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
411 #ifdef ASSERT |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
412 if (PrintBiasedLockingStatistics) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
413 Atomic::inc(BiasedLocking::slow_path_entry_count_addr()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
414 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
415 #endif |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
416 Handle h_obj(thread, obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
417 assert(h_obj()->is_oop(), "must be NULL or an object"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
418 if (UseBiasedLocking) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
419 // Retry fast entry if bias is revoked to avoid unnecessary inflation |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
420 ObjectSynchronizer::fast_enter(h_obj, lock, true, CHECK); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
421 } else { |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
422 if (JVMCIUseFastLocking) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
423 // When using fast locking, the compiled code has already tried the fast case |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
424 ObjectSynchronizer::slow_enter(h_obj, lock, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
425 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
426 ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
427 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
428 } |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
429 if (TraceJVMCI >= 3) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
430 tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
431 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
432 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
433 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
434 JRT_LEAF(void, JVMCIRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
435 assert(thread == JavaThread::current(), "threads must correspond"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
436 assert(thread->last_Java_sp(), "last_Java_sp must be set"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
437 // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
438 EXCEPTION_MARK; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
439 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
440 #ifdef DEBUG |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
441 if (!obj->is_oop()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
442 ResetNoHandleMark rhm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
443 nmethod* method = thread->last_frame().cb()->as_nmethod_or_null(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
444 if (method != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
445 tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), p2i(obj)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
446 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
447 thread->print_stack_on(tty); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
448 assert(false, "invalid lock object pointer dected"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
449 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
450 #endif |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
451 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
452 if (JVMCIUseFastLocking) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
453 // When using fast locking, the compiled code has already tried the fast case |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
454 ObjectSynchronizer::slow_exit(obj, lock, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
455 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
456 ObjectSynchronizer::fast_exit(obj, lock, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
457 } |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
458 if (TraceJVMCI >= 3) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
459 char type[O_BUFLEN]; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
460 obj->klass()->name()->as_C_string(type, O_BUFLEN); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
461 tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
462 tty->flush(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
463 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
464 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
465 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
466 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, jint flags)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
467 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
468 bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
469 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
470 if (!string) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
471 if (!addr && obj->is_oop_or_null(true)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
472 char buf[O_BUFLEN]; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
473 tty->print("%s@" INTPTR_FORMAT, obj->klass()->name()->as_C_string(buf, O_BUFLEN), p2i(obj)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
474 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
475 tty->print(INTPTR_FORMAT, p2i(obj)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
476 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
477 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
478 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
479 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
480 char *buf = java_lang_String::as_utf8_string(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
481 tty->print_raw(buf); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
482 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
483 if (newline) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
484 tty->cr(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
485 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
486 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
487 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
488 JRT_LEAF(void, JVMCIRuntime::write_barrier_pre(JavaThread* thread, oopDesc* obj)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
489 thread->satb_mark_queue().enqueue(obj); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
490 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
491 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
492 JRT_LEAF(void, JVMCIRuntime::write_barrier_post(JavaThread* thread, void* card_addr)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
493 thread->dirty_card_queue().enqueue(card_addr); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
494 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
495 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
496 JRT_LEAF(jboolean, JVMCIRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
497 bool ret = true; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
498 if(!Universe::heap()->is_in_closed_subset(parent)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
499 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", p2i(parent)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
500 parent->print(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
501 ret=false; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
502 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
503 if(!Universe::heap()->is_in_closed_subset(child)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
504 tty->print_cr("Child Object "INTPTR_FORMAT" not in heap", p2i(child)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
505 child->print(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
506 ret=false; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
507 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
508 return (jint)ret; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
509 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
510 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
511 JRT_ENTRY(void, JVMCIRuntime::vm_error(JavaThread* thread, jlong where, jlong format, jlong value)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
512 ResourceMark rm; |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
513 const char *error_msg = where == 0L ? "<internal JVMCI error>" : (char*) (address) where; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
514 char *detail_msg = NULL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
515 if (format != 0L) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
516 const char* buf = (char*) (address) format; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
517 size_t detail_msg_length = strlen(buf) * 2; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
518 detail_msg = (char *) NEW_RESOURCE_ARRAY(u_char, detail_msg_length); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
519 jio_snprintf(detail_msg, detail_msg_length, buf, value); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
520 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
521 report_vm_error(__FILE__, __LINE__, error_msg, detail_msg); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
522 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
523 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
524 JRT_LEAF(oopDesc*, JVMCIRuntime::load_and_clear_exception(JavaThread* thread)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
525 oop exception = thread->exception_oop(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
526 assert(exception != NULL, "npe"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
527 thread->set_exception_oop(NULL); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
528 thread->set_exception_pc(0); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
529 return exception; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
530 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
531 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
532 JRT_LEAF(void, JVMCIRuntime::log_printf(JavaThread* thread, oopDesc* format, jlong v1, jlong v2, jlong v3)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
533 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
534 assert(format != NULL && java_lang_String::is_instance(format), "must be"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
535 char *buf = java_lang_String::as_utf8_string(format); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
536 tty->print(buf, v1, v2, v3); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
537 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
538 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
539 static void decipher(jlong v, bool ignoreZero) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
540 if (v != 0 || !ignoreZero) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
541 void* p = (void *)(address) v; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
542 CodeBlob* cb = CodeCache::find_blob(p); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
543 if (cb) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
544 if (cb->is_nmethod()) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
545 char buf[O_BUFLEN]; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
546 tty->print("%s [" INTPTR_FORMAT "+" JLONG_FORMAT "]", cb->as_nmethod_or_null()->method()->name_and_sig_as_C_string(buf, O_BUFLEN), p2i(cb->code_begin()), (jlong)((address)v - cb->code_begin())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
547 return; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
548 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
549 cb->print_value_on(tty); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
550 return; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
551 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
552 if (Universe::heap()->is_in(p)) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
553 oop obj = oop(p); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
554 obj->print_value_on(tty); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
555 return; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
556 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
557 tty->print(INTPTR_FORMAT " [long: " JLONG_FORMAT ", double %lf, char %c]",p2i((void *)v), (jlong)v, (jdouble)v, (char)v); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
558 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
559 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
560 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
561 JRT_LEAF(void, JVMCIRuntime::vm_message(jboolean vmError, jlong format, jlong v1, jlong v2, jlong v3)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
562 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
563 char *buf = (char*) (address) format; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
564 if (vmError) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
565 if (buf != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
566 fatal(err_msg(buf, v1, v2, v3)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
567 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
568 fatal("<anonymous error>"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
569 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
570 } else if (buf != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
571 tty->print(buf, v1, v2, v3); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
572 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
573 assert(v2 == 0, "v2 != 0"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
574 assert(v3 == 0, "v3 != 0"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
575 decipher(v1, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
576 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
577 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
578 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
579 JRT_LEAF(void, JVMCIRuntime::log_primitive(JavaThread* thread, jchar typeChar, jlong value, jboolean newline)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
580 union { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
581 jlong l; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
582 jdouble d; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
583 jfloat f; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
584 } uu; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
585 uu.l = value; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
586 switch (typeChar) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
587 case 'z': tty->print(value == 0 ? "false" : "true"); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
588 case 'b': tty->print("%d", (jbyte) value); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
589 case 'c': tty->print("%c", (jchar) value); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
590 case 's': tty->print("%d", (jshort) value); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
591 case 'i': tty->print("%d", (jint) value); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
592 case 'f': tty->print("%f", uu.f); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
593 case 'j': tty->print(JLONG_FORMAT, value); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
594 case 'd': tty->print("%lf", uu.d); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
595 default: assert(false, "unknown typeChar"); break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
596 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
597 if (newline) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
598 tty->cr(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
599 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
600 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
601 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
602 JRT_ENTRY(jint, JVMCIRuntime::identity_hash_code(JavaThread* thread, oopDesc* obj)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
603 return (jint) obj->identity_hash(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
604 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
605 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
606 JRT_ENTRY(jboolean, JVMCIRuntime::thread_is_interrupted(JavaThread* thread, oopDesc* receiver, jboolean clear_interrupted)) |
21207
93dc70e47fb0
documented why THREAD_IS_INTERRUPTED foreign call is NOT_LEAF
Doug Simon <doug.simon@oracle.com>
parents:
21123
diff
changeset
|
607 // Ensure that the C++ Thread and OSThread structures aren't freed before we operate. |
93dc70e47fb0
documented why THREAD_IS_INTERRUPTED foreign call is NOT_LEAF
Doug Simon <doug.simon@oracle.com>
parents:
21123
diff
changeset
|
608 // This locking requires thread_in_vm which is why this method cannot be JRT_LEAF. |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
609 Handle receiverHandle(thread, receiver); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
610 MutexLockerEx ml(thread->threadObj() == (void*)receiver ? NULL : Threads_lock); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
611 JavaThread* receiverThread = java_lang_Thread::thread(receiverHandle()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
612 if (receiverThread == NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
613 // The other thread may exit during this process, which is ok so return false. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
614 return JNI_FALSE; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
615 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
616 return (jint) Thread::is_interrupted(receiverThread, clear_interrupted != 0); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
617 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
618 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
619 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
620 JRT_ENTRY(jint, JVMCIRuntime::test_deoptimize_call_int(JavaThread* thread, int value)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
621 deopt_caller(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
622 return value; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
623 JRT_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
624 |
21607
71b338926f2e
moved JVMCI classes into their own distributions (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21605
diff
changeset
|
625 // private static void JVMCIClassLoaderFactory.init() |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
626 JVM_ENTRY(void, JVM_InitJVMCIClassLoader(JNIEnv *env, jclass c, jobject loader_handle)) |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
627 SystemDictionary::init_jvmci_loader(JNIHandles::resolve(loader_handle)); |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
628 SystemDictionary::WKID scan = SystemDictionary::FIRST_JVMCI_WKID; |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
629 SystemDictionary::initialize_wk_klasses_through(SystemDictionary::LAST_JVMCI_WKID, scan, CHECK); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
630 JVM_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
631 |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
632 // private static JVMCIRuntime JVMCI.initializeRuntime() |
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
633 JVM_ENTRY(jobject, JVM_GetJVMCIRuntime(JNIEnv *env, jclass c)) |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
634 JVMCIRuntime::initialize_HotSpotJVMCIRuntime(); |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
635 return JVMCIRuntime::get_HotSpotJVMCIRuntime_jobject(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
636 JVM_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
637 |
21563
4f63449b4422
revived post option parsing handler notification
Doug Simon <doug.simon@oracle.com>
parents:
21562
diff
changeset
|
638 // private static Service[] Services.getServiceImpls(String serviceClass) |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
639 JVM_ENTRY(jobject, JVM_GetJVMCIServiceImpls(JNIEnv *env, jclass c, jclass serviceClass)) |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
640 HandleMark hm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
641 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
642 KlassHandle serviceKlass(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(serviceClass))); |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
643 return JNIHandles::make_local(THREAD, JVMCIRuntime::get_service_impls(serviceKlass, THREAD)()); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
644 JVM_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
645 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
646 Handle JVMCIRuntime::callInitializer(const char* className, const char* methodName, const char* returnType) { |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
647 guarantee(!_HotSpotJVMCIRuntime_initialized, "cannot reinitialize HotSpotJVMCIRuntime"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
648 Thread* THREAD = Thread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
649 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
650 TempNewSymbol name = SymbolTable::new_symbol(className, CHECK_ABORT_(Handle())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
651 KlassHandle klass = load_required_class(name); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
652 TempNewSymbol runtime = SymbolTable::new_symbol(methodName, CHECK_ABORT_(Handle())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
653 TempNewSymbol sig = SymbolTable::new_symbol(returnType, CHECK_ABORT_(Handle())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
654 JavaValue result(T_OBJECT); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
655 JavaCalls::call_static(&result, klass, runtime, sig, CHECK_ABORT_(Handle())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
656 return Handle((oop)result.get_jobject()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
657 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
658 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
659 void JVMCIRuntime::initialize_HotSpotJVMCIRuntime() { |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
660 if (JNIHandles::resolve(_HotSpotJVMCIRuntime_instance) == NULL) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
661 #ifdef ASSERT |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
662 // This should only be called in the context of the JVMCI class being initialized |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
663 Thread* THREAD = Thread::current(); |
22054 | 664 TempNewSymbol name = SymbolTable::new_symbol("jdk/internal/jvmci/runtime/JVMCI", CHECK_ABORT); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
665 instanceKlassHandle klass = InstanceKlass::cast(load_required_class(name)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
666 assert(klass->is_being_initialized() && klass->is_reentrant_initialization(THREAD), |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
667 "HotSpotJVMCIRuntime initialization should only be triggered through JVMCI initialization"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
668 #endif |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
669 |
22054 | 670 Handle result = callInitializer("jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime", "runtime", |
671 "()Ljdk/internal/jvmci/hotspot/HotSpotJVMCIRuntime;"); | |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
672 _HotSpotJVMCIRuntime_initialized = true; |
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
673 _HotSpotJVMCIRuntime_instance = JNIHandles::make_global(result()); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
674 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
675 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
676 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
677 void JVMCIRuntime::initialize_JVMCI() { |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
678 if (JNIHandles::resolve(_HotSpotJVMCIRuntime_instance) == NULL) { |
22054 | 679 callInitializer("jdk/internal/jvmci/runtime/JVMCI", "getRuntime", "()Ljdk/internal/jvmci/runtime/JVMCIRuntime;"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
680 } |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
681 assert(_HotSpotJVMCIRuntime_initialized == true, "what?"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
682 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
683 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
684 // private static void CompilerToVMImpl.init() |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
685 JVM_ENTRY(void, JVM_InitializeJVMCINatives(JNIEnv *env, jclass c2vmClass)) |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
686 JVMCIRuntime::initialize_natives(env, c2vmClass); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
687 JVM_END |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
688 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
689 void JVMCIRuntime::ensure_jvmci_class_loader_is_initialized() { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
690 // This initialization code is guarded by a static pointer to the Factory class. |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
691 // Once it is non-null, the JVMCI class loader and well known JVMCI classes are |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
692 // guaranteed to have been initialized. By going through the static |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
693 // initializer of Factory, we can rely on class initialization semantics to |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
694 // synchronize threads racing to do the initialization. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
695 static Klass* _FactoryKlass = NULL; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
696 if (_FactoryKlass == NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
697 Thread* THREAD = Thread::current(); |
22054 | 698 TempNewSymbol name = SymbolTable::new_symbol("jdk/internal/jvmci/service/JVMCIClassLoaderFactory", CHECK_ABORT); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
699 KlassHandle klass = SystemDictionary::resolve_or_fail(name, true, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
700 if (HAS_PENDING_EXCEPTION) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
701 static volatile int seen_error = 0; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
702 if (!seen_error && Atomic::cmpxchg(1, &seen_error, 0) == 0) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
703 // Only report the failure on the first thread that hits it |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
704 abort_on_pending_exception(PENDING_EXCEPTION, "JVMCI classes are not available"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
705 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
706 CLEAR_PENDING_EXCEPTION; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
707 // Give first thread time to report the error. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
708 os::sleep(THREAD, 100, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
709 vm_abort(false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
710 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
711 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
712 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
713 // We cannot use jvmciJavaAccess for this because we are currently in the |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
714 // process of initializing that mechanism. |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
715 TempNewSymbol field_name = SymbolTable::new_symbol("useJVMCIClassLoader", CHECK_ABORT); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
716 fieldDescriptor field_desc; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
717 if (klass->find_field(field_name, vmSymbols::bool_signature(), &field_desc) == NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
718 ResourceMark rm; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
719 fatal(err_msg("Invalid layout of %s at %s", field_name->as_C_string(), klass->external_name())); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
720 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
721 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
722 InstanceKlass* ik = InstanceKlass::cast(klass()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
723 address addr = ik->static_field_addr(field_desc.offset() - InstanceMirrorKlass::offset_of_static_fields()); |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
724 *((jboolean *) addr) = (jboolean) UseJVMCIClassLoader; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
725 klass->initialize(CHECK_ABORT); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
726 _FactoryKlass = klass(); |
21562 | 727 assert(!UseJVMCIClassLoader || SystemDictionary::jvmci_loader() != NULL, "JVMCI classloader should have been initialized"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
728 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
729 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
730 |
21956
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
731 /** |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
732 * Closure for parsing a line from a *.properties file in jre/lib/jvmci/properties. |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
733 * The line must match the regular expression "[^=]+=.*". That is one or more |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
734 * characters other than '=' followed by '=' followed by zero or more characters. |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
735 * Everything before the '=' is the property name and everything after '=' is the value. |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
736 * No special processing of whitespace or any escape characters is performed. |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
737 * Also, no check is made whether an existing property is overridden. |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
738 */ |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
739 class JVMCIPropertiesFileClosure : public ParseClosure { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
740 SystemProperty** _plist; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
741 public: |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
742 JVMCIPropertiesFileClosure(SystemProperty** plist) : _plist(plist) {} |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
743 void do_line(char* line) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
744 size_t len = strlen(line); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
745 char* sep = strchr(line, '='); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
746 if (sep == NULL) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
747 warn_and_abort("invalid format: could not find '=' character"); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
748 return; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
749 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
750 if (sep == line) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
751 warn_and_abort("invalid format: name cannot be empty"); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
752 return; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
753 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
754 *sep = '\0'; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
755 const char* name = line; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
756 char* value = sep + 1; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
757 Arguments::PropertyList_add(_plist, name, value); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
758 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
759 }; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
760 |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
761 void JVMCIRuntime::parse_properties(SystemProperty** plist) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
762 char jvmciDir[JVM_MAXPATHLEN]; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
763 const char* fileSep = os::file_separator(); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
764 jio_snprintf(jvmciDir, sizeof(jvmciDir), "%s%slib%sjvmci", |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
765 Arguments::get_java_home(), fileSep, fileSep, fileSep); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
766 DIR* dir = os::opendir(jvmciDir); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
767 if (dir != NULL) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
768 struct dirent *entry; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
769 char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(jvmciDir), mtInternal); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
770 JVMCIPropertiesFileClosure closure(plist); |
21970
1e0012efac83
Also fix compiler warning (thus, error) on Windows.
Christian Wirth <christian.wirth@oracle.com>
parents:
21961
diff
changeset
|
771 const unsigned suffix_len = (unsigned)strlen(".properties"); |
21956
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
772 while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL && !closure.is_aborted()) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
773 const char* name = entry->d_name; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
774 if (strlen(name) > suffix_len && strcmp(name + strlen(name) - suffix_len, ".properties") == 0) { |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
775 char propertiesFilePath[JVM_MAXPATHLEN]; |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
776 jio_snprintf(propertiesFilePath, sizeof(propertiesFilePath), "%s%s%s",jvmciDir, fileSep, name); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
777 JVMCIRuntime::parse_lines(propertiesFilePath, &closure, false); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
778 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
779 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
780 FREE_C_HEAP_ARRAY(char, dbuf, mtInternal); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
781 os::closedir(dir); |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
782 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
783 } |
35affb9c707a
add properties from <jdk>/jre/lib/jvmci/*.properties files to system properties
Doug Simon <doug.simon@oracle.com>
parents:
21876
diff
changeset
|
784 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
785 OptionValuesTable* JVMCIRuntime::parse_arguments() { |
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
786 OptionDescsTable* table = OptionDescsTable::load_options(); |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
787 if (table == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
788 return NULL; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
789 } |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
790 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
791 OptionValuesTable* options = new OptionValuesTable(table); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
792 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
793 // Process option overrides from jvmci.options first |
21562 | 794 parse_jvmci_options_file(options); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
795 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
796 // Now process options on the command line |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
797 int numOptions = Arguments::num_jvmci_args(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
798 for (int i = 0; i < numOptions; i++) { |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
799 char* arg = Arguments::jvmci_args_array()[i]; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
800 if (!parse_argument(options, arg)) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
801 delete options; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
802 return NULL; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
803 } |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
804 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
805 return options; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
806 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
807 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
808 void not_found(OptionDescsTable* table, const char* argname, size_t namelen) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
809 jio_fprintf(defaultStream::error_stream(),"Unrecognized VM option '%.*s'\n", namelen, argname); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
810 OptionDesc* fuzzy_matched = table->fuzzy_match(argname, strlen(argname)); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
811 if (fuzzy_matched != NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
812 jio_fprintf(defaultStream::error_stream(), |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
813 "Did you mean '%s%s%s'?\n", |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
814 (fuzzy_matched->type == _boolean) ? "(+/-)" : "", |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
815 fuzzy_matched->name, |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
816 (fuzzy_matched->type == _boolean) ? "" : "=<value>"); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
817 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
818 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
819 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
820 bool JVMCIRuntime::parse_argument(OptionValuesTable* options, const char* arg) { |
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
821 OptionDescsTable* table = options->options_table(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
822 char first = arg[0]; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
823 const char* name; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
824 size_t name_len; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
825 if (first == '+' || first == '-') { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
826 name = arg + 1; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
827 OptionDesc* optionDesc = table->get(name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
828 if (optionDesc == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
829 not_found(table, name, strlen(name)); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
830 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
831 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
832 if (optionDesc->type != _boolean) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
833 jio_fprintf(defaultStream::error_stream(), "Unexpected +/- setting in VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
834 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
835 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
836 OptionValue value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
837 value.desc = *optionDesc; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
838 value.boolean_value = first == '+'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
839 options->put(value); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
840 return true; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
841 } else { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
842 const char* sep = strchr(arg, '='); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
843 name = arg; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
844 const char* value = NULL; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
845 if (sep != NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
846 name_len = sep - name; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
847 value = sep + 1; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
848 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
849 name_len = strlen(name); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
850 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
851 OptionDesc* optionDesc = table->get(name, name_len); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
852 if (optionDesc == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
853 not_found(table, name, name_len); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
854 return false; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
855 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
856 if (optionDesc->type == _boolean) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
857 jio_fprintf(defaultStream::error_stream(), "Missing +/- setting for VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
858 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
859 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
860 if (value == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
861 jio_fprintf(defaultStream::error_stream(), "Must use '-G:%.*s=<value>' format for %.*s option", name_len, name, name_len, name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
862 return false; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
863 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
864 OptionValue optionValue; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
865 optionValue.desc = *optionDesc; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
866 char* check; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
867 errno = 0; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
868 switch(optionDesc->type) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
869 case _int: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
870 long int int_value = ::strtol(value, &check, 10); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
871 if (*check != '\0' || errno == ERANGE || int_value > max_jint || int_value < min_jint) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
872 jio_fprintf(defaultStream::error_stream(), "Expected int value for VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
873 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
874 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
875 optionValue.int_value = int_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
876 break; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
877 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
878 case _long: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
879 long long int long_value = ::strtoll(value, &check, 10); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
880 if (*check != '\0' || errno == ERANGE || long_value > max_jlong || long_value < min_jlong) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
881 jio_fprintf(defaultStream::error_stream(), "Expected long value for VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
882 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
883 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
884 optionValue.long_value = long_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
885 break; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
886 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
887 case _float: { |
21587
59c3f921e454
fixes for windows build (size_t conversion, missing precompiled.hpp, missing strtof, strtoll in Windows SDK)
Christian Wirth <christian.wirth@oracle.com>
parents:
21564
diff
changeset
|
888 optionValue.float_value = (float)::strtod(value, &check); //strtof not available in Windows SDK yet |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
889 if (*check != '\0' || errno == ERANGE) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
890 jio_fprintf(defaultStream::error_stream(), "Expected float value for VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
891 return false; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
892 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
893 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
894 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
895 case _double: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
896 optionValue.double_value = ::strtod(value, &check); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
897 if (*check != '\0' || errno == ERANGE) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
898 jio_fprintf(defaultStream::error_stream(), "Expected double value for VM option '%s'\n", name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
899 return false; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
900 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
901 break; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
902 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
903 case _string: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
904 char* copy = NEW_C_HEAP_ARRAY(char, strlen(value) + 1, mtCompiler); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
905 strcpy(copy, value); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
906 optionValue.string_value = copy; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
907 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
908 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
909 default: |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
910 ShouldNotReachHere(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
911 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
912 options->put(optionValue); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
913 return true; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
914 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
915 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
916 |
21562 | 917 class JVMCIOptionParseClosure : public ParseClosure { |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
918 OptionValuesTable* _options; |
21516
fe4a77bec5b7
Use GraalRuntime::parse_lines in GraalRuntime::parse_graal_options_file
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21515
diff
changeset
|
919 public: |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
920 JVMCIOptionParseClosure(OptionValuesTable* options) : _options(options) {} |
21516
fe4a77bec5b7
Use GraalRuntime::parse_lines in GraalRuntime::parse_graal_options_file
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21515
diff
changeset
|
921 void do_line(char* line) { |
21562 | 922 if (!JVMCIRuntime::parse_argument(_options, line)) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
923 warn("There was an error parsing an argument. Skipping it."); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
924 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
925 } |
21516
fe4a77bec5b7
Use GraalRuntime::parse_lines in GraalRuntime::parse_graal_options_file
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21515
diff
changeset
|
926 }; |
fe4a77bec5b7
Use GraalRuntime::parse_lines in GraalRuntime::parse_graal_options_file
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21515
diff
changeset
|
927 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
928 void JVMCIRuntime::parse_jvmci_options_file(OptionValuesTable* options) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
929 const char* home = Arguments::get_java_home(); |
21562 | 930 size_t path_len = strlen(home) + strlen("/lib/jvmci.options") + 1; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
931 char path[JVM_MAXPATHLEN]; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
932 char sep = os::file_separator()[0]; |
21562 | 933 jio_snprintf(path, JVM_MAXPATHLEN, "%s%clib%cjvmci.options", home, sep, sep); |
934 JVMCIOptionParseClosure closure(options); | |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
935 parse_lines(path, &closure, false); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
936 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
937 |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
938 #define CHECK_WARN_ABORT_(message) THREAD); \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
939 if (HAS_PENDING_EXCEPTION) { \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
940 warning(message); \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
941 char buf[512]; \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
942 jio_snprintf(buf, 512, "Uncaught exception at %s:%d", __FILE__, __LINE__); \ |
21562 | 943 JVMCIRuntime::abort_on_pending_exception(PENDING_EXCEPTION, buf); \ |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
944 return; \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
945 } \ |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
946 (void)(0 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
947 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
948 class SetOptionClosure : public ValueClosure<OptionValue> { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
949 Thread* _thread; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
950 public: |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
951 SetOptionClosure(TRAPS) : _thread(THREAD) {} |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
952 void do_value(OptionValue* optionValue) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
953 TRAPS = _thread; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
954 const char* declaringClass = optionValue->desc.declaringClass; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
955 if (declaringClass == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
956 // skip PrintFlags pseudo-option |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
957 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
958 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
959 const char* fieldName = optionValue->desc.name; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
960 const char* fieldClass = optionValue->desc.fieldClass; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
961 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
962 size_t fieldSigLen = 2 + strlen(fieldClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
963 char* fieldSig = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, fieldSigLen + 1); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
964 jio_snprintf(fieldSig, fieldSigLen + 1, "L%s;", fieldClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
965 for (size_t i = 0; i < fieldSigLen; ++i) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
966 if (fieldSig[i] == '.') { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
967 fieldSig[i] = '/'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
968 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
969 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
970 fieldSig[fieldSigLen] = '\0'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
971 size_t declaringClassLen = strlen(declaringClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
972 char* declaringClassBinary = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, declaringClassLen + 1); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
973 for (size_t i = 0; i < declaringClassLen; ++i) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
974 if (declaringClass[i] == '.') { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
975 declaringClassBinary[i] = '/'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
976 } else { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
977 declaringClassBinary[i] = declaringClass[i]; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
978 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
979 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
980 declaringClassBinary[declaringClassLen] = '\0'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
981 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
982 TempNewSymbol name = SymbolTable::new_symbol(declaringClassBinary, CHECK_WARN_ABORT_("Declaring class could not be found")); |
21562 | 983 Klass* klass = JVMCIRuntime::resolve_or_null(name, CHECK_WARN_ABORT_("Declaring class could not be resolved")); |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
984 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
985 if (klass == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
986 warning("Declaring class for option %s could not be resolved", declaringClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
987 abort(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
988 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
989 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
990 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
991 // The class has been loaded so the field and signature should already be in the symbol |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
992 // table. If they're not there, the field doesn't exist. |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
993 TempNewSymbol fieldname = SymbolTable::probe(fieldName, (int)strlen(fieldName)); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
994 TempNewSymbol signame = SymbolTable::probe(fieldSig, (int)fieldSigLen); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
995 if (fieldname == NULL || signame == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
996 warning("Symbols for field for option %s not found (in %s)", fieldName, declaringClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
997 abort(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
998 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
999 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1000 // Make sure class is initialized before handing id's out to fields |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1001 klass->initialize(CHECK_WARN_ABORT_("Error while initializing declaring class for option")); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1002 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1003 fieldDescriptor fd; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1004 if (!InstanceKlass::cast(klass)->find_field(fieldname, signame, true, &fd)) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1005 warning("Field for option %s not found (in %s)", fieldName, declaringClass); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1006 abort(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1007 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1008 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1009 oop value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1010 switch(optionValue->desc.type) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1011 case _boolean: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1012 jvalue jv; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1013 jv.z = optionValue->boolean_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1014 value = java_lang_boxing_object::create(T_BOOLEAN, &jv, THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1015 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1016 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1017 case _int: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1018 jvalue jv; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1019 jv.i = optionValue->int_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1020 value = java_lang_boxing_object::create(T_INT, &jv, THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1021 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1022 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1023 case _long: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1024 jvalue jv; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1025 jv.j = optionValue->long_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1026 value = java_lang_boxing_object::create(T_LONG, &jv, THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1027 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1028 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1029 case _float: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1030 jvalue jv; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1031 jv.f = optionValue->float_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1032 value = java_lang_boxing_object::create(T_FLOAT, &jv, THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1033 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1034 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1035 case _double: { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1036 jvalue jv; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1037 jv.d = optionValue->double_value; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1038 value = java_lang_boxing_object::create(T_DOUBLE, &jv, THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1039 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1040 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1041 case _string: |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1042 value = java_lang_String::create_from_str(optionValue->string_value, THREAD)(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1043 break; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1044 default: |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1045 ShouldNotReachHere(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1046 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1047 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1048 oop optionValueOop = klass->java_mirror()->obj_field(fd.offset()); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1049 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1050 if (optionValueOop == NULL) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1051 warning("Option field was null, can not set %s", fieldName); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1052 abort(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1053 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1054 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1055 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1056 if (!InstanceKlass::cast(optionValueOop->klass())->find_field(vmSymbols::value_name(), vmSymbols::object_signature(), false, &fd)) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1057 warning("'Object value' field not found in option class %s, can not set option %s", fieldClass, fieldName); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1058 abort(); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1059 return; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1060 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1061 |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1062 optionValueOop->obj_field_put(fd.offset(), value); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1063 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1064 }; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1065 |
21875
431b127fc0d1
Renaming of classes around jvmciOptions for clarity
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21633
diff
changeset
|
1066 void JVMCIRuntime::set_options(OptionValuesTable* options, TRAPS) { |
21562 | 1067 ensure_jvmci_class_loader_is_initialized(); |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1068 { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1069 ResourceMark rm; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1070 SetOptionClosure closure(THREAD); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1071 options->for_each(&closure); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1072 if (closure.is_aborted()) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1073 vm_abort(false); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1074 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1075 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1076 OptionValue* printFlags = options->get(PRINT_FLAGS_ARG); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1077 if (printFlags != NULL && printFlags->boolean_value) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1078 print_flags_helper(CHECK_ABORT); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1079 } |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1080 } |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1081 |
21562 | 1082 void JVMCIRuntime::print_flags_helper(TRAPS) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1083 // TODO(gd) write this in C++? |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1084 HandleMark hm(THREAD); |
22054 | 1085 TempNewSymbol name = SymbolTable::new_symbol("jdk/internal/jvmci/hotspot/HotSpotOptions", CHECK_ABORT); |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1086 KlassHandle hotSpotOptionsClass = load_required_class(name); |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1087 TempNewSymbol setOption = SymbolTable::new_symbol("printFlags", CHECK); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1088 JavaValue result(T_VOID); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1089 JavaCallArguments args; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1090 JavaCalls::call_static(&result, hotSpotOptionsClass, setOption, vmSymbols::void_method_signature(), &args, CHECK); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1091 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1092 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1093 Handle JVMCIRuntime::create_Service(const char* name, TRAPS) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1094 TempNewSymbol kname = SymbolTable::new_symbol(name, CHECK_NH); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1095 Klass* k = resolve_or_fail(kname, CHECK_NH); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1096 instanceKlassHandle klass(THREAD, k); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1097 klass->initialize(CHECK_NH); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1098 klass->check_valid_for_instantiation(true, CHECK_NH); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1099 JavaValue result(T_VOID); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1100 instanceHandle service = klass->allocate_instance_handle(CHECK_NH); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1101 JavaCalls::call_special(&result, service, klass, vmSymbols::object_initializer_name(), vmSymbols::void_method_signature(), THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1102 return service; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1103 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1104 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1105 void JVMCIRuntime::shutdown() { |
21527
07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21526
diff
changeset
|
1106 if (_HotSpotJVMCIRuntime_instance != NULL) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1107 _shutdown_called = true; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1108 JavaThread* THREAD = JavaThread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1109 HandleMark hm(THREAD); |
21616
4c146c9367b6
recast VM compilation request via JVMCI to be a HotSpot JVMCI event, removing the last direct reference to a Graal class in the VM (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21614
diff
changeset
|
1110 Handle receiver = get_HotSpotJVMCIRuntime(); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1111 JavaValue result(T_VOID); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1112 JavaCallArguments args; |
21616
4c146c9367b6
recast VM compilation request via JVMCI to be a HotSpot JVMCI event, removing the last direct reference to a Graal class in the VM (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21614
diff
changeset
|
1113 args.push_oop(receiver); |
4c146c9367b6
recast VM compilation request via JVMCI to be a HotSpot JVMCI event, removing the last direct reference to a Graal class in the VM (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21614
diff
changeset
|
1114 JavaCalls::call_special(&result, receiver->klass(), vmSymbols::shutdown_method_name(), vmSymbols::void_method_signature(), &args, CHECK_ABORT); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1115 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1116 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1117 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1118 void JVMCIRuntime::call_printStackTrace(Handle exception, Thread* thread) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1119 assert(exception->is_a(SystemDictionary::Throwable_klass()), "Throwable instance expected"); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1120 JavaValue result(T_VOID); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1121 JavaCalls::call_virtual(&result, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1122 exception, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1123 KlassHandle(thread, |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1124 SystemDictionary::Throwable_klass()), |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1125 vmSymbols::printStackTrace_name(), |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1126 vmSymbols::void_method_signature(), |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1127 thread); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1128 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1129 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1130 void JVMCIRuntime::abort_on_pending_exception(Handle exception, const char* message, bool dump_core) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1131 Thread* THREAD = Thread::current(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1132 CLEAR_PENDING_EXCEPTION; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1133 tty->print_raw_cr(message); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1134 call_printStackTrace(exception, THREAD); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1135 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1136 // Give other aborting threads to also print their stack traces. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1137 // This can be very useful when debugging class initialization |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1138 // failures. |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1139 os::sleep(THREAD, 200, false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1140 |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1141 vm_abort(dump_core); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1142 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1143 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1144 Klass* JVMCIRuntime::resolve_or_null(Symbol* name, TRAPS) { |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1145 return SystemDictionary::resolve_or_null(name, SystemDictionary::jvmci_loader(), Handle(), CHECK_NULL); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1146 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1147 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1148 Klass* JVMCIRuntime::resolve_or_fail(Symbol* name, TRAPS) { |
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1149 return SystemDictionary::resolve_or_fail(name, SystemDictionary::jvmci_loader(), Handle(), true, CHECK_NULL); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1150 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1151 |
21559
be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents:
21554
diff
changeset
|
1152 Klass* JVMCIRuntime::load_required_class(Symbol* name) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1153 Klass* klass = resolve_or_null(name, Thread::current()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1154 if (klass == NULL) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1155 tty->print_cr("Could not load class %s", name->as_C_string()); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1156 vm_abort(false); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1157 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1158 return klass; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1159 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1160 |
21562 | 1161 void JVMCIRuntime::parse_lines(char* path, ParseClosure* closure, bool warnStatFailure) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1162 struct stat st; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1163 if (os::stat(path, &st) == 0 && (st.st_mode & S_IFREG) == S_IFREG) { // exists & is regular file |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1164 int file_handle = os::open(path, 0, 0); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1165 if (file_handle != -1) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1166 char* buffer = NEW_C_HEAP_ARRAY(char, st.st_size + 1, mtInternal); |
21626
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1167 int num_read; |
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1168 if(ThreadLocalStorage::thread() == NULL) { // Solaris needs a JavaThread for os::read, if no thread started yet, fallback. |
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1169 num_read = (int) ::read(file_handle, (char*) buffer, st.st_size); |
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1170 } else { |
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1171 num_read = (int) os::read(file_handle, (char*) buffer, st.st_size); |
ca3c6538bcec
JVMCI update makefiles for Solaris/SPARC; os::read at early stage of VM does not work, use ::read as fallback in JVMCIRuntime::parse_lines (JBS:GRAAL-54)
Stefan Anzinger <stefan.anzinger@oracle.com>
parents:
21617
diff
changeset
|
1172 } |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1173 if (num_read == -1) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1174 warning("Error reading file %s due to %s", path, strerror(errno)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1175 } else if (num_read != st.st_size) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1176 warning("Only read %d of " SIZE_FORMAT " bytes from %s", num_read, (size_t) st.st_size, path); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1177 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1178 os::close(file_handle); |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1179 closure->set_filename(path); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1180 if (num_read == st.st_size) { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1181 buffer[num_read] = '\0'; |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1182 |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1183 char* line = buffer; |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1184 while (line - buffer < num_read && !closure->is_aborted()) { |
21123
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1185 // find line end (\r, \n or \r\n) |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1186 char* nextline = NULL; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1187 char* cr = strchr(line, '\r'); |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1188 char* lf = strchr(line, '\n'); |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1189 if (cr != NULL && lf != NULL) { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1190 char* min = MIN2(cr, lf); |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1191 *min = '\0'; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1192 if (lf == cr + 1) { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1193 nextline = lf + 1; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1194 } else { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1195 nextline = min + 1; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1196 } |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1197 } else if (cr != NULL) { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1198 *cr = '\0'; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1199 nextline = cr + 1; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1200 } else if (lf != NULL) { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1201 *lf = '\0'; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1202 nextline = lf + 1; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1203 } |
21123
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1204 // trim left |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1205 while (*line == ' ' || *line == '\t') line++; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1206 char* end = line + strlen(line); |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1207 // trim right |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1208 while (end > line && (*(end -1) == ' ' || *(end -1) == '\t')) end--; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1209 *end = '\0'; |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1210 // skip comments and empty lines |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1211 if (*line != '#' && strlen(line) > 0) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1212 closure->parse_line(line); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1213 } |
21123
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1214 if (nextline != NULL) { |
85b0935625c1
graalRuntime: make service file parsing more robust:
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21033
diff
changeset
|
1215 line = nextline; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1216 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1217 // File without newline at the end |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1218 break; |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1219 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1220 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1221 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1222 FREE_C_HEAP_ARRAY(char, buffer, mtInternal); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1223 } else { |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1224 warning("Error opening file %s due to %s", path, strerror(errno)); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1225 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1226 } else if (warnStatFailure) { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1227 warning("Could not stat file %s due to %s", path, strerror(errno)); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1228 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1229 } |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1230 |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1231 class ServiceParseClosure : public ParseClosure { |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1232 GrowableArray<char*> _implNames; |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1233 public: |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1234 ServiceParseClosure() : _implNames() {} |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1235 void do_line(char* line) { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1236 size_t lineLen = strlen(line); |
21876
d358434dd6b7
Use ressource array while parsing services rather than leak a heap array
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21875
diff
changeset
|
1237 char* implName = NEW_RESOURCE_ARRAY(char, lineLen + 1); |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1238 // Turn all '.'s into '/'s |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1239 for (size_t index = 0; index < lineLen; ++index) { |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1240 if (line[index] == '.') { |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1241 implName[index] = '/'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1242 } else { |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1243 implName[index] = line[index]; |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1244 } |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1245 } |
21519
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1246 implName[lineLen] = '\0'; |
cecb4e39521c
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21516
diff
changeset
|
1247 _implNames.append(implName); |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1248 } |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1249 GrowableArray<char*>* implNames() {return &_implNames;} |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1250 }; |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1251 |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1252 |
21563
4f63449b4422
revived post option parsing handler notification
Doug Simon <doug.simon@oracle.com>
parents:
21562
diff
changeset
|
1253 objArrayHandle JVMCIRuntime::get_service_impls(KlassHandle serviceKlass, TRAPS) { |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1254 const char* home = Arguments::get_java_home(); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1255 const char* serviceName = serviceKlass->external_name(); |
21562 | 1256 size_t path_len = strlen(home) + strlen("/lib/jvmci/services/") + strlen(serviceName) + 1; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1257 char* path = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, path_len); |
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1258 char sep = os::file_separator()[0]; |
21562 | 1259 sprintf(path, "%s%clib%cjvmci%cservices%c%s", home, sep, sep, sep, sep, serviceName); |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1260 ServiceParseClosure closure; |
21633
9966b358bc2b
Services: don't throw exceptions or print warnings when there are no implementations for a non-required service
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21626
diff
changeset
|
1261 parse_lines(path, &closure, false); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1262 |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1263 GrowableArray<char*>* implNames = closure.implNames(); |
21563
4f63449b4422
revived post option parsing handler notification
Doug Simon <doug.simon@oracle.com>
parents:
21562
diff
changeset
|
1264 objArrayOop servicesOop = oopFactory::new_objArray(serviceKlass(), implNames->length(), CHECK_(objArrayHandle())); |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1265 objArrayHandle services(THREAD, servicesOop); |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1266 for (int i = 0; i < implNames->length(); ++i) { |
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1267 char* implName = implNames->at(i); |
21563
4f63449b4422
revived post option parsing handler notification
Doug Simon <doug.simon@oracle.com>
parents:
21562
diff
changeset
|
1268 Handle service = create_Service(implName, CHECK_(objArrayHandle())); |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1269 services->obj_at_put(i, service()); |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1270 } |
21515
1ab7802d35c9
Factor GraalRuntime::parse_lines out of GraalRuntime::get_service_impls
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21207
diff
changeset
|
1271 return services; |
21033
4527d2428f37
Convert graalRuntime.cpp to unix line delimiters
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21031
diff
changeset
|
1272 } |