src/hotspot/share/runtime/vmStructs.cpp

rev 48259 : SA for GC - patch 2

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 125,134 ****
--- 125,135 ----
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #include "gc/parallel/psOldGen.hpp"
  #include "gc/parallel/psVirtualspace.hpp"
  #include "gc/parallel/psYoungGen.hpp"
  #include "gc/parallel/vmStructs_parallelgc.hpp"
+ #include "gc/z/vmStructs_z.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_JVMCI
  # include "jvmci/vmStructs_jvmci.hpp"
  #endif
*** 1388,1397 ****
--- 1389,1399 ----
    declare_integer_type(ssize_t)                                           \
    declare_integer_type(intx)                                              \
    declare_integer_type(intptr_t)                                          \
    declare_unsigned_integer_type(uintx)                                    \
    declare_unsigned_integer_type(uintptr_t)                                \
+   declare_unsigned_integer_type(uint8_t)                                  \
    declare_unsigned_integer_type(uint32_t)                                 \
    declare_unsigned_integer_type(uint64_t)                                 \
                                                                            \
    /******************************************/                            \
    /* OopDesc hierarchy (NOTE: some missing) */                            \
*** 3021,3030 ****
--- 3023,3035 ----
                   GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_STATIC_VM_STRUCT_ENTRY)
  
    VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_STATIC_VM_STRUCT_ENTRY)
+ 
+   VM_STRUCTS_Z(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+                GENERATE_STATIC_VM_STRUCT_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    VM_STRUCTS_TRACE(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                     GENERATE_STATIC_VM_STRUCT_ENTRY)
*** 3088,3097 ****
--- 3093,3105 ----
    VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY)
  
    VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
                GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
                GENERATE_INTEGER_VM_TYPE_ENTRY)
+ 
+   VM_TYPES_Z(GENERATE_VM_TYPE_ENTRY,
+              GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    VM_TYPES_TRACE(GENERATE_VM_TYPE_ENTRY,
                GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
*** 3147,3156 ****
--- 3155,3167 ----
  
    VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
  
    VM_INT_CONSTANTS_G1(GENERATE_VM_INT_CONSTANT_ENTRY,
                        GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
+ 
+   VM_INT_CONSTANTS_Z(GENERATE_VM_INT_CONSTANT_ENTRY,
+                      GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    VM_INT_CONSTANTS_TRACE(GENERATE_VM_INT_CONSTANT_ENTRY)
  #endif
*** 3204,3213 ****
--- 3215,3230 ----
                             GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
                             GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
                             GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
                             GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
  
+ #if INCLUDE_ALL_GCS
+ 
+   VM_LONG_CONSTANTS_Z(GENERATE_VM_INT_CONSTANT_ENTRY,
+                       GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
+ #endif // INCLUDE_ALL_GCS
+ 
    GENERATE_VM_LONG_CONSTANT_LAST_ENTRY()
  };
  
  size_t VMStructs::localHotSpotVMLongConstantsLength() {
    return sizeof(localHotSpotVMLongConstants) / sizeof(VMLongConstantEntry);
*** 3238,3247 ****
--- 3255,3267 ----
                   CHECK_STATIC_VM_STRUCT_ENTRY);
  
    VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_STATIC_VM_STRUCT_ENTRY);
  
+   VM_STRUCTS_Z(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
+                CHECK_STATIC_VM_STRUCT_ENTRY);
+ 
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    VM_STRUCTS_TRACE(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                     CHECK_STATIC_VM_STRUCT_ENTRY);
*** 3288,3297 ****
--- 3308,3319 ----
  
    VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
  
+   VM_TYPES_Z(CHECK_VM_TYPE_ENTRY,
+              CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    VM_TYPES_TRACE(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
*** 3362,3371 ****
--- 3384,3395 ----
    debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT,
                              ENSURE_FIELD_TYPE_PRESENT,
                              ENSURE_FIELD_TYPE_PRESENT));
    debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
                             ENSURE_FIELD_TYPE_PRESENT));
+   debug_only(VM_STRUCTS_Z(ENSURE_FIELD_TYPE_PRESENT,
+                           ENSURE_FIELD_TYPE_PRESENT));
  #endif // INCLUDE_ALL_GCS
  
  #if INCLUDE_TRACE
    debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT,
                             ENSURE_FIELD_TYPE_PRESENT));