equal
deleted
inserted
replaced
21 * questions. |
21 * questions. |
22 */ |
22 */ |
23 |
23 |
24 // no precompiled headers |
24 // no precompiled headers |
25 #include "ci/ciUtilities.hpp" |
25 #include "ci/ciUtilities.hpp" |
|
26 #include "gc/shared/barrierSet.hpp" |
26 #include "memory/oopFactory.hpp" |
27 #include "memory/oopFactory.hpp" |
27 #include "oops/objArrayOop.inline.hpp" |
28 #include "oops/objArrayOop.inline.hpp" |
28 #include "jvmci/jvmciRuntime.hpp" |
29 #include "jvmci/jvmciRuntime.hpp" |
29 #include "jvmci/jvmciCompilerToVM.hpp" |
30 #include "jvmci/jvmciCompilerToVM.hpp" |
30 #include "jvmci/vmStructs_jvmci.hpp" |
31 #include "jvmci/vmStructs_jvmci.hpp" |
118 assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid"); |
119 assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid"); |
119 |
120 |
120 symbol_init = (address) vmSymbols::object_initializer_name(); |
121 symbol_init = (address) vmSymbols::object_initializer_name(); |
121 symbol_clinit = (address) vmSymbols::class_initializer_name(); |
122 symbol_clinit = (address) vmSymbols::class_initializer_name(); |
122 |
123 |
123 BarrierSet* bs = Universe::heap()->barrier_set(); |
124 BarrierSet* bs = BarrierSet::barrier_set(); |
124 if (bs->is_a(BarrierSet::CardTableBarrierSet)) { |
125 if (bs->is_a(BarrierSet::CardTableBarrierSet)) { |
125 jbyte* base = ci_card_table_address(); |
126 jbyte* base = ci_card_table_address(); |
126 assert(base != NULL, "unexpected byte_map_base"); |
127 assert(base != NULL, "unexpected byte_map_base"); |
127 cardtable_start_address = base; |
128 cardtable_start_address = base; |
128 cardtable_shift = CardTable::card_shift; |
129 cardtable_shift = CardTable::card_shift; |