src/share/vm/memory/virtualspace.cpp

*** 135,147 ****
          // OS ignored requested address. Try different address.
          return;
        }
        // Check alignment constraints.
        assert((uintptr_t) base % alignment == 0,
!              err_msg("Large pages returned a non-aligned address, base: "
                   PTR_FORMAT " alignment: " PTR_FORMAT,
!                  base, (void*)(uintptr_t)alignment));
        _special = true;
      } else {
        // failed; try to reserve regular memory below
        if (UseLargePages && (!FLAG_IS_DEFAULT(UseLargePages) ||
                              !FLAG_IS_DEFAULT(LargePageSizeInBytes))) {
--- 135,147 ----
          // OS ignored requested address. Try different address.
          return;
        }
        // Check alignment constraints.
        assert((uintptr_t) base % alignment == 0,
!              "Large pages returned a non-aligned address, base: "
               PTR_FORMAT " alignment: " PTR_FORMAT,
!              base, (void*)(uintptr_t)alignment);
        _special = true;
      } else {
        // failed; try to reserve regular memory below
        if (UseLargePages && (!FLAG_IS_DEFAULT(UseLargePages) ||
                              !FLAG_IS_DEFAULT(LargePageSizeInBytes))) {
*** 332,344 ****
      base = os::reserve_memory_special(size, alignment, requested_address, false);
  
      if (base != NULL) {
        // Check alignment constraints.
        assert((uintptr_t) base % alignment == 0,
!              err_msg("Large pages returned a non-aligned address, base: "
                       PTR_FORMAT " alignment: " PTR_FORMAT,
!                      base, (void*)(uintptr_t)alignment));
        _special = true;
      }
    }
  
    if (base == NULL) {
--- 332,344 ----
      base = os::reserve_memory_special(size, alignment, requested_address, false);
  
      if (base != NULL) {
        // Check alignment constraints.
        assert((uintptr_t) base % alignment == 0,
!              "Large pages returned a non-aligned address, base: "
               PTR_FORMAT " alignment: " PTR_FORMAT,
!              base, (void*)(uintptr_t)alignment);
        _special = true;
      }
    }
  
    if (base == NULL) {
*** 1205,1226 ****
    TestReservedSpace::test_reserved_space();
  }
  
  #define assert_equals(actual, expected)     \
    assert(actual == expected,                \
!     err_msg("Got " SIZE_FORMAT " expected " \
!       SIZE_FORMAT, actual, expected));
  
  #define assert_ge(value1, value2)                  \
    assert(value1 >= value2,                         \
!     err_msg("'" #value1 "': " SIZE_FORMAT " '"     \
!       #value2 "': " SIZE_FORMAT, value1, value2));
  
  #define assert_lt(value1, value2)                  \
    assert(value1 < value2,                          \
!     err_msg("'" #value1 "': " SIZE_FORMAT " '"     \
!       #value2 "': " SIZE_FORMAT, value1, value2));
  
  
  class TestVirtualSpace : AllStatic {
    enum TestLargePages {
      Default,
--- 1205,1226 ----
    TestReservedSpace::test_reserved_space();
  }
  
  #define assert_equals(actual, expected)  \
    assert(actual == expected,             \
!          "Got " SIZE_FORMAT " expected " \
!          SIZE_FORMAT, actual, expected);
  
  #define assert_ge(value1, value2)                  \
    assert(value1 >= value2,                         \
!          "'" #value1 "': " SIZE_FORMAT " '"        \
!          #value2 "': " SIZE_FORMAT, value1, value2);
  
  #define assert_lt(value1, value2)                  \
    assert(value1 < value2,                          \
!          "'" #value1 "': " SIZE_FORMAT " '"        \
!          #value2 "': " SIZE_FORMAT, value1, value2);
  
  
  class TestVirtualSpace : AllStatic {
    enum TestLargePages {
      Default,