Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/vmStructs.cpp @ 188:c0ecab83e6f3
Merge
author | never |
---|---|
date | Tue, 10 Jun 2008 09:57:24 -0700 |
parents | 5bba3366a9a2 790e66e5fbac |
children | d1605aabd0a1 6aae2f9d0294 |
comparison
equal
deleted
inserted
replaced
186:cf1821c649d9 | 188:c0ecab83e6f3 |
---|---|
1693 declare_constant(markOopDesc::biased_lock_pattern) \ | 1693 declare_constant(markOopDesc::biased_lock_pattern) \ |
1694 \ | 1694 \ |
1695 declare_constant(markOopDesc::no_hash) \ | 1695 declare_constant(markOopDesc::no_hash) \ |
1696 declare_constant(markOopDesc::no_hash_in_place) \ | 1696 declare_constant(markOopDesc::no_hash_in_place) \ |
1697 declare_constant(markOopDesc::no_lock_in_place) \ | 1697 declare_constant(markOopDesc::no_lock_in_place) \ |
1698 declare_constant(markOopDesc::max_age) | 1698 declare_constant(markOopDesc::max_age) \ |
1699 \ | |
1700 /* Constants in markOop used by CMS. */ \ | |
1701 declare_constant(markOopDesc::cms_shift) \ | |
1702 declare_constant(markOopDesc::cms_mask) \ | |
1703 declare_constant(markOopDesc::size_shift) \ | |
1699 | 1704 |
1700 /* NOTE that we do not use the last_entry() macro here; it is used */ | 1705 /* NOTE that we do not use the last_entry() macro here; it is used */ |
1701 /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */ | 1706 /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */ |
1702 /* must be present there) */ | 1707 /* must be present there) */ |
1703 | 1708 |
1957 #ifndef SERIALGC | 1962 #ifndef SERIALGC |
1958 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1963 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1959 GENERATE_STATIC_VM_STRUCT_ENTRY) | 1964 GENERATE_STATIC_VM_STRUCT_ENTRY) |
1960 | 1965 |
1961 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1966 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1967 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | |
1962 GENERATE_STATIC_VM_STRUCT_ENTRY) | 1968 GENERATE_STATIC_VM_STRUCT_ENTRY) |
1963 #endif // SERIALGC | 1969 #endif // SERIALGC |
1964 | 1970 |
1965 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1971 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1966 GENERATE_STATIC_VM_STRUCT_ENTRY, \ | 1972 GENERATE_STATIC_VM_STRUCT_ENTRY, \ |
2098 #ifndef SERIALGC | 2104 #ifndef SERIALGC |
2099 VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2105 VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2100 CHECK_STATIC_VM_STRUCT_ENTRY); | 2106 CHECK_STATIC_VM_STRUCT_ENTRY); |
2101 | 2107 |
2102 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2108 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2109 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, | |
2103 CHECK_STATIC_VM_STRUCT_ENTRY); | 2110 CHECK_STATIC_VM_STRUCT_ENTRY); |
2104 #endif // SERIALGC | 2111 #endif // SERIALGC |
2105 | 2112 |
2106 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2113 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2107 CHECK_STATIC_VM_STRUCT_ENTRY, | 2114 CHECK_STATIC_VM_STRUCT_ENTRY, |
2202 CHECK_SENTINEL)); | 2209 CHECK_SENTINEL)); |
2203 #ifndef SERIALGC | 2210 #ifndef SERIALGC |
2204 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ | 2211 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ |
2205 ENSURE_FIELD_TYPE_PRESENT)); | 2212 ENSURE_FIELD_TYPE_PRESENT)); |
2206 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ | 2213 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ |
2214 ENSURE_FIELD_TYPE_PRESENT, \ | |
2207 ENSURE_FIELD_TYPE_PRESENT)); | 2215 ENSURE_FIELD_TYPE_PRESENT)); |
2208 #endif // SERIALGC | 2216 #endif // SERIALGC |
2209 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ | 2217 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ |
2210 ENSURE_FIELD_TYPE_PRESENT, \ | 2218 ENSURE_FIELD_TYPE_PRESENT, \ |
2211 CHECK_NO_OP, \ | 2219 CHECK_NO_OP, \ |