equal
deleted
inserted
replaced
50 void SuspendibleThreadSet_init() NOT_ALL_GCS_RETURN; |
50 void SuspendibleThreadSet_init() NOT_ALL_GCS_RETURN; |
51 |
51 |
52 // Initialization done by Java thread in init_globals() |
52 // Initialization done by Java thread in init_globals() |
53 void management_init(); |
53 void management_init(); |
54 void bytecodes_init(); |
54 void bytecodes_init(); |
55 void classLoader_init(); |
55 void classLoader_init1(); |
|
56 void classLoader_init2(); // note: ClassLoader need 2-phase init |
56 void compilationPolicy_init(); |
57 void compilationPolicy_init(); |
57 void codeCache_init(); |
58 void codeCache_init(); |
58 void VM_Version_init(); |
59 void VM_Version_init(); |
59 void os_init_globals(); // depends on VM_Version_init, before universe_init |
60 void os_init_globals(); // depends on VM_Version_init, before universe_init |
60 void stubRoutines_init1(); |
61 void stubRoutines_init1(); |
100 |
101 |
101 jint init_globals() { |
102 jint init_globals() { |
102 HandleMark hm; |
103 HandleMark hm; |
103 management_init(); |
104 management_init(); |
104 bytecodes_init(); |
105 bytecodes_init(); |
105 classLoader_init(); |
106 classLoader_init1(); |
106 compilationPolicy_init(); |
107 compilationPolicy_init(); |
107 codeCache_init(); |
108 codeCache_init(); |
108 CodeCacheExtensions::initialize(); |
109 CodeCacheExtensions::initialize(); |
109 VM_Version_init(); |
110 VM_Version_init(); |
110 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::VMVersion); |
111 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::VMVersion); |
114 jint status = universe_init(); // dependent on codeCache_init and |
115 jint status = universe_init(); // dependent on codeCache_init and |
115 // stubRoutines_init1 and metaspace_init. |
116 // stubRoutines_init1 and metaspace_init. |
116 if (status != JNI_OK) |
117 if (status != JNI_OK) |
117 return status; |
118 return status; |
118 |
119 |
|
120 classLoader_init2(); // after SymbolTable creation, set up -Xpatch entries |
119 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Universe); |
121 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Universe); |
120 interpreter_init(); // before any methods loaded |
122 interpreter_init(); // before any methods loaded |
121 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Interpreter); |
123 CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Interpreter); |
122 invocationCounter_init(); // before any methods loaded |
124 invocationCounter_init(); // before any methods loaded |
123 marksweep_init(); |
125 marksweep_init(); |