truffle: src/share/vm/graal/graalCompilerToVM.cpp annotate

annotate src/share/vm/graal/graalCompilerToVM.cpp @ 5747:120820e30baa

added basic high-level interpreter support to HotSpot

author	Christian Haeubl <haeubl@ssw.jku.at>
date	Tue, 03 Jul 2012 16:56:40 +0200
parents	7d25723b7699
children	87e8baf5447c

rev	line source
2516 a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	1 /*
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	4 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	5 * This code is free software; you can redistribute it and/or modify it
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	7 * published by the Free Software Foundation.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	8 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	13 * accompanied this code).
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	14 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	15 * You should have received a copy of the GNU General Public License version
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	18 *
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	20 * or visit www.oracle.com if you need additional information or have any
a384fac3fd34 Removed anything OSR-related. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2502 diff changeset	21 * questions.
1410 b30a2cd5e3a2 Added methods to c1x_VMExits.cpp Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1406 diff changeset	22 */
b30a2cd5e3a2 Added methods to c1x_VMExits.cpp Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1406 diff changeset	23
2045 9c96c873c42b Fix includes to match new hotspot mechanism. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1942 diff changeset	24 #include "precompiled.hpp"
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	25 #include "runtime/fieldDescriptor.hpp"
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	26 #include "c1/c1_Runtime1.hpp"
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	27 #include "ci/ciMethodData.hpp"
3619 5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3587 diff changeset	28 #include "compiler/compileBroker.hpp"
4222 8e2985cdaaa5 Renaming of VMExits and VMEntries part 3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4220 diff changeset	29 #include "graal/graalCompilerToVM.hpp"
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	30 #include "graal/graalCompiler.hpp"
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	31 #include "graal/graalEnv.hpp"
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	32 #include "graal/graalJavaAccess.hpp"
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	33 #include "graal/graalCodeInstaller.hpp"
4222 8e2985cdaaa5 Renaming of VMExits and VMEntries part 3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4220 diff changeset	34 #include "graal/graalVMToCompiler.hpp"
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	35 #include "graal/graalVmIds.hpp"
2663 d7c0775d7e72 added includes to build without precompiled headers Christian.Wimmer@Oracle.com parents: 2659 diff changeset	36 #include "memory/oopFactory.hpp"
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	37 #include "oops/generateOopMap.hpp"
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	38
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	39 methodOop getMethodFromHotSpotMethod(jobject hotspot_method) {
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	40 return getMethodFromHotSpotMethod(JNIHandles::resolve(hotspot_method));
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	41 }
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	42
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	43 methodOop getMethodFromHotSpotMethod(oop hotspot_method) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	44 return (methodOop)HotSpotResolvedJavaMethod::javaMirror(hotspot_method);
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	45 }
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	46
4446 48756b901156 bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4444 diff changeset	47 methodDataOop getMethodDataFromHotSpotMethodData(jobject hotspot_method_data) {
48756b901156 bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4444 diff changeset	48 return (methodDataOop)HotSpotMethodData::hotspotMirror(JNIHandles::resolve(hotspot_method_data));
48756b901156 bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4444 diff changeset	49 }
48756b901156 bugfixes Christian Haeubl <christian.haeubl@oracle.com> parents: 4444 diff changeset	50
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	51 // public byte[] JavaMethod_code(HotSpotResolvedMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	52 JNIEXPORT jbyteArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1code(JNIEnv *env, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	53 TRACE_graal_3("CompilerToVM::JavaMethod_code");
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	54 methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
5150 fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	55
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	56 // copy all bytecodes
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	57 int code_size = method->code_size();
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	58 jbyteArray result = env->NewByteArray(code_size);
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	59 env->SetByteArrayRegion(result, 0, code_size, (const jbyte *) method->code_base());
5150 fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	60
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	61 // iterate over all bytecodes and replace non-Java bytecodes
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	62 if (RewriteBytecodes \|\| RewriteFrequentPairs) {
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	63 BytecodeStream s(method);
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	64 while(!s.is_last_bytecode()) {
5154 ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	65 s.next();
ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	66 Bytecodes::Code code = s.raw_code();
ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	67 if (!Bytecodes::is_java_code(code)) {
ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	68 jbyte original_code = Bytecodes::java_code(code);
ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	69 env->SetByteArrayRegion(result, s.bci(), 1, &original_code);
ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	70 }
5150 fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	71 }
5154 ae72dd38eeb1 bugfix, parallel GC seems stable Christian Haeubl <christian.haeubl@oracle.com> parents: 5150 diff changeset	72 }
5150 fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	73
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	74 // replace all breakpoints
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	75 if (method->number_of_breakpoints() > 0) {
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	76 BreakpointInfo* bp = instanceKlass::cast(method->method_holder())->breakpoints();
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	77 for (; bp != NULL; bp = bp->next()) {
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	78 if (bp->match(method())) {
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	79 jbyte code = bp->orig_bytecode();
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	80 env->SetByteArrayRegion(result, bp->bci(), 1, &code);
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	81 }
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	82 }
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	83 }
fdd9dd4508fa some GC fixes Christian Haeubl <christian.haeubl@oracle.com> parents: 5130 diff changeset	84
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	85 return result;
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	86 }
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	87
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	88 // public String JavaMethod_signature(HotSpotResolvedMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	89 JNIEXPORT jstring JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1signature(JNIEnv *env, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	90 TRACE_graal_3("CompilerToVM::JavaMethod_signature");
1422 3483ec571caf * using reflected objects instead of oops Lukas Stadler <lukas.stadler@oracle.com> parents: 1421 diff changeset	91 VM_ENTRY_MARK
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	92 methodOop method = getMethodFromHotSpotMethod(hotspot_method);
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	93 assert(method != NULL && method->signature() != NULL, "signature required");
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: 1427 diff changeset	94 return VmIds::toString<jstring>(method->signature(), THREAD);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	95 }
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	96
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	97 // public ExceptionHandler[] JavaMethod_exceptionHandlers(long vmId);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	98 JNIEXPORT jobjectArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1exceptionHandlers(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	99 TRACE_graal_3("CompilerToVM::JavaMethod_exceptionHandlers");
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	100 VM_ENTRY_MARK
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	101 ResourceMark rm;
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	102 methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	103 typeArrayHandle handlers = method->exception_table();
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	104 int handler_count = handlers.is_null() ? 0 : handlers->length() / 4;
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	105
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	106 instanceKlass::cast(ExceptionHandler::klass())->initialize(CHECK_NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	107 objArrayHandle array = oopFactory::new_objArray(SystemDictionary::ExceptionHandler_klass(), handler_count, CHECK_NULL);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	108
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	109 for (int i = 0; i < handler_count; i++) {
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	110 // exception handlers are stored as four integers: start bci, end bci, handler bci, catch class constant pool index
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	111 int base = i * 4;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	112 Handle entry = instanceKlass::cast(ExceptionHandler::klass())->allocate_instance(CHECK_NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	113 ExceptionHandler::set_startBCI(entry, handlers->int_at(base + 0));
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	114 ExceptionHandler::set_endBCI(entry, handlers->int_at(base + 1));
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	115 ExceptionHandler::set_handlerBCI(entry, handlers->int_at(base + 2));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	116 int catch_class_index = handlers->int_at(base + 3);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	117 ExceptionHandler::set_catchTypeCPI(entry, catch_class_index);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	118
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	119 if (catch_class_index == 0) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	120 ExceptionHandler::set_catchType(entry, NULL);
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	121 } else {
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	122 constantPoolOop cp = instanceKlass::cast(method->method_holder())->constants();
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	123 KlassHandle loading_klass = method->method_holder();
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	124 Handle catch_class = GraalCompiler::get_JavaType(cp, catch_class_index, loading_klass, CHECK_NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	125 if (catch_class->klass() == HotSpotResolvedJavaType::klass() && java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(catch_class)) == SystemDictionary::Throwable_klass()) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	126 ExceptionHandler::set_catchType(entry, NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	127 ExceptionHandler::set_catchTypeCPI(entry, 0);
3699 67e92894d065 Set catch all to true if the caught class is java.lang.Throwable. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3688 diff changeset	128 } else {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	129 ExceptionHandler::set_catchType(entry, catch_class());
3699 67e92894d065 Set catch all to true if the caught class is java.lang.Throwable. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3688 diff changeset	130 }
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	131 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	132 array->obj_at_put(i, entry());
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	133 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	134
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	135 return (jobjectArray) JNIHandles::make_local(array());
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	136 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	137
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	138 // public boolean JavaMethod_hasBalancedMonitors(long vmId);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	139 JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1hasBalancedMonitors(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	140 TRACE_graal_3("CompilerToVM::JavaMethod_hasBalancedMonitors");
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	141
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	142 VM_ENTRY_MARK;
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	143
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	144 // Analyze the method to see if monitors are used properly.
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	145 methodHandle method(THREAD, getMethodFromHotSpotMethod(hotspot_method));
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	146 assert(method->has_monitor_bytecodes(), "should have checked this");
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	147
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	148 // Check to see if a previous compilation computed the monitor-matching analysis.
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	149 if (method->guaranteed_monitor_matching()) {
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	150 return true;
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	151 }
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	152
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	153 {
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	154 EXCEPTION_MARK;
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	155 ResourceMark rm(THREAD);
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	156 GeneratePairingInfo gpi(method);
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	157 gpi.compute_map(CATCH);
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	158 if (!gpi.monitor_safe()) {
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	159 return false;
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	160 }
f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	161 method->set_guaranteed_monitor_matching();
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	162 }
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	163 return true;
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	164 }
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	165
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	166 // public JavaMethod getJavaMethod(java.lang.reflect.Method reflectionMethod);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	167 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getJavaMethod(JNIEnv *, jobject, jobject reflection_method_handle) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	168 TRACE_graal_3("CompilerToVM::getJavaMethod");
3555 22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	169 VM_ENTRY_MARK;
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	170 oop reflection_method = JNIHandles::resolve(reflection_method_handle);
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	171 oop reflection_holder = java_lang_reflect_Method::clazz(reflection_method);
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	172 int slot = java_lang_reflect_Method::slot(reflection_method);
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	173 klassOop holder = java_lang_Class::as_klassOop(reflection_holder);
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	174 methodOop method = instanceKlass::cast(holder)->method_with_idnum(slot);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	175 Handle ret = GraalCompiler::createHotSpotResolvedJavaMethod(method, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	176 return JNIHandles::make_local(THREAD, ret());
3555 22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	177 }
22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	178
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	179 // public boolean JavaMethod_uniqueConcreteMethod(long vmId);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	180 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1uniqueConcreteMethod(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	181 TRACE_graal_3("CompilerToVM::JavaMethod_uniqueConcreteMethod");
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	182
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	183 VM_ENTRY_MARK;
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	184 methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	185 KlassHandle holder = method->method_holder();
6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	186 if (holder->is_interface()) {
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	187 // Cannot trust interfaces. Because of:
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	188 // interface I { void foo(); }
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	189 // class A { public void foo() {} }
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	190 // class B extends A implements I { }
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	191 // class C extends B { public void foo() { } }
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	192 // class D extends B { }
b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	193 // Would lead to identify C.foo() as the unique concrete method for I.foo() without seeing A.foo().
5476 13327e512621 fix : GCC 4.7 considers conversion of false to a jobject an error Gilles Duboscq <duboscq@ssw.jku.at> parents: 5466 diff changeset	194 return NULL;
2049 7e09ea4a8f36 Added leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2048 diff changeset	195 }
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	196 methodHandle unique_concrete;
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	197 {
2061 c0b1d6a44a02 Implemented fast inline array allocation. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2060 diff changeset	198 ResourceMark rm;
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	199 MutexLocker locker(Compile_lock);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	200 unique_concrete = Dependencies::find_unique_concrete_method(holder(), method());
2050 b6d2c238e585 Two fixes for leaf type and leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2049 diff changeset	201 }
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	202 if (unique_concrete.is_null()) {
2049 7e09ea4a8f36 Added leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2048 diff changeset	203 return NULL;
3559 f70a4cc629e7 remove some dependencies on ci interface Lukas Stadler <lukas.stadler@jku.at> parents: 3555 diff changeset	204 } else {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	205 Handle method_resolved = GraalCompiler::createHotSpotResolvedJavaMethod(unique_concrete, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	206 return JNIHandles::make_local(THREAD, method_resolved());
2049 7e09ea4a8f36 Added leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2048 diff changeset	207 }
7e09ea4a8f36 Added leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2048 diff changeset	208 }
7e09ea4a8f36 Added leaf method assumptions. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2048 diff changeset	209
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	210 // public native int JavaMethod_invocationCount(long vmId);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	211 JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1invocationCount(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	212 TRACE_graal_3("CompilerToVM::JavaMethod_invocationCount");
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	213 return getMethodFromHotSpotMethod(hotspot_method)->invocation_count();
2926 0e3ec0a4eda4 RiTypeProfile information and invocation counters for RiMethods Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	214 }
0e3ec0a4eda4 RiTypeProfile information and invocation counters for RiMethods Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	215
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	216 // public native HotSpotMethodData JavaMethod_methodData(HotSpotResolvedJavaMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	217 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1methodData(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	218 TRACE_graal_3("CompilerToVM::JavaMethod_methodData");
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	219 VM_ENTRY_MARK;
4441 4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	220
4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	221 methodDataHandle method_data = getMethodFromHotSpotMethod(hotspot_method)->method_data();
4443 6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	222 if(method_data.is_null()) {
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	223 return NULL;
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	224 } else {
4475 f400f9554f09 fixed windows build, filtered methodDataOop for reflection Christian Haeubl <christian.haeubl@oracle.com> parents: 4461 diff changeset	225 Handle graalMethodData = GraalCompiler::createHotSpotMethodData(method_data, CHECK_NULL);
4443 6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	226 return JNIHandles::make_local(THREAD, graalMethodData());
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	227 }
3565 b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	228 }
3487 b9ed7199f6fb special handling for VirtualObject(Field) in IdentifyBlocksPhase (don't schedule out of loops), better toString for HotSpotMethod/Field Lukas Stadler <lukas.stadler@jku.at> parents: 3465 diff changeset	229
3565 b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	230 // ------------------------------------------------------------------
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	231 // Adjust a CounterData count to be commensurate with
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	232 // interpreter_invocation_count. If the MDO exists for
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	233 // only 25% of the time the method exists, then the
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	234 // counts in the MDO should be scaled by 4X, so that
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	235 // they can be usefully and stably compared against the
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	236 // invocation counts in methods.
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	237 int scale_count(methodDataOop method_data, int count) {
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	238 if (count > 0) {
3566 b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	239 int counter_life;
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	240 int method_life = method_data->method()->interpreter_invocation_count();
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	241 int current_mileage = methodDataOopDesc::mileage_of(method_data->method());
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	242 int creation_mileage = method_data->creation_mileage();
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	243 counter_life = current_mileage - creation_mileage;
3565 b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	244
3566 b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	245 // counter_life due to backedge_counter could be > method_life
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	246 if (counter_life > method_life)
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	247 counter_life = method_life;
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	248 if (0 < counter_life && counter_life <= method_life) {
b0d192f86f34 more work on ci removal Lukas Stadler <lukas.stadler@jku.at> parents: 3565 diff changeset	249 count = (int)((double)count * method_life / counter_life + 0.5);
3565 b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	250 count = (count > 0) ? count : 1;
b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	251 }
3487 b9ed7199f6fb special handling for VirtualObject(Field) in IdentifyBlocksPhase (don't schedule out of loops), better toString for HotSpotMethod/Field Lukas Stadler <lukas.stadler@jku.at> parents: 3465 diff changeset	252 }
3565 b3f0f8a01ca2 remove some ci-dependencies Lukas Stadler <lukas.stadler@jku.at> parents: 3559 diff changeset	253 return count;
3055 fecdb0a65fb2 runtime profiles exceptions at the call site Lukas Stadler <lukas.stadler@jku.at> parents: 3020 diff changeset	254 }
fecdb0a65fb2 runtime profiles exceptions at the call site Lukas Stadler <lukas.stadler@jku.at> parents: 3020 diff changeset	255
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	256 // public native boolean JavaMethod_hasCompiledCode(HotSpotResolvedJavaMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	257 JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1hasCompiledCode(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	258 TRACE_graal_3("CompilerToVM::JavaMethod_hasCompiledCode");
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	259 return getMethodFromHotSpotMethod(hotspot_method)->has_compiled_code();
3465 8cd198d7cbc1 When a method that has been compiled before is considered for inlining, use its compiled (native) code size for size checks. This avoids inlining compiled methods that already contain many other inlined methods, reducing generated code size and usually execution time as well. Also, add GraalMetrics bookkeeping for inlining. Peter Hofer <peter.hofer@jku.at> parents: 3211 diff changeset	260 }
8cd198d7cbc1 When a method that has been compiled before is considered for inlining, use its compiled (native) code size for size checks. This avoids inlining compiled methods that already contain many other inlined methods, reducing generated code size and usually execution time as well. Also, add GraalMetrics bookkeeping for inlining. Peter Hofer <peter.hofer@jku.at> parents: 3211 diff changeset	261
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	262 // public native int JavaMethod_getCompiledCodeSize(HotSpotResolvedJavaMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	263 JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1getCompiledCodeSize(JNIEnv *env, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	264 TRACE_graal_3("CompilerToVM::JavaMethod_getCompiledCodeSize");
4528 e6e14d25e608 added two inlining policies for comparison Christian Haeubl <christian.haeubl@oracle.com> parents: 4475 diff changeset	265 nmethod* code = getMethodFromHotSpotMethod(hotspot_method)->code();
e6e14d25e608 added two inlining policies for comparison Christian Haeubl <christian.haeubl@oracle.com> parents: 4475 diff changeset	266 return code == NULL ? 0 : code->insts_size();
e6e14d25e608 added two inlining policies for comparison Christian Haeubl <christian.haeubl@oracle.com> parents: 4475 diff changeset	267 }
e6e14d25e608 added two inlining policies for comparison Christian Haeubl <christian.haeubl@oracle.com> parents: 4475 diff changeset	268
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	269 // public JavaType Signature_lookupType(String returnType, HotSpotResolvedJavaType accessingClass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	270 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_Signature_1lookupType(JNIEnv *env, jobject, jstring jname, jobject accessingClass, jboolean eagerResolve) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	271 TRACE_graal_3("CompilerToVM::Signature_lookupType");
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	272 VM_ENTRY_MARK;
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	273 ResourceMark rm;
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	274
2182 9569fdf936ff Made merge compile. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2061 diff changeset	275 Symbol* nameSymbol = VmIds::toSymbol(jname);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	276 Handle name = JNIHandles::resolve(jname);
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	277
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	278 oop result;
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	279 if (nameSymbol == vmSymbols::int_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	280 result = VMToCompiler::createPrimitiveJavaType((int) T_INT, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	281 } else if (nameSymbol == vmSymbols::long_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	282 result = VMToCompiler::createPrimitiveJavaType((int) T_LONG, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	283 } else if (nameSymbol == vmSymbols::bool_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	284 result = VMToCompiler::createPrimitiveJavaType((int) T_BOOLEAN, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	285 } else if (nameSymbol == vmSymbols::char_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	286 result = VMToCompiler::createPrimitiveJavaType((int) T_CHAR, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	287 } else if (nameSymbol == vmSymbols::short_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	288 result = VMToCompiler::createPrimitiveJavaType((int) T_SHORT, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	289 } else if (nameSymbol == vmSymbols::byte_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	290 result = VMToCompiler::createPrimitiveJavaType((int) T_BYTE, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	291 } else if (nameSymbol == vmSymbols::double_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	292 result = VMToCompiler::createPrimitiveJavaType((int) T_DOUBLE, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	293 } else if (nameSymbol == vmSymbols::float_signature()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	294 result = VMToCompiler::createPrimitiveJavaType((int) T_FLOAT, THREAD);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	295 } else {
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	296 klassOop resolved_type = NULL;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	297 // if the name isn't in the symbol table then the class isn't loaded anyway...
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	298 if (nameSymbol != NULL) {
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	299 Handle classloader;
00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	300 Handle protectionDomain;
00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	301 if (JNIHandles::resolve(accessingClass) != NULL) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	302 classloader = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(accessingClass))->klass_part()->class_loader();
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	303 protectionDomain = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(accessingClass))->klass_part()->protection_domain();
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	304 }
4484 14a00ee82980 Implement eager type resolving. Andreas Woess <andreas.woess@jku.at> parents: 4475 diff changeset	305 if (eagerResolve) {
14a00ee82980 Implement eager type resolving. Andreas Woess <andreas.woess@jku.at> parents: 4475 diff changeset	306 resolved_type = SystemDictionary::resolve_or_null(nameSymbol, classloader, protectionDomain, THREAD);
14a00ee82980 Implement eager type resolving. Andreas Woess <andreas.woess@jku.at> parents: 4475 diff changeset	307 } else {
4533 818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	308 if (FieldType::is_obj(nameSymbol)) {
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	309 ResourceMark rm(THREAD);
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	310 // Ignore wrapping L and ;.
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	311 TempNewSymbol tmp_name = SymbolTable::new_symbol(nameSymbol->as_C_string() + 1,
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	312 nameSymbol->utf8_length() - 2, CHECK_NULL);
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	313 resolved_type = SystemDictionary::find_instance_or_array_klass(tmp_name, classloader, protectionDomain, THREAD);
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	314 } else {
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	315 resolved_type = SystemDictionary::find_instance_or_array_klass(nameSymbol, classloader, protectionDomain, THREAD);
818757f088d3 Fixed signature lookup (unresolved arguments remained unresolved all the time). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4484 diff changeset	316 }
4484 14a00ee82980 Implement eager type resolving. Andreas Woess <andreas.woess@jku.at> parents: 4475 diff changeset	317 }
1481 fe69dec9a1ed Added support for CompileTheWorld. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1479 diff changeset	318 if (HAS_PENDING_EXCEPTION) {
fe69dec9a1ed Added support for CompileTheWorld. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1479 diff changeset	319 CLEAR_PENDING_EXCEPTION;
fe69dec9a1ed Added support for CompileTheWorld. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1479 diff changeset	320 resolved_type = NULL;
fe69dec9a1ed Added support for CompileTheWorld. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1479 diff changeset	321 }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	322 }
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	323 if (resolved_type != NULL) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	324 Handle type = GraalCompiler::createHotSpotResolvedJavaType(resolved_type, name, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	325 result = type();
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	326 } else {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	327 Handle type = VMToCompiler::createJavaType(name, THREAD);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	328 result = type();
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	329 }
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	330 }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	331
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	332 return JNIHandles::make_local(THREAD, result);
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	333 }
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	334
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	335 // public Object ConstantPool_lookupConstant(HotSpotResolvedJavaType type, int cpi);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	336 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_ConstantPool_1lookupConstant(JNIEnv *env, jobject, jobject type, jint index) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	337 TRACE_graal_3("CompilerToVM::ConstantPool_lookupConstant");
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	338 VM_ENTRY_MARK;
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	339
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	340 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(type)))->constants();
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	341
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	342 oop result = NULL;
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	343 constantTag tag = cp->tag_at(index);
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	344 if (tag.is_int()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	345 result = VMToCompiler::createConstant(Kind::Int(), cp->int_at(index), CHECK_0);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	346 } else if (tag.is_long()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	347 result = VMToCompiler::createConstant(Kind::Long(), cp->long_at(index), CHECK_0);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	348 } else if (tag.is_float()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	349 result = VMToCompiler::createConstantFloat(cp->float_at(index), CHECK_0);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	350 } else if (tag.is_double()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	351 result = VMToCompiler::createConstantDouble(cp->double_at(index), CHECK_0);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	352 } else if (tag.is_string() \|\| tag.is_unresolved_string()) {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	353 oop string = NULL;
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	354 if (cp->is_pseudo_string_at(index)) {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	355 string = cp->pseudo_string_at(index);
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	356 } else {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	357 string = cp->string_at(index, THREAD);
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	358 if (HAS_PENDING_EXCEPTION) {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	359 CLEAR_PENDING_EXCEPTION;
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	360 // TODO: Gracefully exit compilation.
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	361 fatal("out of memory during compilation!");
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	362 return NULL;
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	363 }
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	364 }
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	365 result = VMToCompiler::createConstantObject(string, CHECK_0);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	366 } else if (tag.is_klass() \|\| tag.is_unresolved_klass()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	367 Handle type = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	368 result = type();
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	369 } else if (tag.is_object()) {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	370 oop obj = cp->object_at(index);
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	371 assert(obj->is_instance(), "must be an instance");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	372 result = VMToCompiler::createConstantObject(obj, CHECK_NULL);
1413 1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	373 } else {
1ecc8f0aad00 Draft implementation of HotSpot CRI / first method compiling without exception. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1412 diff changeset	374 ShouldNotReachHere();
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	375 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	376
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	377 return JNIHandles::make_local(THREAD, result);
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	378 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	379
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	380 // public JavaMethod ConstantPool_lookupMethod(long vmId, int cpi, byte byteCode);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	381 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_ConstantPool_1lookupMethod(JNIEnv *env, jobject, jobject type, jint index, jbyte byteCode) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	382 TRACE_graal_3("CompilerToVM::ConstantPool_lookupMethod");
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	383 VM_ENTRY_MARK;
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	384 index = GraalCompiler::to_cp_index_u2(index);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	385 constantPoolHandle cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(type)))->constants();
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	386 instanceKlassHandle pool_holder(cp->pool_holder());
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	387
1432 b61a43cd1255 sourcecode formatting Lukas Stadler <lukas.stadler@oracle.com> parents: 1429 diff changeset	388 Bytecodes::Code bc = (Bytecodes::Code) (((int) byteCode) & 0xFF);
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	389 methodHandle method = GraalEnv::get_method_by_index(cp, index, bc, pool_holder);
3648 81ad8ab1f9fe Remove ci usage on method lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3647 diff changeset	390 if (!method.is_null()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	391 Handle ret = GraalCompiler::createHotSpotResolvedJavaMethod(method, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	392 return JNIHandles::make_local(THREAD, ret());
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	393 } else {
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	394 // Get the method's name and signature.
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	395 Handle name = VmIds::toString<Handle>(cp->name_ref_at(index), CHECK_NULL);
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	396 Handle signature = VmIds::toString<Handle>(cp->signature_ref_at(index), CHECK_NULL);
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	397 int holder_index = cp->klass_ref_index_at(index);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	398 Handle type = GraalCompiler::get_JavaType(cp, holder_index, cp->pool_holder(), CHECK_NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	399 return JNIHandles::make_local(THREAD, VMToCompiler::createJavaMethod(name, signature, type, THREAD));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	400 }
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	401 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	402
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	403 // public JavaType ConstantPool_lookupType(long vmId, int cpi);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	404 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_ConstantPool_1lookupType(JNIEnv *env, jobject, jobject type, jint index) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	405 TRACE_graal_3("CompilerToVM::ConstantPool_lookupType");
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	406 VM_ENTRY_MARK;
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	407
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	408 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(type)))->constants();
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	409 Handle result = GraalCompiler::get_JavaType(cp, index, cp->pool_holder(), CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	410 return JNIHandles::make_local(THREAD, result());
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	411 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	412
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	413 // public void ConstantPool_loadReferencedType(long vmId, int cpi);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	414 JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_ConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	415 TRACE_graal_3("CompilerToVM::ConstantPool_loadReferencedType");
3577 96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	416 VM_ENTRY_MARK;
3632 136ea96eb7f8 Remove the need for VmId (last usage was the constant pool). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3622 diff changeset	417
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	418 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(type)))->constants();
3577 96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	419 int byteCode = (op & 0xFF);
4316 b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4297 diff changeset	420 if (byteCode != Bytecodes::_checkcast && byteCode != Bytecodes::_instanceof && byteCode != Bytecodes::_new && byteCode != Bytecodes::_anewarray
b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4297 diff changeset	421 && byteCode != Bytecodes::_multianewarray && byteCode != Bytecodes::_ldc && byteCode != Bytecodes::_ldc_w && byteCode != Bytecodes::_ldc2_w)
b4b16e4e043f Fix eager resolving for class constants Peter Hofer <peter.hofer@jku.at> parents: 4297 diff changeset	422 {
3577 96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	423 index = cp->remap_instruction_operand_from_cache(GraalCompiler::to_cp_index_u2(index));
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	424 }
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	425 constantTag tag = cp->tag_at(index);
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	426 if (tag.is_field_or_method()) {
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	427 index = cp->uncached_klass_ref_index_at(index);
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	428 tag = cp->tag_at(index);
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	429 }
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	430
4176 a428df0139f3 Initialize resolved as well as unresolved classes in the native implementation of HotSpotConstantPool.loadReferencedType() Peter Hofer <peter.hofer@jku.at> parents: 4139 diff changeset	431 if (tag.is_unresolved_klass() \|\| tag.is_klass()) {
3577 96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	432 klassOop klass = cp->klass_at(index, CHECK);
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	433 if (klass->klass_part()->oop_is_instance()) {
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	434 instanceKlass::cast(klass)->initialize(CHECK);
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	435 }
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	436 }
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	437 }
96c40b338c1a Added new method that loads and initializes a class that is referenced by a cp entry. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3572 diff changeset	438
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	439 // public JavaField ConstantPool_lookupField(long vmId, int cpi);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	440 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_ConstantPool_1lookupField(JNIEnv *env, jobject, jobject constantPoolHolder, jint index, jbyte byteCode) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	441 TRACE_graal_3("CompilerToVM::ConstantPool_lookupField");
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	442 VM_ENTRY_MARK;
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	443 ResourceMark rm;
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	444
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	445 index = GraalCompiler::to_cp_index_u2(index);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	446 constantPoolHandle cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(constantPoolHolder)))->constants();
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	447
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	448 int nt_index = cp->name_and_type_ref_index_at(index);
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	449 int sig_index = cp->signature_ref_index_at(nt_index);
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	450 Symbol* signature = cp->symbol_at(sig_index);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	451 int name_index = cp->name_ref_index_at(nt_index);
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	452 Symbol* name = cp->symbol_at(name_index);
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	453 int holder_index = cp->klass_ref_index_at(index);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	454 Handle holder = GraalCompiler::get_JavaType(cp, holder_index, cp->pool_holder(), CHECK_NULL);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	455 instanceKlassHandle holder_klass;
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	456
1452 9b22e3e5df8e Solved an issue with unresolved field patching. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1449 diff changeset	457 Bytecodes::Code code = (Bytecodes::Code)(((int) byteCode) & 0xFF);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	458 int offset = -1;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	459 AccessFlags flags;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	460 BasicType basic_type;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	461 if (holder->klass() == SystemDictionary::HotSpotResolvedJavaType_klass()) {
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	462 FieldAccessInfo result;
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	463 LinkResolver::resolve_field(result, cp, index,
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	464 Bytecodes::java_code(code),
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	465 true, false, Thread::current());
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	466 if (HAS_PENDING_EXCEPTION) {
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	467 CLEAR_PENDING_EXCEPTION;
3655 2a0cb564e470 Do not use result when resolve_field throws an exception. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3653 diff changeset	468 } else {
2a0cb564e470 Do not use result when resolve_field throws an exception. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3653 diff changeset	469 offset = result.field_offset();
2a0cb564e470 Do not use result when resolve_field throws an exception. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3653 diff changeset	470 flags = result.access_flags();
2a0cb564e470 Do not use result when resolve_field throws an exception. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3653 diff changeset	471 holder_klass = result.klass()->as_klassOop();
2a0cb564e470 Do not use result when resolve_field throws an exception. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3653 diff changeset	472 basic_type = result.field_type();
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	473 holder = GraalCompiler::get_JavaType(holder_klass, CHECK_NULL);
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	474 }
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	475 }
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	476
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	477 Handle type = GraalCompiler::get_JavaTypeFromSignature(cp, sig_index, cp->pool_holder(), CHECK_NULL);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	478 Handle field_handle = GraalCompiler::get_JavaField(offset, flags.as_int(), name, holder, type, code, THREAD);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	479
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	480 oop constant_object = NULL;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	481 // Check to see if the field is constant.
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	482 if (!holder_klass.is_null() && holder_klass->is_initialized() && flags.is_final() && flags.is_static()) {
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	483 // This field just may be constant. The only cases where it will
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	484 // not be constant are:
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	485 //
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	486 // 1. The field holds a non-perm-space oop. The field is, strictly
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	487 // speaking, constant but we cannot embed non-perm-space oops into
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	488 // generated code. For the time being we need to consider the
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	489 // field to be not constant.
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	490 // 2. The field is a special static&final field whose value
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	491 // may change. The three examples are java.lang.System.in,
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	492 // java.lang.System.out, and java.lang.System.err.
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	493
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	494 bool ok = true;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	495 assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	496 if( holder_klass->as_klassOop() == SystemDictionary::System_klass() ) {
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	497 // Check offsets for case 2: System.in, System.out, or System.err
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	498 if( offset == java_lang_System::in_offset_in_bytes() \|\|
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	499 offset == java_lang_System::out_offset_in_bytes() \|\|
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	500 offset == java_lang_System::err_offset_in_bytes() ) {
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	501 ok = false;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	502 }
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1463 diff changeset	503 }
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	504
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	505 if (ok) {
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	506 Handle mirror = holder_klass->java_mirror();
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	507 switch(basic_type) {
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	508 case T_OBJECT:
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	509 case T_ARRAY:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	510 constant_object = VMToCompiler::createConstantObject(mirror->obj_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	511 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	512 case T_DOUBLE:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	513 constant_object = VMToCompiler::createConstantDouble(mirror->double_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	514 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	515 case T_FLOAT:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	516 constant_object = VMToCompiler::createConstantFloat(mirror->float_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	517 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	518 case T_LONG:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	519 constant_object = VMToCompiler::createConstant(Kind::Long(), mirror->long_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	520 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	521 case T_INT:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	522 constant_object = VMToCompiler::createConstant(Kind::Int(), mirror->int_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	523 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	524 case T_SHORT:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	525 constant_object = VMToCompiler::createConstant(Kind::Short(), mirror->short_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	526 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	527 case T_CHAR:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	528 constant_object = VMToCompiler::createConstant(Kind::Char(), mirror->char_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	529 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	530 case T_BYTE:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	531 constant_object = VMToCompiler::createConstant(Kind::Byte(), mirror->byte_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	532 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	533 case T_BOOLEAN:
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	534 constant_object = VMToCompiler::createConstant(Kind::Boolean(), mirror->bool_field(offset), CHECK_0);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	535 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	536 default:
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	537 fatal("Unhandled constant");
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	538 break;
5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	539 }
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1463 diff changeset	540 }
2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1463 diff changeset	541 }
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	542 if (constant_object != NULL) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	543 HotSpotResolvedJavaField::set_constant(field_handle, constant_object);
3649 5a8c44b5fb80 Remove ci usage on field lookup. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3648 diff changeset	544 }
1465 2c754f3a2722 Inlining of static final field values. Java mirror instead of VmID. Support for PrintMetrics option. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1463 diff changeset	545 return JNIHandles::make_local(THREAD, field_handle());
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	546 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	547
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	548 // public JavaMethod JavaType_resolveMethodImpl(HotSpotResolvedJavaType klass, String name, String signature);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	549 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_3resolveMethodImpl(JNIEnv *, jobject, jobject resolved_type, jstring name, jstring signature) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	550 TRACE_graal_3("CompilerToVM::JavaType_resolveMethodImpl");
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	551 VM_ENTRY_MARK;
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	552
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	553 assert(JNIHandles::resolve(resolved_type) != NULL, "");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	554 klassOop klass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(resolved_type));
2182 9569fdf936ff Made merge compile. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2061 diff changeset	555 Symbol* name_symbol = VmIds::toSymbol(name);
9569fdf936ff Made merge compile. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2061 diff changeset	556 Symbol* signature_symbol = VmIds::toSymbol(signature);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	557 methodHandle method = klass->klass_part()->lookup_method(name_symbol, signature_symbol);
1477 30e1f67703da Fix for failed method lookup. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1470 diff changeset	558 if (method == NULL) {
2901 d577d07cedec Added time measurement for phases. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2891 diff changeset	559 if (TraceGraal >= 3) {
1477 30e1f67703da Fix for failed method lookup. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1470 diff changeset	560 ResourceMark rm;
2492 4e5515d09314 Fixed merge issues. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2293 diff changeset	561 tty->print_cr("Could not resolve method %s %s on klass %s", name_symbol->as_C_string(), signature_symbol->as_C_string(), klass->klass_part()->name()->as_C_string());
1477 30e1f67703da Fix for failed method lookup. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1470 diff changeset	562 }
30e1f67703da Fix for failed method lookup. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1470 diff changeset	563 return NULL;
30e1f67703da Fix for failed method lookup. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1470 diff changeset	564 }
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	565 Handle ret = GraalCompiler::createHotSpotResolvedJavaMethod(method, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	566 return JNIHandles::make_local(THREAD, ret());
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	567 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	568
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	569 // public boolean JavaType_isSubtypeOf(HotSpotResolvedJavaType klass, JavaType other);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	570 JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_2isSubtypeOf(JNIEnv *, jobject, jobject klass, jobject jother) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	571 TRACE_graal_3("CompilerToVM::JavaType_isSubtypeOf");
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	572 VM_ENTRY_MARK;
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	573
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	574 oop other = JNIHandles::resolve(jother);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	575 assert(other->is_a(HotSpotResolvedJavaType::klass()), "resolved hotspot type expected");
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	576 assert(JNIHandles::resolve(klass) != NULL, "");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	577 klassOop thisKlass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass));
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	578 klassOop otherKlass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(other));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	579 if (thisKlass->klass_part()->oop_is_instance_slow()) {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	580 return instanceKlass::cast(thisKlass)->is_subtype_of(otherKlass);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	581 } else if (thisKlass->klass_part()->oop_is_array()) {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	582 return arrayKlass::cast(thisKlass)->is_subtype_of(otherKlass);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	583 } else {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	584 fatal("unexpected class type");
2215 999f8086cc4f More changes to make it compile and work on win64. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 2182 diff changeset	585 return false;
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	586 }
1414 e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	587 }
e1a275dbc8cd Executing a+b with C1X on HotSpot ;-) ! Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1413 diff changeset	588
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	589 // public JavaType JavaType_leastCommonAncestor(HotSpotResolvedJavaType thisType, HotSpotResolvedJavaType otherType);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	590 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_2leastCommonAncestor(JNIEnv *, jobject, jobject this_type, jobject other_type) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	591 TRACE_graal_3("CompilerToVM::JavaType_leastCommonAncestor");
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	592 VM_ENTRY_MARK;
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	593
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	594 Klass* this_klass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(this_type))->klass_part();
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	595 Klass* other_klass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(other_type))->klass_part();
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	596 Klass* lca = this_klass->LCA(other_klass);
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	597
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	598 return JNIHandles::make_local(GraalCompiler::get_JavaType(lca, THREAD)());
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	599 }
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	600
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	601 // public JavaType JavaType_componentType(HotSpotResolvedType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	602 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1componentType(JNIEnv *, jobject, jobject klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	603 TRACE_graal_3("CompilerToVM::JavaType_componentType");
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	604 VM_ENTRY_MARK;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	605 KlassHandle array_klass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass));
3697 872e949a0827 fix componentType for the primitive array case Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 3688 diff changeset	606 if(array_klass->oop_is_typeArray()) {
872e949a0827 fix componentType for the primitive array case Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 3688 diff changeset	607 BasicType t = typeArrayKlass::cast(array_klass())->element_type();
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	608 oop primitive_type = VMToCompiler::createPrimitiveJavaType((int) t, CHECK_NULL);
3697 872e949a0827 fix componentType for the primitive array case Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 3688 diff changeset	609 return JNIHandles::make_local(primitive_type);
872e949a0827 fix componentType for the primitive array case Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 3688 diff changeset	610 }
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	611 assert(array_klass->oop_is_objArray(), "just checking");
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	612 klassOop element_type = objArrayKlass::cast(array_klass())->element_klass();
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	613 assert(JNIHandles::resolve(klass) != NULL, "");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	614 return JNIHandles::make_local(GraalCompiler::get_JavaType(element_type, THREAD)());
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	615 }
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	616
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	617 // public JavaType JavaType_superType(HotSpotResolvedType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	618 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1superType(JNIEnv *, jobject, jobject klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	619 TRACE_graal_3("CompilerToVM::JavaType_superType");
2499 ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	620 VM_ENTRY_MARK;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	621 KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass)));
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	622 klassOop k;
2499 ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	623
ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	624 if (klass_handle->oop_is_array()) {
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	625 k = SystemDictionary::Object_klass();
2499 ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	626 } else {
ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	627 guarantee(klass_handle->oop_is_instance(), "must be instance klass");
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	628 k = klass_handle->super();
2499 ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	629 }
ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	630
ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	631 if (k != NULL) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	632 return JNIHandles::make_local(GraalCompiler::get_JavaType(k, THREAD)());
2499 ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	633 } else {
ad9b14650e15 Fixed an issue with RiType.superType (wrong cast in the C++ part). Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2492 diff changeset	634 return NULL;
2293 e3c42b8de67e Removed a reference to getRiType(Class c) and some checkstyle fixes. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2289 diff changeset	635 }
e3c42b8de67e Removed a reference to getRiType(Class c) and some checkstyle fixes. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 2289 diff changeset	636 }
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	637
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	638 // public JavaType JavaType_uniqueConcreteSubtype(HotSpotResolvedType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	639 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1uniqueConcreteSubtype(JNIEnv *, jobject, jobject klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	640 TRACE_graal_3("CompilerToVM::JavaType_uniqueConcreteSubtype");
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	641 VM_ENTRY_MARK;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	642 KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass)));
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	643 Klass *up_cast = klass_handle->up_cast_abstract();
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	644 if (up_cast->is_leaf_class()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	645 return JNIHandles::make_local(GraalCompiler::get_JavaType(up_cast, THREAD)());
2048 177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	646 }
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	647 return NULL;
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	648 }
177398c6147d Added unique concrete subtype assumption. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2046 diff changeset	649
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	650 // public bool JavaType_isInitialized(HotSpotResolvedType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	651 JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1isInitialized(JNIEnv *, jobject, jobject hotspot_klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	652 TRACE_graal_3("CompilerToVM::JavaType_isInitialized");
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	653 klassOop klass = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(hotspot_klass));
3618 e82da3a1bbc9 Fix crash in branch prediction if there's no current environment. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3587 diff changeset	654 assert(klass != NULL, "method must not be called for primitive types");
3011 f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	655 return instanceKlass::cast(klass)->is_initialized();
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	656 }
f00918f35c7f inlining and runtime interface related changes: Lukas Stadler <lukas.stadler@jku.at> parents: 2990 diff changeset	657
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	658 // public JavaType JavaType_arrayOf(HotSpotResolvedJavaType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	659 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1arrayOf(JNIEnv *, jobject, jobject klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	660 TRACE_graal_3("CompilerToVM::JavaType_arrayOf");
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	661 VM_ENTRY_MARK;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	662
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	663 KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass)));
3674 d3d3dd0a3421 Fixed a regression. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	664 KlassHandle arr = klass_handle->array_klass(THREAD);
d3d3dd0a3421 Fixed a regression. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	665 Handle name = VmIds::toString<Handle>(arr->name(), CHECK_NULL);
d3d3dd0a3421 Fixed a regression. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3670 diff changeset	666 assert(arr->oop_is_array(), "");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	667 return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotResolvedJavaType(arr, name, THREAD)());
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	668 }
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	669
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	670 // public ResolvedJavaField[] JavaType_fields(HotSpotResolvedJavaType klass);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	671 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaType_1fields(JNIEnv *, jobject, jobject klass) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	672 TRACE_graal_3("CompilerToVM::JavaType_fields");
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	673 VM_ENTRY_MARK;
3650 0e8a2a629afb Pass-by compilation broker. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3649 diff changeset	674 ResourceMark rm;
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	675
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	676 instanceKlassHandle k = java_lang_Class::as_klassOop(HotSpotResolvedJavaType::javaMirror(klass));
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	677 class MyFieldClosure : public FieldClosure {
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	678 public:
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	679 instanceKlassHandle _holder;
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	680 Handle _resolved_type_holder;
3638 e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	681 GrowableArray<Handle> _field_array;
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	682
3638 e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	683 MyFieldClosure(instanceKlassHandle& holder, Handle resolved_type_holder) : _holder(holder), _resolved_type_holder(resolved_type_holder) { }
3587 1692a2f9bfc5 Only return declared fields on fields() call. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3586 diff changeset	684
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	685 virtual void do_field(fieldDescriptor* fd) {
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	686 if (!Thread::current()->has_pending_exception()) {
ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	687 if (fd->field_holder() == _holder()) {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	688 Handle type = GraalCompiler::get_JavaTypeFromSignature(fd->constants(), fd->signature_index(), fd->field_holder(), Thread::current());
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	689 Handle field = VMToCompiler::createJavaField(_resolved_type_holder, VmIds::toString<Handle>(fd->name(), Thread::current()), type, fd->offset(), fd->access_flags().as_int(), Thread::current());
3638 e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	690 _field_array.append(field());
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	691 }
3587 1692a2f9bfc5 Only return declared fields on fields() call. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3586 diff changeset	692 }
1692a2f9bfc5 Only return declared fields on fields() call. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3586 diff changeset	693 }
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	694 };
3638 e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	695 MyFieldClosure closure(k, JNIHandles::resolve(klass));
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	696 k->do_nonstatic_fields(&closure);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	697 objArrayHandle field_array = oopFactory::new_objArray(SystemDictionary::ResolvedJavaField_klass(), closure._field_array.length(), CHECK_NULL);
3638 e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	698 for (int i=0; i<closure._field_array.length(); ++i) {
e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	699 field_array->obj_at_put(i, closure._field_array.at(i)());
e53cfcb230a7 Fixed an issue with the runtime queried escape analysis field array. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3637 diff changeset	700 }
3637 ff6a991c6e3c Use GraalEnv to look up types. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3636 diff changeset	701 return JNIHandles::make_local(field_array());
3090 536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3055 diff changeset	702 }
536528f48708 more escape analysis work: debug info Lukas Stadler <lukas.stadler@jku.at> parents: 3055 diff changeset	703
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	704 // public JavaType getPrimitiveArrayType(Kind kind);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	705 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getPrimitiveArrayType(JNIEnv *env, jobject, jobject kind) {
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	706 TRACE_graal_3("CompilerToVM::getPrimitiveArrayType");
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	707 VM_ENTRY_MARK;
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	708 BasicType type = GraalCompiler::kindToBasicType(Kind::typeChar(kind));
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	709 assert(type != T_OBJECT, "primitive type expecteds");
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	710 Handle result = GraalCompiler::get_JavaType(Universe::typeArrayKlassObj(type), CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	711 return JNIHandles::make_local(THREAD, result());
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	712 }
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	713
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	714 // public long getMaxCallTargetOffset(RuntimeCall rtcall);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	715 JNIEXPORT jlong JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getMaxCallTargetOffset(JNIEnv *env, jobject, jobject rtcall) {
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	716 TRACE_graal_3("CompilerToVM::getMaxCallTargetOffset");
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	717 VM_ENTRY_MARK;
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	718 oop call = JNIHandles::resolve(rtcall);
3572 076a2c9caf71 Factor out runtime call target address determination to avoid redundancy between CodeInstaller::site_Call() and VMEntries.getMaxCallTargetOffset() Peter Hofer <peter.hofer@jku.at> parents: 3571 diff changeset	719 address target_addr = CodeInstaller::runtime_call_target_address(call);
3563 8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	720 if (target_addr != 0x0) {
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	721 int64_t off_low = (int64_t)target_addr - ((int64_t)CodeCache::low_bound() + sizeof(int));
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	722 int64_t off_high = (int64_t)target_addr - ((int64_t)CodeCache::high_bound() + sizeof(int));
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	723 return MAX2(ABS(off_low), ABS(off_high));
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	724 }
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	725 return -1;
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	726 }
8780fa370aab Support runtime calls to targets that don't fit in a 32-bit immediate: allow to query the maximum offset of a CiRuntimeCall target to determine the required immediate size and patch call sites with a mov/call instruction pair for indirect calls Peter Hofer <peter.hofer@jku.at> parents: 3559 diff changeset	727
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	728 // public JavaType getType(Class<?> javaClass);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	729 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getType(JNIEnv *env, jobject, jobject javaClass) {
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	730 TRACE_graal_3("CompilerToVM::getType");
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	731 VM_ENTRY_MARK;
2058 8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	732 oop javaClassOop = JNIHandles::resolve(javaClass);
8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	733 if (javaClassOop == NULL) {
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	734 fatal("argument to CompilerToVM.getType must not be NULL");
2215 999f8086cc4f More changes to make it compile and work on win64. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 2182 diff changeset	735 return NULL;
2058 8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	736 } else if (java_lang_Class::is_primitive(javaClassOop)) {
8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	737 BasicType basicType = java_lang_Class::primitive_type(javaClassOop);
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	738 return JNIHandles::make_local(THREAD, VMToCompiler::createPrimitiveJavaType((int) basicType, THREAD));
2058 8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	739 } else {
8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	740 KlassHandle klass = java_lang_Class::as_klassOop(javaClassOop);
8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	741 Handle name = java_lang_String::create_from_symbol(klass->name(), CHECK_NULL);
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	742
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	743 Handle type = GraalCompiler::createHotSpotResolvedJavaType(klass, name, CHECK_NULL);
3653 6aef50c6d967 Handlize to fix GC issue. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3650 diff changeset	744 return JNIHandles::make_local(THREAD, type());
2058 8f033d37798a Better support for array types. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2057 diff changeset	745 }
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	746 }
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	747
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	748
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	749 // helpers used to set fields in the HotSpotVMConfig object
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	750 jfieldID getFieldID(JNIEnv* env, jobject obj, const char* name, const char* sig) {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	751 jfieldID id = env->GetFieldID(env->GetObjectClass(obj), name, sig);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	752 if (id == NULL) {
3552 aa7b62997aa0 better error message of field not found Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3549 diff changeset	753 fatal(err_msg("field not found: %s (%s)", name, sig));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	754 }
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	755 return id;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	756 }
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	757
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	758 void set_boolean(JNIEnv* env, jobject obj, const char* name, bool value) { env->SetBooleanField(obj, getFieldID(env, obj, name, "Z"), value); }
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	759 void set_int(JNIEnv* env, jobject obj, const char* name, int value) { env->SetIntField(obj, getFieldID(env, obj, name, "I"), value); }
2216 b966d9b66bf9 Fixed a bug that truncated stub ids when compiling with vs. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 2215 diff changeset	760 void set_long(JNIEnv* env, jobject obj, const char* name, jlong value) { env->SetLongField(obj, getFieldID(env, obj, name, "J"), value); }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	761 void set_object(JNIEnv* env, jobject obj, const char* name, jobject value) { env->SetObjectField(obj, getFieldID(env, obj, name, "Ljava/lang/Object;"), value); }
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	762 void set_int_array(JNIEnv* env, jobject obj, const char* name, jarray value) { env->SetObjectField(obj, getFieldID(env, obj, name, "[I"), value); }
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	763
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	764 jboolean get_boolean(JNIEnv* env, jobject obj, const char* name) { return env->GetBooleanField(obj, getFieldID(env, obj, name, "Z")); }
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	765 jint get_int(JNIEnv* env, jobject obj, const char* name) { return env->GetIntField(obj, getFieldID(env, obj, name, "I")); }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	766 jlong get_long(JNIEnv* env, jobject obj, const char* name) { return env->GetLongField(obj, getFieldID(env, obj, name, "J")); }
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	767 jobject get_object(JNIEnv* env, jobject obj, const char* name) { return env->GetObjectField(obj, getFieldID(env, obj, name, "Ljava/lang/Object;")); }
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	768 jobject get_object(JNIEnv* env, jobject obj, const char* name, const char* sig) { return env->GetObjectField(obj, getFieldID(env, obj, name, sig)); }
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	769
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	770
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	771 BasicType basicTypes[] = { T_BOOLEAN, T_BYTE, T_SHORT, T_CHAR, T_INT, T_FLOAT, T_LONG, T_DOUBLE, T_OBJECT };
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	772 int basicTypeCount = sizeof(basicTypes) / sizeof(BasicType);
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	773
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	774 // public HotSpotVMConfig getConfiguration();
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	775 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) {
5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	776 jclass klass = env->FindClass("com/oracle/graal/hotspot/HotSpotVMConfig");
1419 7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	777 assert(klass != NULL, "HotSpot vm config class not found");
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	778 jobject config = env->AllocObject(klass);
1419 7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	779 #ifdef _WIN64
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	780 set_boolean(env, config, "windowsOs", true);
1419 7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	781 #else
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	782 set_boolean(env, config, "windowsOs", false);
1419 7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	783 #endif
5624 7d25723b7699 added oop verification to NewInstanceSnippets when -XX:+VerifyOops is enabled Doug Simon <doug.simon@oracle.com> parents: 5618 diff changeset	784 set_boolean(env, config, "verifyOops", VerifyOops);
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	785 set_boolean(env, config, "useFastLocking", UseFastLocking);
2061 c0b1d6a44a02 Implemented fast inline array allocation. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2060 diff changeset	786 set_boolean(env, config, "useFastNewObjectArray", UseFastNewObjectArray);
c0b1d6a44a02 Implemented fast inline array allocation. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2060 diff changeset	787 set_boolean(env, config, "useFastNewTypeArray", UseFastNewTypeArray);
5602 e79b593e0632 made NewInstanceSnippets respect the UseTLAB HotSpot option Doug Simon <doug.simon@oracle.com> parents: 5561 diff changeset	788 set_boolean(env, config, "useTLAB", UseTLAB);
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	789 set_int(env, config, "codeEntryAlignment", CodeEntryAlignment);
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	790 set_int(env, config, "vmPageSize", os::vm_page_size());
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	791 set_int(env, config, "stackShadowPages", StackShadowPages);
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	792 set_int(env, config, "hubOffset", oopDesc::klass_offset_in_bytes());
5466 af07e798947d lifted fast subtype check into checkcast snippets Doug Simon <doug.simon@oracle.com> parents: 5450 diff changeset	793 set_int(env, config, "superCheckOffsetOffset", in_bytes(Klass::super_check_offset_offset()));
af07e798947d lifted fast subtype check into checkcast snippets Doug Simon <doug.simon@oracle.com> parents: 5450 diff changeset	794 set_int(env, config, "secondarySuperCacheOffset", in_bytes(Klass::secondary_super_cache_offset()));
af07e798947d lifted fast subtype check into checkcast snippets Doug Simon <doug.simon@oracle.com> parents: 5450 diff changeset	795 set_int(env, config, "secondarySupersOffset", in_bytes(Klass::secondary_supers_offset()));
1422 3483ec571caf * using reflected objects instead of oops Lukas Stadler <lukas.stadler@oracle.com> parents: 1421 diff changeset	796 set_int(env, config, "arrayLengthOffset", arrayOopDesc::length_offset_in_bytes());
4973 5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	797 set_int(env, config, "klassStateOffset", in_bytes(instanceKlass::init_state_offset()));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	798 set_int(env, config, "klassStateFullyInitialized", (int)instanceKlass::fully_initialized);
1425 98fffb304868 tlab-allocated "new instance", invokespecial, support for static fields in COMPILER_CLASSES_DO Lukas Stadler <lukas.stadler@oracle.com> parents: 1423 diff changeset	799 set_int(env, config, "threadTlabTopOffset", in_bytes(JavaThread::tlab_top_offset()));
98fffb304868 tlab-allocated "new instance", invokespecial, support for static fields in COMPILER_CLASSES_DO Lukas Stadler <lukas.stadler@oracle.com> parents: 1423 diff changeset	800 set_int(env, config, "threadTlabEndOffset", in_bytes(JavaThread::tlab_end_offset()));
2059 9508a52cbd32 Add deoptimization blob support. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 2058 diff changeset	801 set_int(env, config, "threadObjectOffset", in_bytes(JavaThread::threadObj_offset()));
4973 5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	802 set_int(env, config, "instanceHeaderPrototypeOffset", in_bytes(Klass::prototype_header_offset()));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	803 set_int(env, config, "threadExceptionOopOffset", in_bytes(JavaThread::exception_oop_offset()));
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	804 set_int(env, config, "threadExceptionPcOffset", in_bytes(JavaThread::exception_pc_offset()));
5747 120820e30baa added basic high-level interpreter support to HotSpot Christian Haeubl <haeubl@ssw.jku.at> parents: 5624 diff changeset	805 set_int(env, config, "threadMultiNewArrayStorageOffset", in_bytes(JavaThread::graal_multinewarray_storage_offset()));
4973 5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	806 set_int(env, config, "classMirrorOffset", in_bytes(Klass::java_mirror_offset()));
4441 4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	807
4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	808 set_int(env, config, "methodDataOopDataOffset", in_bytes(methodDataOopDesc::data_offset()));
5114 dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history Christian Haeubl <christian.haeubl@oracle.com> parents: 5062 diff changeset	809 set_int(env, config, "methodDataOopTrapHistoryOffset", in_bytes(methodDataOopDesc::trap_history_offset()));
4443 6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	810 set_int(env, config, "dataLayoutHeaderSize", DataLayout::header_size_in_bytes());
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	811 set_int(env, config, "dataLayoutTagOffset", in_bytes(DataLayout::tag_offset()));
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	812 set_int(env, config, "dataLayoutFlagsOffset", in_bytes(DataLayout::flags_offset()));
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	813 set_int(env, config, "dataLayoutBCIOffset", in_bytes(DataLayout::bci_offset()));
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	814 set_int(env, config, "dataLayoutCellsOffset", in_bytes(DataLayout::cell_offset(0)));
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	815 set_int(env, config, "dataLayoutCellSize", DataLayout::cell_size);
6fb167f79df6 fixed methodDataOop access Christian Haeubl <christian.haeubl@oracle.com> parents: 4442 diff changeset	816 set_int(env, config, "bciProfileWidth", BciProfileWidth);
4441 4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	817 set_int(env, config, "typeProfileWidth", TypeProfileWidth);
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	818
5618 60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	819 // We use the fast path stub so that we get TLAB refills whenever possible instead of
60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	820 // unconditionally allocating directly from the heap (which the slow path does).
60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	821 // The stub must also do initialization when the compiled check fails.
60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	822 Runtime1::StubID newInstanceStub = Runtime1::fast_new_instance_init_check_id;
60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	823
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: 1427 diff changeset	824 set_long(env, config, "debugStub", VmIds::addStub((address)warning));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	825 set_long(env, config, "instanceofStub", VmIds::addStub(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
5624 7d25723b7699 added oop verification to NewInstanceSnippets when -XX:+VerifyOops is enabled Doug Simon <doug.simon@oracle.com> parents: 5618 diff changeset	826 set_long(env, config, "verifyOopStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_verify_oop_id)));
5618 60ca7d300b8f reverted to using fast_new_instance_init_check_id stub to use fast TLAB refilling Doug Simon <doug.simon@oracle.com> parents: 5602 diff changeset	827 set_long(env, config, "newInstanceStub", VmIds::addStub(Runtime1::entry_for(newInstanceStub)));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	828 set_long(env, config, "newTypeArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_type_array_id)));
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	829 set_long(env, config, "newObjectArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_object_array_id)));
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	830 set_long(env, config, "newMultiArrayStub", VmIds::addStub(Runtime1::entry_for(Runtime1::new_multi_array_id)));
abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	831 set_long(env, config, "loadKlassStub", VmIds::addStub(Runtime1::entry_for(Runtime1::load_klass_patching_id)));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	832 set_long(env, config, "accessFieldStub", VmIds::addStub(Runtime1::entry_for(Runtime1::access_field_patching_id)));
1428 695451afc619 refactoring classes into separate files Lukas Stadler <lukas.stadler@oracle.com> parents: 1427 diff changeset	833 set_long(env, config, "resolveStaticCallStub", VmIds::addStub(SharedRuntime::get_resolve_static_call_stub()));
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	834 set_long(env, config, "inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub()));
1429 abc670a709dc * -XX:TraceC1X=0...5 controls the native c1x tracing Lukas Stadler <lukas.stadler@oracle.com> parents: 1428 diff changeset	835 set_long(env, config, "handleExceptionStub", VmIds::addStub(Runtime1::entry_for(Runtime1::handle_exception_nofpu_id)));
1936 8d88c9ac9247 Correct deopt handler entry. New flag -XX:+TraceSignals. More detailed deopt printing. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1931 diff changeset	836 set_long(env, config, "handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack()));
1942 00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	837 set_long(env, config, "monitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorenter_id)));
00bc9eaf0e24 Support for -XX:+UseFastLocking flag. Fixed monitor enter XIR template for correct debug info at the runtime call. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1941 diff changeset	838 set_long(env, config, "monitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorexit_id)));
2891 75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	839 set_long(env, config, "fastMonitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorenter_id)));
75a99b4f1c98 Rebranded C++ part from C1X to Graal. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 2890 diff changeset	840 set_long(env, config, "fastMonitorExitStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_monitorexit_id)));
1434 72cfb36c6bb2 * enabled all jtt tests Lukas Stadler <lukas.stadler@oracle.com> parents: 1433 diff changeset	841 set_long(env, config, "safepointPollingAddress", (jlong)(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size())));
3569 76a7f1732bb0 New runtime parameter: runtimeCallStackSize (size on the stack that must be left empty in case of runtime calls) Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3563 diff changeset	842 set_int(env, config, "runtimeCallStackSize", (jint)frame::arg_reg_save_area_bytes);
4973 5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	843 set_int(env, config, "klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset()));
5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	844 set_int(env, config, "graalMirrorKlassOffset", in_bytes(Klass::graal_mirror_offset()));
3571 a72615456c50 Add two VM configs for intrinsifications. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3570 diff changeset	845 set_int(env, config, "klassOopOffset", java_lang_Class::klass_offset_in_bytes());
5000 b5dc2403c1e7 add option to inline VTable stubs Lukas Stadler <lukas.stadler@jku.at> parents: 4993 diff changeset	846 set_int(env, config, "methodCompiledEntryOffset", in_bytes(methodOopDesc::from_compiled_offset()));
4441 4e3aaf14cbc6 fixed graal to hotspot Christian Haeubl <christian.haeubl@oracle.com> parents: 4439 diff changeset	847
3549 25765a764212 Add support for polling mark in code installer Gilles Duboscq <gilles.duboscq@oracle.com> parents: 3487 diff changeset	848 set_boolean(env, config, "isPollingPageFar", Assembler::is_polling_page_far());
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	849
3683 345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	850 set_int(env, config, "nmethodEntryOffset", nmethod::verified_entry_point_offset());
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	851
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	852 BarrierSet* bs = Universe::heap()->barrier_set();
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	853 switch (bs->kind()) {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	854 case BarrierSet::CardTableModRef:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	855 case BarrierSet::CardTableExtension: {
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	856 jlong base = (jlong)((CardTableModRefBS*)bs)->byte_map_base;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	857 assert(base != 0, "unexpected byte_map_base");
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	858 set_long(env, config, "cardtableStartAddress", base);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	859 set_int(env, config, "cardtableShift", CardTableModRefBS::card_shift);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	860 break;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	861 }
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	862 case BarrierSet::ModRef:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	863 case BarrierSet::Other:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	864 set_long(env, config, "cardtableStartAddress", 0);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	865 set_int(env, config, "cardtableShift", 0);
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	866 // No post barriers
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	867 break;
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	868 #ifndef SERIALGC
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	869 case BarrierSet::G1SATBCT:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	870 case BarrierSet::G1SATBCTLogging:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	871 #endif // SERIALGC
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	872 default:
efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	873 ShouldNotReachHere();
2926 0e3ec0a4eda4 RiTypeProfile information and invocation counters for RiMethods Lukas Stadler <lukas.stadler@jku.at> parents: 2901 diff changeset	874 break;
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	875 }
1425 98fffb304868 tlab-allocated "new instance", invokespecial, support for static fields in COMPILER_CLASSES_DO Lukas Stadler <lukas.stadler@oracle.com> parents: 1423 diff changeset	876
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	877 jintArray arrayOffsets = env->NewIntArray(basicTypeCount);
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	878 for (int i=0; i<basicTypeCount; i++) {
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	879 jint offset = arrayOopDesc::base_offset_in_bytes(basicTypes[i]);
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	880 env->SetIntArrayRegion(arrayOffsets, i, 1, &offset);
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	881 }
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	882 set_int_array(env, config, "arrayOffsets", arrayOffsets);
4973 5d154704b04c Merge fix #3. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4971 diff changeset	883 set_int(env, config, "arrayClassElementOffset", in_bytes(objArrayKlass::element_klass_offset()));
1419 7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	884 return config;
7bf6a77b9c5a implement recent safepoint & exceptionobject ci changes, HotSpotVMConfig Lukas Stadler <lukas.stadler@oracle.com> parents: 1415 diff changeset	885 }
1412 9195b99c841b Added first VM entry method. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1410 diff changeset	886
3683 345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	887 // public HotSpotCompiledMethod installMethod(HotSpotTargetMethod targetMethod, boolean installCode);
5275 290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	888 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code, jobject info) {
1449 8cfe3537a0d3 Pointer verification stub. Two loose oop fixes in C1X C++ part. Logging which methods have been compiled. Thomas Wuerthinger <wuerthinger@ssw.jku.at> parents: 1445 diff changeset	889 VM_ENTRY_MARK;
3669 53636e2c9d03 No longer use shared ciFactory. Remove make_global usage in code installer. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3667 diff changeset	890 ResourceMark rm;
3670 f198b24093f3 put back in thread transitions. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3669 diff changeset	891 HandleMark hm;
3667 e755289380e3 Removed a safepoint possibility in the code installer when creating CiVirtualObject objects. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	892 Handle targetMethodHandle = JNIHandles::resolve(targetMethod);
3619 5e9645341ec3 support for new RiRuntime features: add code without making it the default for the method, executing Java tasks on the compile thread, communicate nmethod reference to Java code as HotSpotCompiledMethod Lukas Stadler <lukas.stadler@jku.at> parents: 3587 diff changeset	893 nmethod* nm = NULL;
3636 c7d4198a9bce Use GraalEnv for installing code. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3632 diff changeset	894 Arena arena;
c7d4198a9bce Use GraalEnv for installing code. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3632 diff changeset	895 ciEnv env(&arena);
3667 e755289380e3 Removed a safepoint possibility in the code installer when creating CiVirtualObject objects. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3663 diff changeset	896 CodeInstaller installer(targetMethodHandle, nm, install_code != 0);
3683 345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	897
5275 290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	898 if (info != NULL) {
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	899 arrayOop codeCopy = oopFactory::new_byteArray(nm->code_size(), CHECK_0);
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	900 memcpy(codeCopy->base(T_BYTE), nm->code_begin(), nm->code_size());
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	901 HotSpotCodeInfo::set_code(info, codeCopy);
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	902 HotSpotCodeInfo::set_start(info, (jlong) nm->code_begin());
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	903 }
290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	904
5537 80371cc2256d Renaming RiCompiledMethod => InstalledCode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5530 diff changeset	905 // if install_code is true then we installed the code into the given method, no need to return an InstalledCode
3683 345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	906 if (!install_code && nm != NULL) {
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	907 instanceKlass::cast(HotSpotCompiledMethod::klass())->initialize(CHECK_NULL);
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	908 Handle obj = instanceKlass::cast(HotSpotCompiledMethod::klass())->allocate_permanent_instance(CHECK_NULL);
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	909 assert(obj() != NULL, "must succeed in allocating instance");
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	910 HotSpotCompiledMethod::set_nmethod(obj, (jlong) nm);
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	911 HotSpotCompiledMethod::set_method(obj, HotSpotTargetMethod::method(targetMethod));
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	912 nm->set_graal_compiled_method(obj());
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	913 return JNIHandles::make_local(obj());
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	914 } else {
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	915 return NULL;
345c3bbf9c3c store RiCompiledMethod in nmethod and: Lukas Stadler <lukas.stadler@jku.at> parents: 3632 diff changeset	916 }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	917 }
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	918
4297 874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	919 // public String disassembleNative(byte[] code, long address);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	920 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_disassembleNative(JNIEnv *jniEnv, jobject, jbyteArray code, jlong start_address) {
4297 874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	921 TRACE_graal_3("CompilerToVM::disassembleNative");
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	922 VM_ENTRY_MARK;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	923 ResourceMark rm;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	924 HandleMark hm;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	925
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	926 stringStream(st);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	927 arrayOop code_oop = (arrayOop) JNIHandles::resolve(code);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	928 int len = code_oop->length();
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	929 address begin = (address) code_oop->base(T_BYTE);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	930 address end = begin + len;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	931 Disassembler::decode(begin, end, &st);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	932
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	933 Handle result = java_lang_String::create_from_platform_dependent_str(st.as_string(), CHECK_NULL);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	934 return JNIHandles::make_local(result());
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	935 }
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	936
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	937 // public String disassembleJava(HotSpotResolvedJavaMethod method);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	938 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_disassembleJava(JNIEnv *env, jobject, jobject hotspot_method) {
4297 874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	939 TRACE_graal_3("CompilerToVM::disassembleJava");
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	940
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	941 // Important: The bytecode printing functions are all NOT PRODUCT code, so this method returns an empty string for a product VM build.
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	942
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	943 VM_ENTRY_MARK;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	944 ResourceMark rm;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	945 HandleMark hm;
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	946
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	947 methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	948 // Note: cannot use resource-allocated stringStream because print_code_on has its own ResourceMark.
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	949 bufferedStream(st);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	950 method->print_codes_on(&st);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	951
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	952 Handle result = java_lang_String::create_from_platform_dependent_str(st.as_string(), CHECK_NULL);
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	953 return JNIHandles::make_local(result());
874fcc2ddd9d Use HotSpot disassmblers for native code and bytecode Christian Wimmer <christian.wimmer@oracle.com> parents: 4223 diff changeset	954 }
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	955
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	956 // public StackTraceElement JavaMethod_toStackTraceElement(HotSpotResolvedJavaMethod method, int bci);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	957 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_1toStackTraceElement(JNIEnv *env, jobject, jobject hotspot_method, int bci) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	958 TRACE_graal_3("CompilerToVM::JavaMethod_toStackTraceElement");
5238 cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	959
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	960 VM_ENTRY_MARK;
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	961 ResourceMark rm;
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	962 HandleMark hm;
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	963
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	964 methodHandle method = getMethodFromHotSpotMethod(hotspot_method);
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	965 oop element = java_lang_StackTraceElement::create(method, bci, CHECK_NULL);
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	966 return JNIHandles::make_local(element);
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	967 }
cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	968
5246 8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	969 // public Object executeCompiledMethodVarargs(HotSpotCompiledMethod method, Object... args);
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	970 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_executeCompiledMethodVarargs(JNIEnv *env, jobject, jobject method, jobject args) {
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	971 TRACE_graal_3("CompilerToVM::executeCompiledMethod");
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	972
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	973 VM_ENTRY_MARK;
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	974 ResourceMark rm;
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	975 HandleMark hm;
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	976
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	977 assert(method != NULL, "just checking");
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	978 methodHandle mh = getMethodFromHotSpotMethod(HotSpotCompiledMethod::method(method));
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	979 Symbol* signature = mh->signature();
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	980 JavaCallArguments jca;
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	981
5747 120820e30baa added basic high-level interpreter support to HotSpot Christian Haeubl <haeubl@ssw.jku.at> parents: 5624 diff changeset	982 JavaArgumentUnboxer jap(signature, &jca, (arrayOop) JNIHandles::resolve(args), mh->is_static());
5246 8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	983 JavaValue result(jap.get_ret_type());
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	984
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	985 nmethod* nm = (nmethod*) HotSpotCompiledMethod::nmethod(method);
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	986 if (nm == NULL \|\| !nm->is_alive()) {
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	987 THROW_0(vmSymbols::MethodInvalidatedException());
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	988 }
5466 af07e798947d lifted fast subtype check into checkcast snippets Doug Simon <doug.simon@oracle.com> parents: 5450 diff changeset	989
5246 8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	990 JavaCalls::call(&result, mh, nm, &jca, CHECK_NULL);
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	991
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	992 if (jap.get_ret_type() == T_VOID) {
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	993 return NULL;
5395 fc1943f18fef fixed bug in returning array values from CompilerToVMImpl.executeCompiledMethodVarargs Doug Simon <doug.simon@oracle.com> parents: 5318 diff changeset	994 } else if (jap.get_ret_type() == T_OBJECT \|\| jap.get_ret_type() == T_ARRAY) {
5246 8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	995 return JNIHandles::make_local((oop) result.get_jobject());
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	996 } else {
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	997 oop o = java_lang_boxing_object::create(jap.get_ret_type(), (jvalue *) result.get_value_addr(), CHECK_NULL);
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	998 return JNIHandles::make_local(o);
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	999 }
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	1000 }
8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	1001
4993 897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1002 // public Object executeCompiledMethod(HotSpotCompiledMethod method, Object arg1, Object arg2, Object arg3);
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	1003 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_executeCompiledMethod(JNIEnv *env, jobject, jobject method, jobject arg1, jobject arg2, jobject arg3) {
4993 897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1004 TRACE_graal_3("CompilerToVM::executeCompiledMethod");
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1005
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1006 VM_ENTRY_MARK;
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1007 ResourceMark rm;
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1008 HandleMark hm;
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1009
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1010 methodHandle actualMethod = getMethodFromHotSpotMethod(HotSpotCompiledMethod::method(method));
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1011 assert(method != NULL, "just checking");
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1012 JavaValue result(T_OBJECT);
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1013 JavaCallArguments args;
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1014 args.push_oop(JNIHandles::resolve(arg1));
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1015 args.push_oop(JNIHandles::resolve(arg2));
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1016 args.push_oop(JNIHandles::resolve(arg3));
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1017
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1018 nmethod* nm = (nmethod*) HotSpotCompiledMethod::nmethod(method);
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1019 if (nm == NULL \|\| !nm->is_alive()) {
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1020 THROW_0(vmSymbols::MethodInvalidatedException());
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1021 }
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1022
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1023 JavaCalls::call(&result, actualMethod, nm, &args, CHECK_NULL);
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1024
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1025 return JNIHandles::make_local((oop) result.get_jobject());
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1026 }
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1027
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1028 // public native int JavaMethod_vtableEntryOffset(HotSpotResolvedJavaMethod method);
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1029 JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_JavaMethod_vtableEntryOffset(JNIEnv *, jobject, jobject hotspot_method) {
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1030 TRACE_graal_3("CompilerToVM::JavaMethod_vtableEntryOffset");
5003 5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1031
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1032 methodOop method = getMethodFromHotSpotMethod(hotspot_method);
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1033 assert(!instanceKlass::cast(method->method_holder())->is_interface(), "vtableEntryOffset cannot be called for interface methods");
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1034
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1035 // get entry offset in words
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1036 int vtable_entry_offset = instanceKlass::vtable_start_offset() + method->vtable_index() * vtableEntry::size();
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1037 // convert to bytes
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1038 vtable_entry_offset = vtable_entry_offset * wordSize + vtableEntry::method_offset_in_bytes();
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1039
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1040 return vtable_entry_offset;
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1041 }
5e6f1026a63e fixes to vtable stub inlining: compute offset on demand, look out for interface methods Lukas Stadler <lukas.stadler@jku.at> parents: 5000 diff changeset	1042
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1043 // public native long[] getDeoptedLeafGraphIds();
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1044 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getDeoptedLeafGraphIds(JNIEnv *, jobject) {
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1045 TRACE_graal_3("CompilerToVM::getDeoptedLeafGraphIds");
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1046
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1047 VM_ENTRY_MARK;
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1048
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1049 // the contract for this method is as follows:
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1050 // returning null: no deopted leaf graphs
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1051 // returning array (size > 0): the ids of the deopted leaf graphs
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1052 // returning array (size == 0): there was an overflow, the compiler needs to clear its cache completely
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1053
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1054 oop array = GraalCompiler::instance()->dump_deopted_leaf_graphs(CHECK_NULL);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1055 return JNIHandles::make_local(array);
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1056 }
51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1057
5318 b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1058 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_decodePC(JNIEnv *, jobject, jlong pc) {
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1059 TRACE_graal_3("CompilerToVM::decodePC");
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1060
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1061 VM_ENTRY_MARK;
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1062
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1063 stringStream(st);
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1064 CodeBlob* blob = CodeCache::find_blob_unsafe((void*) pc);
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1065 if (blob == NULL) {
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1066 st.print("[unidentified pc]");
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1067 } else {
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1068 st.print(blob->name());
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1069
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1070 nmethod* nm = blob->as_nmethod_or_null();
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1071 if (nm != NULL && nm->method() != NULL) {
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1072 st.print(" %s.", nm->method()->method_holder()->klass_part()->external_name());
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1073 nm->method()->name()->print_symbol_on(&st);
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1074 st.print(" @ %d", pc - (jlong) nm->entry_point());
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1075 }
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1076 }
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1077 Handle result = java_lang_String::create_from_platform_dependent_str(st.as_string(), CHECK_NULL);
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1078 return JNIHandles::make_local(result());
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1079
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1080 }
b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1081
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1082
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1083 #define CC (char) /cast a literal from (const char)/
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	1084 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f))
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1085
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1086 #define PROXY "J"
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1087 #define TYPE "Lcom/oracle/graal/api/meta/JavaType;"
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1088 #define RESOLVED_TYPE "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaType;"
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1089 #define METHOD "Lcom/oracle/graal/api/meta/JavaMethod;"
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1090 #define RESOLVED_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;"
3555 22d11b3bc561 Various hacks to be able to install machine code from a Java thread. Thomas Wuerthinger <thomas@wuerthinger.net> parents: 3552 diff changeset	1091 #define REFLECT_METHOD "Ljava/lang/reflect/Method;"
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1092 #define SIGNATURE "Lcom/oracle/graal/api/meta/Signature;"
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1093 #define FIELD "Lcom/oracle/graal/api/meta/JavaField;"
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1094 #define RESOLVED_FIELD "Lcom/oracle/graal/api/meta/ResolvedJavaField;"
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1095 #define CONSTANT_POOL "Lcom/oracle/graal/api/meta/ConstantPool;"
b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5540 diff changeset	1096 #define EXCEPTION_HANDLERS "[Lcom/oracle/graal/api/meta/ExceptionHandler;"
5062 5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	1097 #define TARGET_METHOD "Lcom/oracle/graal/hotspot/HotSpotTargetMethod;"
5e9f38419819 Adjust C++ part according to the renaming. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5003 diff changeset	1098 #define CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;"
5548 8872bc0eebdf Renaming hotspot.ri => hotspot.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	1099 #define HS_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotMethod;"
8872bc0eebdf Renaming hotspot.ri => hotspot.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	1100 #define HS_COMP_METHOD "Lcom/oracle/graal/hotspot/meta/HotSpotCompiledMethod;"
8872bc0eebdf Renaming hotspot.ri => hotspot.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	1101 #define HS_CODE_INFO "Lcom/oracle/graal/hotspot/meta/HotSpotCodeInfo;"
8872bc0eebdf Renaming hotspot.ri => hotspot.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5547 diff changeset	1102 #define METHOD_DATA "Lcom/oracle/graal/hotspot/meta/HotSpotMethodData;"
5538 e18ba36bfebc Renamed RiConstant => Constant. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5537 diff changeset	1103 #define CI_CONSTANT "Lcom/oracle/graal/api/meta/Constant;"
5540 a891c53a295b Renaming RiKind => Kind. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5538 diff changeset	1104 #define CI_KIND "Lcom/oracle/graal/api/meta/Kind;"
5547 b6617d13ea44 Dropping Ci* prefixes. Some additional renamings in the api.code interface. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5544 diff changeset	1105 #define CI_RUNTIME_CALL "Lcom/oracle/graal/api/code/RuntimeCall;"
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1106 #define STRING "Ljava/lang/String;"
760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1107 #define OBJECT "Ljava/lang/Object;"
1433 efba53f86c4f various fixes and enhancements Lukas Stadler <lukas.stadler@oracle.com> parents: 1432 diff changeset	1108 #define CLASS "Ljava/lang/Class;"
5238 cce31bc56c00 made HotSpotResolvedMethodImpl.toStackTraceElement() call into native code to get an object containing source file info Doug Simon <doug.simon@oracle.com> parents: 5154 diff changeset	1109 #define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;"
1423 760213a60e8b * rewrite of the code installation Lukas Stadler <lukas.stadler@oracle.com> parents: 1422 diff changeset	1110
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	1111 JNINativeMethod CompilerToVM_methods[] = {
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1112 {CC"JavaMethod_code", CC"("RESOLVED_METHOD")[B", FN_PTR(JavaMethod_1code)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1113 {CC"JavaMethod_signature", CC"("RESOLVED_METHOD")"STRING, FN_PTR(JavaMethod_1signature)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1114 {CC"JavaMethod_exceptionHandlers", CC"("RESOLVED_METHOD")"EXCEPTION_HANDLERS, FN_PTR(JavaMethod_1exceptionHandlers)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1115 {CC"JavaMethod_hasBalancedMonitors", CC"("RESOLVED_METHOD")Z", FN_PTR(JavaMethod_1hasBalancedMonitors)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1116 {CC"JavaMethod_uniqueConcreteMethod", CC"("RESOLVED_METHOD")"METHOD, FN_PTR(JavaMethod_1uniqueConcreteMethod)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1117 {CC"getJavaMethod", CC"("REFLECT_METHOD")"METHOD, FN_PTR(getJavaMethod)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1118 {CC"JavaMethod_methodData", CC"("RESOLVED_METHOD")"METHOD_DATA, FN_PTR(JavaMethod_1methodData)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1119 {CC"JavaMethod_invocationCount", CC"("RESOLVED_METHOD")I", FN_PTR(JavaMethod_1invocationCount)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1120 {CC"JavaMethod_hasCompiledCode", CC"("RESOLVED_METHOD")Z", FN_PTR(JavaMethod_1hasCompiledCode)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1121 {CC"JavaMethod_getCompiledCodeSize", CC"("RESOLVED_METHOD")I", FN_PTR(JavaMethod_1getCompiledCodeSize)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1122 {CC"Signature_lookupType", CC"("STRING RESOLVED_TYPE"Z)"TYPE, FN_PTR(Signature_1lookupType)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1123 {CC"ConstantPool_lookupConstant", CC"("RESOLVED_TYPE"I)"OBJECT, FN_PTR(ConstantPool_1lookupConstant)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1124 {CC"ConstantPool_lookupMethod", CC"("RESOLVED_TYPE"IB)"METHOD, FN_PTR(ConstantPool_1lookupMethod)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1125 {CC"ConstantPool_lookupType", CC"("RESOLVED_TYPE"I)"TYPE, FN_PTR(ConstantPool_1lookupType)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1126 {CC"ConstantPool_loadReferencedType", CC"("RESOLVED_TYPE"IB)V", FN_PTR(ConstantPool_1loadReferencedType)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1127 {CC"ConstantPool_lookupField", CC"("RESOLVED_TYPE"IB)"FIELD, FN_PTR(ConstantPool_1lookupField)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1128 {CC"JavaType_resolveMethodImpl", CC"("RESOLVED_TYPE STRING STRING")"METHOD, FN_PTR(JavaType_3resolveMethodImpl)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1129 {CC"JavaType_isSubtypeOf", CC"("RESOLVED_TYPE TYPE")Z", FN_PTR(JavaType_2isSubtypeOf)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1130 {CC"JavaType_leastCommonAncestor", CC"("RESOLVED_TYPE RESOLVED_TYPE")"TYPE, FN_PTR(JavaType_2leastCommonAncestor)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1131 {CC"JavaType_componentType", CC"("RESOLVED_TYPE")"TYPE, FN_PTR(JavaType_1componentType)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1132 {CC"JavaType_uniqueConcreteSubtype", CC"("RESOLVED_TYPE")"TYPE, FN_PTR(JavaType_1uniqueConcreteSubtype)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1133 {CC"JavaType_superType", CC"("RESOLVED_TYPE")"TYPE, FN_PTR(JavaType_1superType)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1134 {CC"JavaType_arrayOf", CC"("RESOLVED_TYPE")"TYPE, FN_PTR(JavaType_1arrayOf)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1135 {CC"JavaType_fields", CC"("RESOLVED_TYPE")["RESOLVED_FIELD, FN_PTR(JavaType_1fields)},
70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1136 {CC"JavaType_isInitialized", CC"("RESOLVED_TYPE")Z", FN_PTR(JavaType_1isInitialized)},
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1137 {CC"getPrimitiveArrayType", CC"("CI_KIND")"TYPE, FN_PTR(getPrimitiveArrayType)},
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1138 {CC"getMaxCallTargetOffset", CC"("CI_RUNTIME_CALL")J", FN_PTR(getMaxCallTargetOffset)},
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1139 {CC"getType", CC"("CLASS")"TYPE, FN_PTR(getType)},
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1140 {CC"getConfiguration", CC"()"CONFIG, FN_PTR(getConfiguration)},
5275 290b3025b66f added support for disassembling code after installation (so that the result of patching and relocation can be seen) Doug Simon <doug.simon@oracle.com> parents: 5259 diff changeset	1141 {CC"installMethod", CC"("TARGET_METHOD"Z"HS_CODE_INFO")"HS_COMP_METHOD, FN_PTR(installMethod)},
4635 f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1142 {CC"disassembleNative", CC"([BJ)"STRING, FN_PTR(disassembleNative)},
f35c183f33ce fixed checkcast when inlining more than one method Christian Haeubl <christian.haeubl@oracle.com> parents: 4551 diff changeset	1143 {CC"disassembleJava", CC"("RESOLVED_METHOD")"STRING, FN_PTR(disassembleJava)},
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1144 {CC"JavaMethod_toStackTraceElement", CC"("RESOLVED_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(JavaMethod_1toStackTraceElement)},
4993 897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure Lukas Stadler <lukas.stadler@jku.at> parents: 4973 diff changeset	1145 {CC"executeCompiledMethod", CC"("HS_COMP_METHOD OBJECT OBJECT OBJECT")"OBJECT, FN_PTR(executeCompiledMethod)},
5246 8bf2c37c46c4 added RiCompiledMethod.executeVarargs(Object...) to support compiling and calling arbitrary Java methods Doug Simon <doug.simon@oracle.com> parents: 5238 diff changeset	1146 {CC"executeCompiledMethodVarargs", CC"("HS_COMP_METHOD "["OBJECT")"OBJECT, FN_PTR(executeCompiledMethodVarargs)},
5554 70f715dfbb41 Bring Java renamings and restructurings to the C++ part. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5548 diff changeset	1147 {CC"JavaMethod_vtableEntryOffset", CC"("RESOLVED_METHOD")I", FN_PTR(JavaMethod_vtableEntryOffset)},
5129 51111665eda6 Support for recording a leaf graph id for each deoptimization point in the debug info. Lukas Stadler <lukas.stadler@jku.at> parents: 5062 diff changeset	1148 {CC"getDeoptedLeafGraphIds", CC"()[J", FN_PTR(getDeoptedLeafGraphIds)},
5318 b5cd7bc05695 Method entry counters: Enable the flag to collect an execution profile of compiled methods and their callers. This allows to, e.g., detect methods that should be inlined because they are called frequently. Christian Wimmer <Christian.Wimmer@Oracle.com> parents: 5275 diff changeset	1149 {CC"decodePC", CC"(J)"STRING, FN_PTR(decodePC)},
1412 9195b99c841b Added first VM entry method. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1410 diff changeset	1150 };
9195b99c841b Added first VM entry method. Thomas Wuerthinger <thomas.wuerthinger@gmail.com> parents: 1410 diff changeset	1151
4220 5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	1152 int CompilerToVM_methods_count() {
5c80ccb80036 Renaming of VMExits and VMEntries part 1. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4199 diff changeset	1153 return sizeof(CompilerToVM_methods) / sizeof(JNINativeMethod);
1421 6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes Lukas Stadler <lukas.stadler@oracle.com> parents: 1419 diff changeset	1154 }
3703 50a1d38cd7ac Add newlines at the end of files, otherwise my version of gcc complains Christian Wimmer <christian.wimmer@oracle.com> parents: 3701 diff changeset	1155

Mercurial > hg > truffle

annotate src/share/vm/graal/graalCompilerToVM.cpp @ 5747:120820e30baa