Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 6b0fd0964b87 |
children | 3cce976666d9 |
comparison
equal
deleted
inserted
replaced
11197:3479ab380552 | 11198:1e6d5dec4a4e |
---|---|
261 c2_nonstatic_field, \ | 261 c2_nonstatic_field, \ |
262 unchecked_c1_static_field, \ | 262 unchecked_c1_static_field, \ |
263 unchecked_c2_static_field) \ | 263 unchecked_c2_static_field) \ |
264 \ | 264 \ |
265 /******************************************************************/ \ | 265 /******************************************************************/ \ |
266 /* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete) */ \ | 266 /* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete) */ \ |
267 /******************************************************************/ \ | 267 /******************************************************************/ \ |
268 \ | 268 \ |
269 volatile_nonstatic_field(oopDesc, _mark, markOop) \ | 269 volatile_nonstatic_field(oopDesc, _mark, markOop) \ |
270 volatile_nonstatic_field(oopDesc, _metadata._klass, Klass*) \ | 270 volatile_nonstatic_field(oopDesc, _metadata._klass, Klass*) \ |
271 volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \ | 271 volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \ |
272 static_field(oopDesc, _bs, BarrierSet*) \ | 272 static_field(oopDesc, _bs, BarrierSet*) \ |
273 nonstatic_field(ArrayKlass, _dimension, int) \ | 273 nonstatic_field(ArrayKlass, _dimension, int) \ |
274 volatile_nonstatic_field(ArrayKlass, _higher_dimension, Klass*) \ | 274 volatile_nonstatic_field(ArrayKlass, _higher_dimension, Klass*) \ |
275 volatile_nonstatic_field(ArrayKlass, _lower_dimension, Klass*) \ | 275 volatile_nonstatic_field(ArrayKlass, _lower_dimension, Klass*) \ |
276 nonstatic_field(ArrayKlass, _vtable_len, int) \ | 276 nonstatic_field(ArrayKlass, _vtable_len, int) \ |
277 nonstatic_field(ArrayKlass, _alloc_size, juint) \ | |
278 nonstatic_field(ArrayKlass, _component_mirror, oop) \ | 277 nonstatic_field(ArrayKlass, _component_mirror, oop) \ |
279 nonstatic_field(CompiledICHolder, _holder_method, Method*) \ | 278 nonstatic_field(CompiledICHolder, _holder_method, Method*) \ |
280 nonstatic_field(CompiledICHolder, _holder_klass, Klass*) \ | 279 nonstatic_field(CompiledICHolder, _holder_klass, Klass*) \ |
281 nonstatic_field(ConstantPool, _tags, Array<u1>*) \ | 280 nonstatic_field(ConstantPool, _tags, Array<u1>*) \ |
282 nonstatic_field(ConstantPool, _cache, ConstantPoolCache*) \ | 281 nonstatic_field(ConstantPool, _cache, ConstantPoolCache*) \ |
283 nonstatic_field(ConstantPool, _pool_holder, InstanceKlass*) \ | 282 nonstatic_field(ConstantPool, _pool_holder, InstanceKlass*) \ |
284 nonstatic_field(ConstantPool, _operands, Array<u2>*) \ | 283 nonstatic_field(ConstantPool, _operands, Array<u2>*) \ |
285 nonstatic_field(ConstantPool, _length, int) \ | 284 nonstatic_field(ConstantPool, _length, int) \ |
286 nonstatic_field(ConstantPool, _resolved_references, jobject) \ | 285 nonstatic_field(ConstantPool, _resolved_references, jobject) \ |
287 nonstatic_field(ConstantPool, _reference_map, Array<u2>*) \ | 286 nonstatic_field(ConstantPool, _reference_map, Array<u2>*) \ |
288 nonstatic_field(ConstantPoolCache, _length, int) \ | 287 nonstatic_field(ConstantPoolCache, _length, int) \ |
289 nonstatic_field(ConstantPoolCache, _constant_pool, ConstantPool*) \ | 288 nonstatic_field(ConstantPoolCache, _constant_pool, ConstantPool*) \ |
290 nonstatic_field(InstanceKlass, _array_klasses, Klass*) \ | 289 nonstatic_field(InstanceKlass, _array_klasses, Klass*) \ |
291 nonstatic_field(InstanceKlass, _methods, Array<Method*>*) \ | 290 nonstatic_field(InstanceKlass, _methods, Array<Method*>*) \ |
292 nonstatic_field(InstanceKlass, _local_interfaces, Array<Klass*>*) \ | 291 nonstatic_field(InstanceKlass, _local_interfaces, Array<Klass*>*) \ |
293 nonstatic_field(InstanceKlass, _transitive_interfaces, Array<Klass*>*) \ | 292 nonstatic_field(InstanceKlass, _transitive_interfaces, Array<Klass*>*) \ |
294 nonstatic_field(InstanceKlass, _fields, Array<u2>*) \ | 293 nonstatic_field(InstanceKlass, _fields, Array<u2>*) \ |
295 nonstatic_field(InstanceKlass, _java_fields_count, u2) \ | 294 nonstatic_field(InstanceKlass, _java_fields_count, u2) \ |
296 nonstatic_field(InstanceKlass, _constants, ConstantPool*) \ | 295 nonstatic_field(InstanceKlass, _constants, ConstantPool*) \ |
334 nonstatic_field(Klass, _layout_helper, jint) \ | 333 nonstatic_field(Klass, _layout_helper, jint) \ |
335 nonstatic_field(Klass, _name, Symbol*) \ | 334 nonstatic_field(Klass, _name, Symbol*) \ |
336 nonstatic_field(Klass, _access_flags, AccessFlags) \ | 335 nonstatic_field(Klass, _access_flags, AccessFlags) \ |
337 nonstatic_field(Klass, _subklass, Klass*) \ | 336 nonstatic_field(Klass, _subklass, Klass*) \ |
338 nonstatic_field(Klass, _next_sibling, Klass*) \ | 337 nonstatic_field(Klass, _next_sibling, Klass*) \ |
339 nonstatic_field(Klass, _alloc_count, juint) \ | |
340 nonstatic_field(MethodData, _size, int) \ | 338 nonstatic_field(MethodData, _size, int) \ |
341 nonstatic_field(MethodData, _method, Method*) \ | 339 nonstatic_field(MethodData, _method, Method*) \ |
342 nonstatic_field(MethodData, _data_size, int) \ | 340 nonstatic_field(MethodData, _data_size, int) \ |
343 nonstatic_field(MethodData, _data[0], intptr_t) \ | 341 nonstatic_field(MethodData, _data[0], intptr_t) \ |
344 nonstatic_field(MethodData, _nof_decompiles, uint) \ | 342 nonstatic_field(MethodData, _nof_decompiles, uint) \ |
345 nonstatic_field(MethodData, _nof_overflow_recompiles, uint) \ | 343 nonstatic_field(MethodData, _nof_overflow_recompiles, uint) \ |
346 nonstatic_field(MethodData, _nof_overflow_traps, uint) \ | 344 nonstatic_field(MethodData, _nof_overflow_traps, uint) \ |
377 nonstatic_field(ConstMethod, _max_stack, u2) \ | 375 nonstatic_field(ConstMethod, _max_stack, u2) \ |
378 nonstatic_field(ConstMethod, _max_locals, u2) \ | 376 nonstatic_field(ConstMethod, _max_locals, u2) \ |
379 nonstatic_field(ConstMethod, _size_of_parameters, u2) \ | 377 nonstatic_field(ConstMethod, _size_of_parameters, u2) \ |
380 nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ | 378 nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ |
381 nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ | 379 nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ |
382 volatile_nonstatic_field(Symbol, _refcount, int) \ | 380 volatile_nonstatic_field(Symbol, _refcount, short) \ |
383 nonstatic_field(Symbol, _identity_hash, int) \ | 381 nonstatic_field(Symbol, _identity_hash, int) \ |
384 nonstatic_field(Symbol, _length, unsigned short) \ | 382 nonstatic_field(Symbol, _length, unsigned short) \ |
385 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ | 383 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ |
386 nonstatic_field(TypeArrayKlass, _max_length, int) \ | 384 nonstatic_field(TypeArrayKlass, _max_length, int) \ |
387 \ | 385 \ |
435 static_field(Universe, _doubleArrayKlassObj, Klass*) \ | 433 static_field(Universe, _doubleArrayKlassObj, Klass*) \ |
436 static_field(Universe, _mirrors[0], oop) \ | 434 static_field(Universe, _mirrors[0], oop) \ |
437 static_field(Universe, _main_thread_group, oop) \ | 435 static_field(Universe, _main_thread_group, oop) \ |
438 static_field(Universe, _system_thread_group, oop) \ | 436 static_field(Universe, _system_thread_group, oop) \ |
439 static_field(Universe, _the_empty_class_klass_array, objArrayOop) \ | 437 static_field(Universe, _the_empty_class_klass_array, objArrayOop) \ |
440 static_field(Universe, _out_of_memory_error_java_heap, oop) \ | |
441 static_field(Universe, _out_of_memory_error_perm_gen, oop) \ | |
442 static_field(Universe, _out_of_memory_error_array_size, oop) \ | |
443 static_field(Universe, _out_of_memory_error_gc_overhead_limit, oop) \ | |
444 static_field(Universe, _null_ptr_exception_instance, oop) \ | 438 static_field(Universe, _null_ptr_exception_instance, oop) \ |
445 static_field(Universe, _arithmetic_exception_instance, oop) \ | 439 static_field(Universe, _arithmetic_exception_instance, oop) \ |
446 static_field(Universe, _vm_exception, oop) \ | 440 static_field(Universe, _vm_exception, oop) \ |
447 static_field(Universe, _collectedHeap, CollectedHeap*) \ | 441 static_field(Universe, _collectedHeap, CollectedHeap*) \ |
448 static_field(Universe, _base_vtable_size, int) \ | 442 static_field(Universe, _base_vtable_size, int) \ |