equal
deleted
inserted
replaced
117 |
117 |
118 symbol_init = (address) vmSymbols::object_initializer_name(); |
118 symbol_init = (address) vmSymbols::object_initializer_name(); |
119 symbol_clinit = (address) vmSymbols::class_initializer_name(); |
119 symbol_clinit = (address) vmSymbols::class_initializer_name(); |
120 |
120 |
121 BarrierSet* bs = Universe::heap()->barrier_set(); |
121 BarrierSet* bs = Universe::heap()->barrier_set(); |
122 if (bs->is_a(BarrierSet::CardTableModRef)) { |
122 if (bs->is_a(BarrierSet::CardTableBarrierSet)) { |
123 jbyte* base = ci_card_table_address(); |
123 jbyte* base = ci_card_table_address(); |
124 assert(base != NULL, "unexpected byte_map_base"); |
124 assert(base != NULL, "unexpected byte_map_base"); |
125 cardtable_start_address = base; |
125 cardtable_start_address = base; |
126 cardtable_shift = CardTable::card_shift; |
126 cardtable_shift = CardTable::card_shift; |
127 } else { |
127 } else { |
418 #undef ADD_BOOL_FLAG |
418 #undef ADD_BOOL_FLAG |
419 #undef ADD_INTX_FLAG |
419 #undef ADD_INTX_FLAG |
420 #undef ADD_UINTX_FLAG |
420 #undef ADD_UINTX_FLAG |
421 #undef CHECK_FLAG |
421 #undef CHECK_FLAG |
422 } |
422 } |
423 |
|