Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 344:6aae2f9d0294
Merge
author | ysr |
---|---|
date | Thu, 12 Jun 2008 13:50:55 -0700 |
parents | 37f87013dfd8 c0ecab83e6f3 |
children | 1ee8caae33af |
comparison
equal
deleted
inserted
replaced
342:37f87013dfd8 | 344:6aae2f9d0294 |
---|---|
892 /* in order to do platform-independent address -> integer coercion */ \ | 892 /* in order to do platform-independent address -> integer coercion */ \ |
893 /* (note: these will be looked up by name) */ \ | 893 /* (note: these will be looked up by name) */ \ |
894 /*******************************************************************/ \ | 894 /*******************************************************************/ \ |
895 \ | 895 \ |
896 declare_unsigned_integer_type(size_t) \ | 896 declare_unsigned_integer_type(size_t) \ |
897 declare_integer_type(ssize_t) \ | |
897 declare_unsigned_integer_type(const size_t) \ | 898 declare_unsigned_integer_type(const size_t) \ |
898 declare_integer_type(intx) \ | 899 declare_integer_type(intx) \ |
899 declare_integer_type(intptr_t) \ | 900 declare_integer_type(intptr_t) \ |
900 declare_unsigned_integer_type(uintx) \ | 901 declare_unsigned_integer_type(uintx) \ |
901 declare_unsigned_integer_type(uintptr_t) \ | 902 declare_unsigned_integer_type(uintptr_t) \ |
1697 declare_constant(markOopDesc::biased_lock_pattern) \ | 1698 declare_constant(markOopDesc::biased_lock_pattern) \ |
1698 \ | 1699 \ |
1699 declare_constant(markOopDesc::no_hash) \ | 1700 declare_constant(markOopDesc::no_hash) \ |
1700 declare_constant(markOopDesc::no_hash_in_place) \ | 1701 declare_constant(markOopDesc::no_hash_in_place) \ |
1701 declare_constant(markOopDesc::no_lock_in_place) \ | 1702 declare_constant(markOopDesc::no_lock_in_place) \ |
1702 declare_constant(markOopDesc::max_age) | 1703 declare_constant(markOopDesc::max_age) \ |
1704 \ | |
1705 /* Constants in markOop used by CMS. */ \ | |
1706 declare_constant(markOopDesc::cms_shift) \ | |
1707 declare_constant(markOopDesc::cms_mask) \ | |
1708 declare_constant(markOopDesc::size_shift) \ | |
1703 | 1709 |
1704 /* NOTE that we do not use the last_entry() macro here; it is used */ | 1710 /* NOTE that we do not use the last_entry() macro here; it is used */ |
1705 /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */ | 1711 /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */ |
1706 /* must be present there) */ | 1712 /* must be present there) */ |
1707 | 1713 |
1961 #ifndef SERIALGC | 1967 #ifndef SERIALGC |
1962 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1968 VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1963 GENERATE_STATIC_VM_STRUCT_ENTRY) | 1969 GENERATE_STATIC_VM_STRUCT_ENTRY) |
1964 | 1970 |
1965 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1971 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1972 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | |
1966 GENERATE_STATIC_VM_STRUCT_ENTRY) | 1973 GENERATE_STATIC_VM_STRUCT_ENTRY) |
1967 #endif // SERIALGC | 1974 #endif // SERIALGC |
1968 | 1975 |
1969 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ | 1976 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ |
1970 GENERATE_STATIC_VM_STRUCT_ENTRY, \ | 1977 GENERATE_STATIC_VM_STRUCT_ENTRY, \ |
2102 #ifndef SERIALGC | 2109 #ifndef SERIALGC |
2103 VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2110 VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2104 CHECK_STATIC_VM_STRUCT_ENTRY); | 2111 CHECK_STATIC_VM_STRUCT_ENTRY); |
2105 | 2112 |
2106 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2113 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2114 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, | |
2107 CHECK_STATIC_VM_STRUCT_ENTRY); | 2115 CHECK_STATIC_VM_STRUCT_ENTRY); |
2108 #endif // SERIALGC | 2116 #endif // SERIALGC |
2109 | 2117 |
2110 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 2118 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
2111 CHECK_STATIC_VM_STRUCT_ENTRY, | 2119 CHECK_STATIC_VM_STRUCT_ENTRY, |
2206 CHECK_SENTINEL)); | 2214 CHECK_SENTINEL)); |
2207 #ifndef SERIALGC | 2215 #ifndef SERIALGC |
2208 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ | 2216 debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \ |
2209 ENSURE_FIELD_TYPE_PRESENT)); | 2217 ENSURE_FIELD_TYPE_PRESENT)); |
2210 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ | 2218 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ |
2219 ENSURE_FIELD_TYPE_PRESENT, \ | |
2211 ENSURE_FIELD_TYPE_PRESENT)); | 2220 ENSURE_FIELD_TYPE_PRESENT)); |
2212 #endif // SERIALGC | 2221 #endif // SERIALGC |
2213 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ | 2222 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ |
2214 ENSURE_FIELD_TYPE_PRESENT, \ | 2223 ENSURE_FIELD_TYPE_PRESENT, \ |
2215 CHECK_NO_OP, \ | 2224 CHECK_NO_OP, \ |