equal
deleted
inserted
replaced
33 #include "code/codeCache.hpp" |
33 #include "code/codeCache.hpp" |
34 #include "code/dependencies.hpp" |
34 #include "code/dependencies.hpp" |
35 #include "gc/shared/cardTableBarrierSet.hpp" |
35 #include "gc/shared/cardTableBarrierSet.hpp" |
36 #include "gc/shared/collectedHeap.inline.hpp" |
36 #include "gc/shared/collectedHeap.inline.hpp" |
37 #include "gc/shared/gcArguments.hpp" |
37 #include "gc/shared/gcArguments.hpp" |
|
38 #include "gc/shared/gcConfig.hpp" |
38 #include "gc/shared/gcLocker.hpp" |
39 #include "gc/shared/gcLocker.hpp" |
39 #include "gc/shared/generation.hpp" |
40 #include "gc/shared/generation.hpp" |
40 #include "gc/shared/gcTraceTime.inline.hpp" |
41 #include "gc/shared/gcTraceTime.inline.hpp" |
41 #include "gc/shared/space.hpp" |
42 #include "gc/shared/space.hpp" |
42 #include "interpreter/interpreter.hpp" |
43 #include "interpreter/interpreter.hpp" |
743 return JNI_OK; |
744 return JNI_OK; |
744 } |
745 } |
745 |
746 |
746 CollectedHeap* Universe::create_heap() { |
747 CollectedHeap* Universe::create_heap() { |
747 assert(_collectedHeap == NULL, "Heap already created"); |
748 assert(_collectedHeap == NULL, "Heap already created"); |
748 assert(GCArguments::is_initialized(), "GC must be initialized here"); |
749 return GCConfig::arguments()->create_heap(); |
749 return GCArguments::arguments()->create_heap(); |
|
750 } |
750 } |
751 |
751 |
752 // Choose the heap base address and oop encoding mode |
752 // Choose the heap base address and oop encoding mode |
753 // when compressed oops are used: |
753 // when compressed oops are used: |
754 // Unscaled - Use 32-bits oops without encoding when |
754 // Unscaled - Use 32-bits oops without encoding when |