src/share/vm/jvmci/jvmciCompilerToVM.cpp

rev 11970 : [mq]: base_volatiles

*** 110,120 ****
  uintptr_t CompilerToVM::Data::Universe_verify_oop_mask;
  uintptr_t CompilerToVM::Data::Universe_verify_oop_bits;
  
  bool       CompilerToVM::Data::_supports_inline_contig_alloc;
  HeapWord** CompilerToVM::Data::_heap_end_addr;
! HeapWord** CompilerToVM::Data::_heap_top_addr;
  int CompilerToVM::Data::_max_oop_map_stack_offset;
  
  jbyte* CompilerToVM::Data::cardtable_start_address;
  int CompilerToVM::Data::cardtable_shift;
  
--- 110,120 ----
  uintptr_t CompilerToVM::Data::Universe_verify_oop_mask;
  uintptr_t CompilerToVM::Data::Universe_verify_oop_bits;
  
  bool       CompilerToVM::Data::_supports_inline_contig_alloc;
  HeapWord** CompilerToVM::Data::_heap_end_addr;
! HeapWord* volatile* CompilerToVM::Data::_heap_top_addr;
  int CompilerToVM::Data::_max_oop_map_stack_offset;
  
  jbyte* CompilerToVM::Data::cardtable_start_address;
  int CompilerToVM::Data::cardtable_shift;
  
*** 151,161 ****
    Universe_verify_oop_mask = Universe::verify_oop_mask();
    Universe_verify_oop_bits = Universe::verify_oop_bits();
  
    _supports_inline_contig_alloc = Universe::heap()->supports_inline_contig_alloc();
    _heap_end_addr = _supports_inline_contig_alloc ? Universe::heap()->end_addr() : (HeapWord**) -1;
!   _heap_top_addr = _supports_inline_contig_alloc ? Universe::heap()->top_addr() : (HeapWord**) -1;
  
    _max_oop_map_stack_offset = (OopMapValue::register_mask - VMRegImpl::stack2reg(0)->value()) * VMRegImpl::stack_slot_size;
    int max_oop_map_stack_index = _max_oop_map_stack_offset / VMRegImpl::stack_slot_size;
    assert(OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index)), "should be valid");
    assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
--- 151,161 ----
    Universe_verify_oop_mask = Universe::verify_oop_mask();
    Universe_verify_oop_bits = Universe::verify_oop_bits();
  
    _supports_inline_contig_alloc = Universe::heap()->supports_inline_contig_alloc();
    _heap_end_addr = _supports_inline_contig_alloc ? Universe::heap()->end_addr() : (HeapWord**) -1;
!   _heap_top_addr = _supports_inline_contig_alloc ? Universe::heap()->top_addr() : (HeapWord* volatile*) -1;
  
    _max_oop_map_stack_offset = (OopMapValue::register_mask - VMRegImpl::stack2reg(0)->value()) * VMRegImpl::stack_slot_size;
    int max_oop_map_stack_index = _max_oop_map_stack_offset / VMRegImpl::stack_slot_size;
    assert(OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index)), "should be valid");
    assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
*** 1602,1607 ****
  };
  
  int CompilerToVM::methods_count() {
    return sizeof(methods) / sizeof(JNINativeMethod);
  }
- 
--- 1602,1606 ----