src/share/vm/runtime/globals.cpp

*** 40,49 ****
--- 40,52 ----
  #include "gc/g1/g1_globals.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
+ #if INCLUDE_JVMCI
+ #include "jvmci/jvmci_globals.hpp"
+ #endif
  #ifdef COMPILER2
  #include "opto/c2_globals.hpp"
  #endif
  #ifdef SHARK
  #include "shark/shark_globals.hpp"
*** 440,449 ****
--- 443,453 ----
      const char* name;
    };
  
    Data data[] = {
        { KIND_C1, "C1" },
+       { KIND_JVMCI, "JVMCI" },
        { KIND_C2, "C2" },
        { KIND_ARCH, "ARCH" },
        { KIND_SHARK, "SHARK" },
        { KIND_PLATFORM_DEPENDENT, "pd" },
        { KIND_PRODUCT, "product" },
*** 546,555 ****
--- 550,567 ----
  #define RUNTIME_PRODUCT_RW_FLAG_STRUCT(  type, name, value, doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT | Flag::KIND_READ_WRITE) },
  #define RUNTIME_DEVELOP_FLAG_STRUCT(     type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP) },
  #define RUNTIME_PD_DEVELOP_FLAG_STRUCT(  type, name,        doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
  #define RUNTIME_NOTPRODUCT_FLAG_STRUCT(  type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_NOT_PRODUCT) },
  
+ #define JVMCI_PRODUCT_FLAG_STRUCT(       type, name, value, doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_PRODUCT) },
+ #define JVMCI_PD_PRODUCT_FLAG_STRUCT(    type, name,        doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
+ #define JVMCI_DEVELOP_FLAG_STRUCT(       type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_DEVELOP) },
+ #define JVMCI_PD_DEVELOP_FLAG_STRUCT(    type, name,        doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
+ #define JVMCI_DIAGNOSTIC_FLAG_STRUCT(    type, name, value, doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_DIAGNOSTIC) },
+ #define JVMCI_EXPERIMENTAL_FLAG_STRUCT(  type, name, value, doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_EXPERIMENTAL) },
+ #define JVMCI_NOTPRODUCT_FLAG_STRUCT(    type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_JVMCI | Flag::KIND_NOT_PRODUCT) },
+ 
  #ifdef _LP64
  #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name,      NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_LP64_PRODUCT) },
  #else
  #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
  #endif // _LP64
*** 614,623 ****
--- 626,646 ----
            RUNTIME_MANAGEABLE_FLAG_STRUCT, \
            RUNTIME_PRODUCT_RW_FLAG_STRUCT, \
            IGNORE_RANGE, \
            IGNORE_CONSTRAINT)
  #endif // INCLUDE_ALL_GCS
+ #if INCLUDE_JVMCI
+  JVMCI_FLAGS(JVMCI_DEVELOP_FLAG_STRUCT, \
+              JVMCI_PD_DEVELOP_FLAG_STRUCT, \
+              JVMCI_PRODUCT_FLAG_STRUCT, \
+              JVMCI_PD_PRODUCT_FLAG_STRUCT, \
+              JVMCI_DIAGNOSTIC_FLAG_STRUCT, \
+              JVMCI_EXPERIMENTAL_FLAG_STRUCT, \
+              JVMCI_NOTPRODUCT_FLAG_STRUCT, \
+              IGNORE_RANGE, \
+              IGNORE_CONSTRAINT)
+ #endif // INCLUDE_JVMCI
  #ifdef COMPILER1
   C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, \
            C1_PD_DEVELOP_FLAG_STRUCT, \
            C1_PRODUCT_FLAG_STRUCT, \
            C1_PD_PRODUCT_FLAG_STRUCT, \