comparison src/share/vm/runtime/vmStructs.cpp @ 6856:9855b7e559ae

Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents 6e5a59a8e4a7 fb19af007ffc
children 5876f980ea19
comparison
equal deleted inserted replaced
6842:b9a9ed0f8eeb 6856:9855b7e559ae
228 static inline uint64_t cast_uint64_t(size_t x) 228 static inline uint64_t cast_uint64_t(size_t x)
229 { 229 {
230 return x; 230 return x;
231 } 231 }
232 232
233 #if INCLUDE_JVMTI
234 #define JVMTI_STRUCTS(static_field) \
235 static_field(JvmtiExport, _can_access_local_variables, bool) \
236 static_field(JvmtiExport, _can_hotswap_or_post_breakpoint, bool) \
237 static_field(JvmtiExport, _can_post_on_exceptions, bool) \
238 static_field(JvmtiExport, _can_walk_any_space, bool)
239 #else
240 #define JVMTI_STRUCTS(static_field)
241 #endif // INCLUDE_JVMTI
233 242
234 typedef HashtableEntry<intptr_t, mtInternal> IntptrHashtableEntry; 243 typedef HashtableEntry<intptr_t, mtInternal> IntptrHashtableEntry;
235 typedef Hashtable<intptr_t, mtInternal> IntptrHashtable; 244 typedef Hashtable<intptr_t, mtInternal> IntptrHashtable;
236 typedef Hashtable<Symbol*, mtSymbol> SymbolHashtable; 245 typedef Hashtable<Symbol*, mtSymbol> SymbolHashtable;
237 typedef HashtableEntry<Symbol*, mtClass> SymbolHashtableEntry; 246 typedef HashtableEntry<Symbol*, mtClass> SymbolHashtableEntry;
1168 \ 1177 \
1169 /*************************/ \ 1178 /*************************/ \
1170 /* JVMTI */ \ 1179 /* JVMTI */ \
1171 /*************************/ \ 1180 /*************************/ \
1172 \ 1181 \
1173 static_field(JvmtiExport, _can_access_local_variables, bool) \ 1182 JVMTI_STRUCTS(static_field) \
1174 static_field(JvmtiExport, _can_hotswap_or_post_breakpoint, bool) \
1175 static_field(JvmtiExport, _can_post_on_exceptions, bool) \
1176 static_field(JvmtiExport, _can_walk_any_space, bool) \
1177 \ 1183 \
1178 /*************/ \ 1184 /*************/ \
1179 /* Arguments */ \ 1185 /* Arguments */ \
1180 /*************/ \ 1186 /*************/ \
1181 \ 1187 \