Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vmStructs.cpp @ 3972:4f93f0d00802
7059019: G1: add G1 support to the SA
Summary: Extend the SA to recognize the G1CollectedHeap and implement any code that's needed by our serviceability tools (jmap, jinfo, jstack, etc.) that depend on the SA.
Reviewed-by: never, poonam, johnc
author | tonyp |
---|---|
date | Tue, 20 Sep 2011 09:59:59 -0400 |
parents | ab577c97a5f3 |
children | fd65bc7c09b6 |
comparison
equal
deleted
inserted
replaced
3953:77e1a9153757 | 3972:4f93f0d00802 |
---|---|
171 #include "gc_implementation/parallelScavenge/psOldGen.hpp" | 171 #include "gc_implementation/parallelScavenge/psOldGen.hpp" |
172 #include "gc_implementation/parallelScavenge/psPermGen.hpp" | 172 #include "gc_implementation/parallelScavenge/psPermGen.hpp" |
173 #include "gc_implementation/parallelScavenge/psVirtualspace.hpp" | 173 #include "gc_implementation/parallelScavenge/psVirtualspace.hpp" |
174 #include "gc_implementation/parallelScavenge/psYoungGen.hpp" | 174 #include "gc_implementation/parallelScavenge/psYoungGen.hpp" |
175 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp" | 175 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp" |
176 #include "gc_implementation/g1/vmStructs_g1.hpp" | |
176 #endif | 177 #endif |
177 #ifdef COMPILER2 | 178 #ifdef COMPILER2 |
178 #include "opto/addnode.hpp" | 179 #include "opto/addnode.hpp" |
179 #include "opto/block.hpp" | 180 #include "opto/block.hpp" |
180 #include "opto/callnode.hpp" | 181 #include "opto/callnode.hpp" |
2853 GENERATE_STATIC_VM_STRUCT_ENTRY) | 2854 GENERATE_STATIC_VM_STRUCT_ENTRY) |
2854 | 2855 |
2855 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 2856 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
2856 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 2857 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
2857 GENERATE_STATIC_VM_STRUCT_ENTRY) | 2858 GENERATE_STATIC_VM_STRUCT_ENTRY) |
2859 | |
2860 VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | |
2861 GENERATE_STATIC_VM_STRUCT_ENTRY) | |
2858 #endif // SERIALGC | 2862 #endif // SERIALGC |
2859 | 2863 |
2860 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 2864 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
2861 GENERATE_STATIC_VM_STRUCT_ENTRY, \ | 2865 GENERATE_STATIC_VM_STRUCT_ENTRY, \ |
2862 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \ | 2866 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \ |
2896 | 2900 |
2897 VM_TYPES_CMS(GENERATE_VM_TYPE_ENTRY, | 2901 VM_TYPES_CMS(GENERATE_VM_TYPE_ENTRY, |
2898 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) | 2902 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) |
2899 | 2903 |
2900 VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY) | 2904 VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY) |
2905 | |
2906 VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY, | |
2907 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) | |
2901 #endif // SERIALGC | 2908 #endif // SERIALGC |
2902 | 2909 |
2903 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY, | 2910 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY, |
2904 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, | 2911 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, |
2905 GENERATE_OOP_VM_TYPE_ENTRY, | 2912 GENERATE_OOP_VM_TYPE_ENTRY, |
2995 CHECK_STATIC_VM_STRUCT_ENTRY); | 3002 CHECK_STATIC_VM_STRUCT_ENTRY); |
2996 | 3003 |
2997 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 3004 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2998 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, | 3005 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, |
2999 CHECK_STATIC_VM_STRUCT_ENTRY); | 3006 CHECK_STATIC_VM_STRUCT_ENTRY); |
3007 | |
3008 VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | |
3009 CHECK_STATIC_VM_STRUCT_ENTRY); | |
3000 #endif // SERIALGC | 3010 #endif // SERIALGC |
3001 | 3011 |
3002 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 3012 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3003 CHECK_STATIC_VM_STRUCT_ENTRY, | 3013 CHECK_STATIC_VM_STRUCT_ENTRY, |
3004 CHECK_NO_OP, | 3014 CHECK_NO_OP, |
3035 | 3045 |
3036 VM_TYPES_CMS(CHECK_VM_TYPE_ENTRY, | 3046 VM_TYPES_CMS(CHECK_VM_TYPE_ENTRY, |
3037 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); | 3047 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); |
3038 | 3048 |
3039 VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY) | 3049 VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY) |
3050 | |
3051 VM_TYPES_G1(CHECK_VM_TYPE_ENTRY, | |
3052 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); | |
3040 #endif // SERIALGC | 3053 #endif // SERIALGC |
3041 | 3054 |
3042 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, | 3055 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, |
3043 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3056 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3044 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3057 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3100 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ | 3113 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ |
3101 ENSURE_FIELD_TYPE_PRESENT)); | 3114 ENSURE_FIELD_TYPE_PRESENT)); |
3102 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ | 3115 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ |
3103 ENSURE_FIELD_TYPE_PRESENT, \ | 3116 ENSURE_FIELD_TYPE_PRESENT, \ |
3104 ENSURE_FIELD_TYPE_PRESENT)); | 3117 ENSURE_FIELD_TYPE_PRESENT)); |
3118 debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT, \ | |
3119 ENSURE_FIELD_TYPE_PRESENT)); | |
3105 #endif // SERIALGC | 3120 #endif // SERIALGC |
3106 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ | 3121 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ |
3107 ENSURE_FIELD_TYPE_PRESENT, \ | 3122 ENSURE_FIELD_TYPE_PRESENT, \ |
3108 CHECK_NO_OP, \ | 3123 CHECK_NO_OP, \ |
3109 ENSURE_FIELD_TYPE_PRESENT, \ | 3124 ENSURE_FIELD_TYPE_PRESENT, \ |