src/hotspot/share/prims/whitebox.cpp

rev 53924 : imported patch 8219747-remove-g1-prefix
rev 53925 : imported patch 8219747-shade-review
rev 53927 : [mq]: 8219856-spell-out-hetero

*** 481,491 ****
  #if INCLUDE_G1GC || INCLUDE_PARALLELGC
  WB_ENTRY(jlong, WB_DramReservedStart(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_hetero_heap()) {
        uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_dram();
        return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
      } else {
        return (jlong)g1h->base();
      }
--- 481,491 ----
  #if INCLUDE_G1GC || INCLUDE_PARALLELGC
  WB_ENTRY(jlong, WB_DramReservedStart(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_heterogeneous_heap()) {
        uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_dram();
        return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
      } else {
        return (jlong)g1h->base();
      }
*** 507,517 ****
  
  WB_ENTRY(jlong, WB_DramReservedEnd(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_hetero_heap()) {
        uint end_region = HeterogeneousHeapRegionManager::manager()->end_index_of_dram();
        return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
      } else {
        return (jlong)g1h->base() + g1h->collector_policy()->max_heap_byte_size();
      }
--- 507,517 ----
  
  WB_ENTRY(jlong, WB_DramReservedEnd(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_heterogeneous_heap()) {
        uint end_region = HeterogeneousHeapRegionManager::manager()->end_index_of_dram();
        return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
      } else {
        return (jlong)g1h->base() + g1h->collector_policy()->max_heap_byte_size();
      }
*** 533,543 ****
  
  WB_ENTRY(jlong, WB_NvdimmReservedStart(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_hetero_heap()) {
        uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
        return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
      } else {
        THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_NvdimmReservedStart: Old gen is not allocated on NV-DIMM using AllocateOldGenAt flag");
      }
--- 533,543 ----
  
  WB_ENTRY(jlong, WB_NvdimmReservedStart(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_heterogeneous_heap()) {
        uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
        return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
      } else {
        THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_NvdimmReservedStart: Old gen is not allocated on NV-DIMM using AllocateOldGenAt flag");
      }
*** 559,569 ****
  
  WB_ENTRY(jlong, WB_NvdimmReservedEnd(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_hetero_heap()) {
        uint end_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
        return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
      } else {
        THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_NvdimmReservedEnd: Old gen is not allocated on NV-DIMM using AllocateOldGenAt flag");
      }
--- 559,569 ----
  
  WB_ENTRY(jlong, WB_NvdimmReservedEnd(JNIEnv* env, jobject o))
  #if INCLUDE_G1GC
    if (UseG1GC) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
!     if (g1h->is_heterogeneous_heap()) {
        uint end_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
        return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
      } else {
        THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_NvdimmReservedEnd: Old gen is not allocated on NV-DIMM using AllocateOldGenAt flag");
      }