equal
deleted
inserted
replaced
135 #endif |
135 #endif |
136 |
136 |
137 #if INCLUDE_TRACE |
137 #if INCLUDE_TRACE |
138 #include "runtime/vmStructs_trace.hpp" |
138 #include "runtime/vmStructs_trace.hpp" |
139 #endif |
139 #endif |
140 |
|
141 #include "runtime/vmStructs_ext.hpp" |
|
142 |
140 |
143 #ifdef COMPILER2 |
141 #ifdef COMPILER2 |
144 #include "opto/addnode.hpp" |
142 #include "opto/addnode.hpp" |
145 #include "opto/block.hpp" |
143 #include "opto/block.hpp" |
146 #include "opto/callnode.hpp" |
144 #include "opto/callnode.hpp" |
3030 #if INCLUDE_TRACE |
3028 #if INCLUDE_TRACE |
3031 VM_STRUCTS_TRACE(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3029 VM_STRUCTS_TRACE(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3032 GENERATE_STATIC_VM_STRUCT_ENTRY) |
3030 GENERATE_STATIC_VM_STRUCT_ENTRY) |
3033 #endif |
3031 #endif |
3034 |
3032 |
3035 VM_STRUCTS_EXT(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
|
3036 GENERATE_STATIC_VM_STRUCT_ENTRY) |
|
3037 |
|
3038 VM_STRUCTS_OS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3033 VM_STRUCTS_OS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3039 GENERATE_STATIC_VM_STRUCT_ENTRY, |
3034 GENERATE_STATIC_VM_STRUCT_ENTRY, |
3040 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, |
3035 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, |
3041 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3036 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3042 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3037 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3096 |
3091 |
3097 #if INCLUDE_TRACE |
3092 #if INCLUDE_TRACE |
3098 VM_TYPES_TRACE(GENERATE_VM_TYPE_ENTRY, |
3093 VM_TYPES_TRACE(GENERATE_VM_TYPE_ENTRY, |
3099 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) |
3094 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) |
3100 #endif |
3095 #endif |
3101 |
|
3102 VM_TYPES_EXT(GENERATE_VM_TYPE_ENTRY, |
|
3103 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) |
|
3104 |
3096 |
3105 VM_TYPES_OS(GENERATE_VM_TYPE_ENTRY, |
3097 VM_TYPES_OS(GENERATE_VM_TYPE_ENTRY, |
3106 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, |
3098 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, |
3107 GENERATE_OOP_VM_TYPE_ENTRY, |
3099 GENERATE_OOP_VM_TYPE_ENTRY, |
3108 GENERATE_INTEGER_VM_TYPE_ENTRY, |
3100 GENERATE_INTEGER_VM_TYPE_ENTRY, |
3247 #if INCLUDE_TRACE |
3239 #if INCLUDE_TRACE |
3248 VM_STRUCTS_TRACE(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3240 VM_STRUCTS_TRACE(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3249 CHECK_STATIC_VM_STRUCT_ENTRY); |
3241 CHECK_STATIC_VM_STRUCT_ENTRY); |
3250 #endif |
3242 #endif |
3251 |
3243 |
3252 VM_STRUCTS_EXT(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
|
3253 CHECK_STATIC_VM_STRUCT_ENTRY); |
|
3254 |
|
3255 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3244 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3256 CHECK_STATIC_VM_STRUCT_ENTRY, |
3245 CHECK_STATIC_VM_STRUCT_ENTRY, |
3257 CHECK_NO_OP, |
3246 CHECK_NO_OP, |
3258 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, |
3247 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, |
3259 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3248 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3296 |
3285 |
3297 #if INCLUDE_TRACE |
3286 #if INCLUDE_TRACE |
3298 VM_TYPES_TRACE(CHECK_VM_TYPE_ENTRY, |
3287 VM_TYPES_TRACE(CHECK_VM_TYPE_ENTRY, |
3299 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); |
3288 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); |
3300 #endif |
3289 #endif |
3301 |
|
3302 VM_TYPES_EXT(CHECK_VM_TYPE_ENTRY, |
|
3303 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); |
|
3304 |
3290 |
3305 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, |
3291 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, |
3306 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3292 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3307 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3293 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3308 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3294 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3370 |
3356 |
3371 #if INCLUDE_TRACE |
3357 #if INCLUDE_TRACE |
3372 debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT, |
3358 debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT, |
3373 ENSURE_FIELD_TYPE_PRESENT)); |
3359 ENSURE_FIELD_TYPE_PRESENT)); |
3374 #endif |
3360 #endif |
3375 |
|
3376 debug_only(VM_STRUCTS_EXT(ENSURE_FIELD_TYPE_PRESENT, |
|
3377 ENSURE_FIELD_TYPE_PRESENT)); |
|
3378 |
3361 |
3379 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, |
3362 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, |
3380 ENSURE_FIELD_TYPE_PRESENT, |
3363 ENSURE_FIELD_TYPE_PRESENT, |
3381 CHECK_NO_OP, |
3364 CHECK_NO_OP, |
3382 ENSURE_FIELD_TYPE_PRESENT, |
3365 ENSURE_FIELD_TYPE_PRESENT, |