Mercurial > hg > truffle

comparison src/share/vm/prims/jni.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents d8d6b3de346b
children 33df1aeaebbf
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
27 #include "classfile/javaClasses.hpp" 27 #include "classfile/javaClasses.hpp"
28 #include "classfile/symbolTable.hpp" 28 #include "classfile/symbolTable.hpp"
29 #include "classfile/systemDictionary.hpp" 29 #include "classfile/systemDictionary.hpp"
30 #include "classfile/vmSymbols.hpp" 30 #include "classfile/vmSymbols.hpp"
31 #include "interpreter/linkResolver.hpp" 31 #include "interpreter/linkResolver.hpp"
32 #ifdef GRAAL
32 #include "graal/graalCompiler.hpp" 33 #include "graal/graalCompiler.hpp"
34 #endif
33 #ifndef SERIALGC 35 #ifndef SERIALGC
34 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 36 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
35 #endif // SERIALGC 37 #endif // SERIALGC
36 #include "memory/allocation.inline.hpp" 38 #include "memory/allocation.inline.hpp"
37 #include "memory/gcLocker.inline.hpp" 39 #include "memory/gcLocker.inline.hpp"
5123 /* thread is thread_in_vm here */ 5125 /* thread is thread_in_vm here */
5124 *vm = (JavaVM *)(&main_vm); 5126 *vm = (JavaVM *)(&main_vm);
5125 *(JNIEnv**)penv = thread->jni_environment(); 5127 *(JNIEnv**)penv = thread->jni_environment();
5126 5128
5127 #ifdef GRAAL 5129 #ifdef GRAAL
5128 if (UseGraal) {
5129 GraalCompiler* compiler = GraalCompiler::instance(); 5130 GraalCompiler* compiler = GraalCompiler::instance();
5130 ciObjectFactory::initialize(); 5131 ciObjectFactory::initialize();
5131 compiler->initialize(); 5132 compiler->initialize();
5132 }
5133 #endif 5133 #endif
5134 5134
5135 // Tracks the time application was running before GC 5135 // Tracks the time application was running before GC
5136 RuntimeService::record_application_start(); 5136 RuntimeService::record_application_start();
5137 5137