open Udiff src/hotspot/share/runtime/vmStructs.cpp (original) (raw)

< prev index next >

Print this page


@@ -42,23 +42,11 @@ #include "code/pcDesc.hpp" #include "code/stubs.hpp" #include "code/vmreg.hpp" #include "compiler/compileBroker.hpp" #include "compiler/oopMap.hpp" -#include "gc/parallel/immutableSpace.hpp" -#include "gc/parallel/mutableSpace.hpp" -#include "gc/serial/defNewGeneration.hpp" -#include "gc/serial/serialHeap.hpp" -#include "gc/serial/tenuredGeneration.hpp" -#include "gc/cms/cmsHeap.hpp" -#include "gc/shared/cardTableRS.hpp" -#include "gc/shared/collectedHeap.hpp" -#include "gc/shared/genCollectedHeap.hpp" -#include "gc/shared/generation.hpp" -#include "gc/shared/generationSpec.hpp" -#include "gc/shared/oopStorage.hpp" -#include "gc/shared/space.hpp" +#include "gc/shared/vmStructs_gc.hpp" #include "interpreter/bytecodeInterpreter.hpp" #include "interpreter/bytecodes.hpp" #include "interpreter/interpreter.hpp" #include "memory/allocation.hpp" #include "memory/allocation.inline.hpp"


@@ -111,27 +99,10 @@ #include CPU_HEADER(vmStructs) #include OS_HEADER(vmStructs) #include OS_CPU_HEADER(vmStructs) -#if INCLUDE_ALL_GCS -#include "gc/cms/compactibleFreeListSpace.hpp" -#include "gc/cms/concurrentMarkSweepGeneration.hpp" -#include "gc/cms/concurrentMarkSweepThread.hpp" -#include "gc/cms/parNewGeneration.hpp" -#include "gc/cms/vmStructs_cms.hpp" -#include "gc/cms/vmStructs_parNew.hpp" -#include "gc/g1/vmStructs_g1.hpp" -#include "gc/parallel/asPSOldGen.hpp" -#include "gc/parallel/asPSYoungGen.hpp" -#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" -#endif // INCLUDE_ALL_GCS

#if INCLUDE_JVMCI

include "jvmci/vmStructs_jvmci.hpp"

#endif

#if INCLUDE_TRACE


@@ -219,10 +190,19 @@ c1_nonstatic_field,
c2_nonstatic_field,
unchecked_c1_static_field,
unchecked_c2_static_field)
\


@@ -431,103 +411,13 @@ /* os /
/
*****/

static_field(os, _polling_page, address)
\


@@ -908,12 +798,10 @@ nonstatic_field(JavaThread, _osthread, OSThread*)
nonstatic_field(JavaThread, _stack_base, address)
nonstatic_field(JavaThread, _stack_size, size_t)
nonstatic_field(JavaThread, _vframe_array_head, vframeArray*)
nonstatic_field(JavaThread, _vframe_array_last, vframeArray*) \


@@ -1258,17 +1146,11 @@ nonstatic_field(vframeArrayElement, _method, Method*)

nonstatic_field(AccessFlags, _flags, jint)
nonstatic_field(elapsedTimer, _counter, jlong)
nonstatic_field(elapsedTimer, _active, bool)
- nonstatic_field(InvocationCounter, _counter, unsigned int)
- volatile_nonstatic_field(FreeChunk, _size, size_t)
- nonstatic_field(FreeChunk, _next, FreeChunk*)
- nonstatic_field(FreeChunk, _prev, FreeChunk*)
- nonstatic_field(AdaptiveFreeList, _size, size_t)
- nonstatic_field(AdaptiveFreeList, _count, ssize_t)

//-------------------------------------------------------------------------------- // VM_TYPES // // This list must enumerate at least all of the types in the above


@@ -1451,77 +1333,10 @@ declare_toplevel_type(MethodParametersElement)

declare_toplevel_type(ClassLoaderData)
declare_toplevel_type(ClassLoaderDataGraph)
\


@@ -2181,34 +1996,40 @@ declare_toplevel_type(vframeArray)
declare_toplevel_type(vframeArrayElement)
declare_toplevel_type(Annotations*)
declare_type(OopMapValue, StackObj)

- //
- /* Miscellaneous types */
- /
/
+ //
+ /* GC types */
+ /
/

- /* freelist /
- declare_toplevel_type(FreeChunk
)
- declare_toplevel_type(AdaptiveFreeList*)
- declare_toplevel_type(AdaptiveFreeList)

//-------------------------------------------------------------------------------- // VM_INT_CONSTANTS // // This table contains integer constants required over in the // serviceability agent. The "declare_constant" macro is used for all // enums, etc., while "declare_preprocessor_constant" must be used for // all #defined constants.

#define VM_INT_CONSTANTS(declare_constant, \


@@ -2228,55 +2049,10 @@ declare_constant(BytesPerWord)
declare_constant(BytesPerLong)

declare_constant(LogKlassAlignmentInBytes)
\


@@ -3010,23 +2786,10 @@ GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY, GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY) -#if INCLUDE_ALL_GCS - VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, - 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) #endif

@@ -3073,24 +2836,10 @@ GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY, GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY, GENERATE_C2_VM_TYPE_ENTRY, GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY) -#if INCLUDE_ALL_GCS - VM_TYPES_PARALLELGC(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) #endif

@@ -3129,24 +2878,16 @@ } VMIntConstantEntry VMStructs::localHotSpotVMIntConstants[] = { VM_INT_CONSTANTS(GENERATE_VM_INT_CONSTANT_ENTRY, + GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY, GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY, GENERATE_C1_VM_INT_CONSTANT_ENTRY, GENERATE_C2_VM_INT_CONSTANT_ENTRY, GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY) -#if INCLUDE_ALL_GCS - VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)

-#endif // INCLUDE_ALL_GCS

#if INCLUDE_TRACE VM_INT_CONSTANTS_TRACE(GENERATE_VM_INT_CONSTANT_ENTRY) #endif

VM_INT_CONSTANTS_OS(GENERATE_VM_INT_CONSTANT_ENTRY,


@@ -3220,24 +2961,10 @@ CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY, CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY, CHECK_NO_OP, CHECK_NO_OP); -#if INCLUDE_ALL_GCS - VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY, - CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, - CHECK_STATIC_VM_STRUCT_ENTRY);


@@ -3266,25 +2993,10 @@ CHECK_SINGLE_ARG_VM_TYPE_NO_OP, CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY, CHECK_C2_VM_TYPE_ENTRY, CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY); -#if INCLUDE_ALL_GCS - VM_TYPES_PARALLELGC(CHECK_VM_TYPE_ENTRY, - CHECK_SINGLE_ARG_VM_TYPE_NO_OP);


@@ -3341,20 +3053,10 @@ ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT, ENSURE_C1_FIELD_TYPE_PRESENT, ENSURE_C2_FIELD_TYPE_PRESENT, CHECK_NO_OP, CHECK_NO_OP)); -#if INCLUDE_ALL_GCS

-#endif // INCLUDE_ALL_GCS

#if INCLUDE_TRACE debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT, ENSURE_FIELD_TYPE_PRESENT)); #endif

< prev index next >