src/share/vm/runtime/vmStructs.cpp

changeset 3183
fd65bc7c09b6
parent 3158
cb315dc80374
parent 3168
4f93f0d00802
child 3366
75c0a73eee98
equal deleted inserted replaced
3167:95607b70acb5 3183:fd65bc7c09b6
180 #include "gc_implementation/parallelScavenge/psOldGen.hpp" 180 #include "gc_implementation/parallelScavenge/psOldGen.hpp"
181 #include "gc_implementation/parallelScavenge/psPermGen.hpp" 181 #include "gc_implementation/parallelScavenge/psPermGen.hpp"
182 #include "gc_implementation/parallelScavenge/psVirtualspace.hpp" 182 #include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
183 #include "gc_implementation/parallelScavenge/psYoungGen.hpp" 183 #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
184 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp" 184 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
185 #include "gc_implementation/g1/vmStructs_g1.hpp"
185 #endif 186 #endif
186 #ifdef COMPILER2 187 #ifdef COMPILER2
187 #include "opto/addnode.hpp" 188 #include "opto/addnode.hpp"
188 #include "opto/block.hpp" 189 #include "opto/block.hpp"
189 #include "opto/callnode.hpp" 190 #include "opto/callnode.hpp"
2876 GENERATE_STATIC_VM_STRUCT_ENTRY) 2877 GENERATE_STATIC_VM_STRUCT_ENTRY)
2877 2878
2878 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 2879 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
2879 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 2880 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
2880 GENERATE_STATIC_VM_STRUCT_ENTRY) 2881 GENERATE_STATIC_VM_STRUCT_ENTRY)
2882
2883 VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
2884 GENERATE_STATIC_VM_STRUCT_ENTRY)
2881 #endif // SERIALGC 2885 #endif // SERIALGC
2882 2886
2883 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 2887 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
2884 GENERATE_STATIC_VM_STRUCT_ENTRY, \ 2888 GENERATE_STATIC_VM_STRUCT_ENTRY, \
2885 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \ 2889 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \
2919 2923
2920 VM_TYPES_CMS(GENERATE_VM_TYPE_ENTRY, 2924 VM_TYPES_CMS(GENERATE_VM_TYPE_ENTRY,
2921 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) 2925 GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
2922 2926
2923 VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY) 2927 VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY)
2928
2929 VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
2930 GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
2924 #endif // SERIALGC 2931 #endif // SERIALGC
2925 2932
2926 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY, 2933 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
2927 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, 2934 GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
2928 GENERATE_OOP_VM_TYPE_ENTRY, 2935 GENERATE_OOP_VM_TYPE_ENTRY,
3018 CHECK_STATIC_VM_STRUCT_ENTRY); 3025 CHECK_STATIC_VM_STRUCT_ENTRY);
3019 3026
3020 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, 3027 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
3021 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, 3028 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
3022 CHECK_STATIC_VM_STRUCT_ENTRY); 3029 CHECK_STATIC_VM_STRUCT_ENTRY);
3030
3031 VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
3032 CHECK_STATIC_VM_STRUCT_ENTRY);
3023 #endif // SERIALGC 3033 #endif // SERIALGC
3024 3034
3025 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, 3035 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
3026 CHECK_STATIC_VM_STRUCT_ENTRY, 3036 CHECK_STATIC_VM_STRUCT_ENTRY,
3027 CHECK_NO_OP, 3037 CHECK_NO_OP,
3058 3068
3059 VM_TYPES_CMS(CHECK_VM_TYPE_ENTRY, 3069 VM_TYPES_CMS(CHECK_VM_TYPE_ENTRY,
3060 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); 3070 CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
3061 3071
3062 VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY) 3072 VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY)
3073
3074 VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
3075 CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
3063 #endif // SERIALGC 3076 #endif // SERIALGC
3064 3077
3065 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, 3078 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
3066 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, 3079 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
3067 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, 3080 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
3123 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ 3136 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \
3124 ENSURE_FIELD_TYPE_PRESENT)); 3137 ENSURE_FIELD_TYPE_PRESENT));
3125 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ 3138 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \
3126 ENSURE_FIELD_TYPE_PRESENT, \ 3139 ENSURE_FIELD_TYPE_PRESENT, \
3127 ENSURE_FIELD_TYPE_PRESENT)); 3140 ENSURE_FIELD_TYPE_PRESENT));
3141 debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT, \
3142 ENSURE_FIELD_TYPE_PRESENT));
3128 #endif // SERIALGC 3143 #endif // SERIALGC
3129 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ 3144 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \
3130 ENSURE_FIELD_TYPE_PRESENT, \ 3145 ENSURE_FIELD_TYPE_PRESENT, \
3131 CHECK_NO_OP, \ 3146 CHECK_NO_OP, \
3132 ENSURE_FIELD_TYPE_PRESENT, \ 3147 ENSURE_FIELD_TYPE_PRESENT, \

mercurial