*** old/src/share/vm/runtime/globals.hpp	Fri Nov  6 09:35:36 2015
--- new/src/share/vm/runtime/globals.hpp	Fri Nov  6 09:35:36 2015

*** 531,540 ****
--- 531,580 ----
  #define falseInEmbedded false
  #else
  #define falseInEmbedded true
  #endif
  
+ // metspace defaults
+ #define DEFAULT_VTBL_LIST_SIZE          (17)  // number of entries in the shared space vtable list.
+ #define DEFAULT_VTBL_VIRTUALS_COUNT     (200) // maximum number of virtual functions
+ // If virtual functions are added to Metadata,
+ // this number needs to be increased.  Also,
+ // SharedMiscCodeSize will need to be increased.
+ // The following 2 sizes were based on
+ // MetaspaceShared::generate_vtable_methods()
+ #define DEFAULT_VTBL_METHOD_SIZE        (16)  // conservative size of the mov1 and jmp instructions
+ // for the x64 platform
+ #define DEFAULT_VTBL_COMMON_CODE_SIZE   (1*K) // conservative size of the "common_code" for the x64 platform
+ 
+ #define DEFAULT_SHARED_READ_WRITE_SIZE  (NOT_LP64(12*M) LP64_ONLY(16*M))
+ #define MIN_SHARED_READ_WRITE_SIZE      (NOT_LP64(7*M) LP64_ONLY(12*M))
+ 
+ #define DEFAULT_SHARED_READ_ONLY_SIZE   (NOT_LP64(12*M) LP64_ONLY(16*M))
+ #define MIN_SHARED_READ_ONLY_SIZE       (NOT_LP64(8*M) LP64_ONLY(9*M))
+ 
+ // the MIN_SHARED_MISC_DATA_SIZE and MIN_SHARED_MISC_CODE_SIZE estimates are based on
+ // MetaspaceShared::generate_vtable_methods().
+ // The minimum size only accounts for the vtable methods. Any size less than the
+ // minimum required size would cause vm crash when allocating the vtable methods.
+ #define SHARED_MISC_SIZE_FOR(size) (DEFAULT_VTBL_VIRTUALS_COUNT*DEFAULT_VTBL_LIST_SIZE*size)
+ 
+ #define DEFAULT_SHARED_MISC_DATA_SIZE   (NOT_LP64(2*M) LP64_ONLY(4*M))
+ #define MIN_SHARED_MISC_DATA_SIZE       (SHARED_MISC_SIZE_FOR(sizeof(void*)))
+ 
+ #define DEFAULT_SHARED_MISC_CODE_SIZE   (120*K)
+ #define MIN_SHARED_MISC_CODE_SIZE       (SHARED_MISC_SIZE_FOR(sizeof(void*))+SHARED_MISC_SIZE_FOR(DEFAULT_VTBL_METHOD_SIZE)+DEFAULT_VTBL_COMMON_CODE_SIZE)
+ 
+ #define DEFAULT_COMBINED_SIZE           (DEFAULT_SHARED_READ_WRITE_SIZE+DEFAULT_SHARED_READ_ONLY_SIZE+DEFAULT_SHARED_MISC_DATA_SIZE+DEFAULT_SHARED_MISC_CODE_SIZE)
+ 
+ #define SHARED_PAGE                     ((size_t)os::vm_page_size())
+ #define MAX_SHARED_DELTA                (0x7FFFFFFF)
+ #define MAX_SHARED_READ_WRITE_SIZE      (MAX_SHARED_DELTA-(DEFAULT_SHARED_READ_ONLY_SIZE+DEFAULT_SHARED_MISC_DATA_SIZE+DEFAULT_SHARED_MISC_CODE_SIZE)-SHARED_PAGE)
+ #define MAX_SHARED_READ_ONLY_SIZE       (MAX_SHARED_DELTA-(DEFAULT_SHARED_READ_WRITE_SIZE+DEFAULT_SHARED_MISC_DATA_SIZE+DEFAULT_SHARED_MISC_CODE_SIZE)-SHARED_PAGE)
+ #define MAX_SHARED_MISC_DATA_SIZE       (MAX_SHARED_DELTA-(DEFAULT_SHARED_READ_WRITE_SIZE+DEFAULT_SHARED_READ_ONLY_SIZE+DEFAULT_SHARED_MISC_CODE_SIZE)-SHARED_PAGE)
+ #define MAX_SHARED_MISC_CODE_SIZE       (MAX_SHARED_DELTA-(DEFAULT_SHARED_READ_WRITE_SIZE+DEFAULT_SHARED_READ_ONLY_SIZE+DEFAULT_SHARED_MISC_DATA_SIZE)-SHARED_PAGE)
+ 
+ 
  // develop flags are settable / visible only during development and are constant in the PRODUCT version
  // product flags are always settable / visible
  // notproduct flags are settable / visible only during development and are not declared in the PRODUCT version
  
  // A flag must be declared with one of the following types:

*** 4099,4123 ****
--- 4139,4168 ----
                                                                              \
    product(bool, PrintSharedDictionary, false,                               \
            "If PrintSharedArchiveAndExit is true, also print the shared "    \
            "dictionary")                                                     \
                                                                              \
!   product(size_t, SharedReadWriteSize, NOT_LP64(12*M) LP64_ONLY(16*M),      \
!   product(size_t, SharedReadWriteSize, DEFAULT_SHARED_READ_WRITE_SIZE,      \
            "Size of read-write space for metadata (in bytes)")               \
+           range(MIN_SHARED_READ_WRITE_SIZE, MAX_SHARED_READ_WRITE_SIZE)     \
                                                                              \
!   product(size_t, SharedReadOnlySize, NOT_LP64(12*M) LP64_ONLY(16*M),       \
!   product(size_t, SharedReadOnlySize, DEFAULT_SHARED_READ_ONLY_SIZE,        \
            "Size of read-only space for metadata (in bytes)")                \
+           range(MIN_SHARED_READ_ONLY_SIZE, MAX_SHARED_READ_ONLY_SIZE)       \
                                                                              \
!   product(uintx, SharedMiscDataSize,    NOT_LP64(2*M) LP64_ONLY(4*M),       \
!   product(size_t, SharedMiscDataSize, DEFAULT_SHARED_MISC_DATA_SIZE,        \
            "Size of the shared miscellaneous data area (in bytes)")          \
+           range(MIN_SHARED_MISC_DATA_SIZE, MAX_SHARED_MISC_DATA_SIZE)       \
                                                                              \
!   product(uintx, SharedMiscCodeSize,    120*K,                              \
!   product(size_t, SharedMiscCodeSize, DEFAULT_SHARED_MISC_CODE_SIZE,        \
            "Size of the shared miscellaneous code area (in bytes)")          \
+           range(MIN_SHARED_MISC_CODE_SIZE, MAX_SHARED_MISC_CODE_SIZE)       \
                                                                              \
!   product(uintx, SharedBaseAddress, LP64_ONLY(32*G)                         \
!   product(size_t, SharedBaseAddress, LP64_ONLY(32*G)                        \
            NOT_LP64(LINUX_ONLY(2*G) NOT_LINUX(0)),                           \
            "Address to allocate shared memory region for class data")        \
+           range(0, SIZE_MAX)                                                \
                                                                              \
    product(uintx, SharedSymbolTableBucketSize, 4,                            \
            "Average number of symbols per bucket in shared table")           \
            range(2, 246)                                                     \
                                                                              \