Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 1162:d749b1813f40
Merge
author | trims |
---|---|
date | Fri, 15 Jan 2010 14:25:44 -0800 |
parents | 9b9c1ee9b3f6 |
children | 7b0e9cba0307 |
comparison
equal
deleted
inserted
replaced
1130:1bc68593a110 | 1162:d749b1813f40 |
---|---|
453 static_field(SystemDictionary, _dictionary, Dictionary*) \ | 453 static_field(SystemDictionary, _dictionary, Dictionary*) \ |
454 static_field(SystemDictionary, _placeholders, PlaceholderTable*) \ | 454 static_field(SystemDictionary, _placeholders, PlaceholderTable*) \ |
455 static_field(SystemDictionary, _shared_dictionary, Dictionary*) \ | 455 static_field(SystemDictionary, _shared_dictionary, Dictionary*) \ |
456 static_field(SystemDictionary, _system_loader_lock_obj, oop) \ | 456 static_field(SystemDictionary, _system_loader_lock_obj, oop) \ |
457 static_field(SystemDictionary, _loader_constraints, LoaderConstraintTable*) \ | 457 static_field(SystemDictionary, _loader_constraints, LoaderConstraintTable*) \ |
458 static_field(SystemDictionary, WK_KLASS(object_klass), klassOop) \ | 458 static_field(SystemDictionary, WK_KLASS(Object_klass), klassOop) \ |
459 static_field(SystemDictionary, WK_KLASS(string_klass), klassOop) \ | 459 static_field(SystemDictionary, WK_KLASS(String_klass), klassOop) \ |
460 static_field(SystemDictionary, WK_KLASS(class_klass), klassOop) \ | 460 static_field(SystemDictionary, WK_KLASS(Class_klass), klassOop) \ |
461 static_field(SystemDictionary, WK_KLASS(cloneable_klass), klassOop) \ | 461 static_field(SystemDictionary, WK_KLASS(Cloneable_klass), klassOop) \ |
462 static_field(SystemDictionary, WK_KLASS(classloader_klass), klassOop) \ | 462 static_field(SystemDictionary, WK_KLASS(ClassLoader_klass), klassOop) \ |
463 static_field(SystemDictionary, WK_KLASS(serializable_klass), klassOop) \ | 463 static_field(SystemDictionary, WK_KLASS(Serializable_klass), klassOop) \ |
464 static_field(SystemDictionary, WK_KLASS(system_klass), klassOop) \ | 464 static_field(SystemDictionary, WK_KLASS(System_klass), klassOop) \ |
465 static_field(SystemDictionary, WK_KLASS(throwable_klass), klassOop) \ | 465 static_field(SystemDictionary, WK_KLASS(Throwable_klass), klassOop) \ |
466 static_field(SystemDictionary, WK_KLASS(threaddeath_klass), klassOop) \ | 466 static_field(SystemDictionary, WK_KLASS(ThreadDeath_klass), klassOop) \ |
467 static_field(SystemDictionary, WK_KLASS(error_klass), klassOop) \ | 467 static_field(SystemDictionary, WK_KLASS(Error_klass), klassOop) \ |
468 static_field(SystemDictionary, WK_KLASS(exception_klass), klassOop) \ | 468 static_field(SystemDictionary, WK_KLASS(Exception_klass), klassOop) \ |
469 static_field(SystemDictionary, WK_KLASS(runtime_exception_klass), klassOop) \ | 469 static_field(SystemDictionary, WK_KLASS(RuntimeException_klass), klassOop) \ |
470 static_field(SystemDictionary, WK_KLASS(classNotFoundException_klass), klassOop) \ | 470 static_field(SystemDictionary, WK_KLASS(ClassNotFoundException_klass), klassOop) \ |
471 static_field(SystemDictionary, WK_KLASS(noClassDefFoundError_klass), klassOop) \ | 471 static_field(SystemDictionary, WK_KLASS(NoClassDefFoundError_klass), klassOop) \ |
472 static_field(SystemDictionary, WK_KLASS(linkageError_klass), klassOop) \ | 472 static_field(SystemDictionary, WK_KLASS(LinkageError_klass), klassOop) \ |
473 static_field(SystemDictionary, WK_KLASS(ClassCastException_klass), klassOop) \ | 473 static_field(SystemDictionary, WK_KLASS(ClassCastException_klass), klassOop) \ |
474 static_field(SystemDictionary, WK_KLASS(ArrayStoreException_klass), klassOop) \ | 474 static_field(SystemDictionary, WK_KLASS(ArrayStoreException_klass), klassOop) \ |
475 static_field(SystemDictionary, WK_KLASS(virtualMachineError_klass), klassOop) \ | 475 static_field(SystemDictionary, WK_KLASS(VirtualMachineError_klass), klassOop) \ |
476 static_field(SystemDictionary, WK_KLASS(OutOfMemoryError_klass), klassOop) \ | 476 static_field(SystemDictionary, WK_KLASS(OutOfMemoryError_klass), klassOop) \ |
477 static_field(SystemDictionary, WK_KLASS(StackOverflowError_klass), klassOop) \ | 477 static_field(SystemDictionary, WK_KLASS(StackOverflowError_klass), klassOop) \ |
478 static_field(SystemDictionary, WK_KLASS(protectionDomain_klass), klassOop) \ | 478 static_field(SystemDictionary, WK_KLASS(ProtectionDomain_klass), klassOop) \ |
479 static_field(SystemDictionary, WK_KLASS(AccessControlContext_klass), klassOop) \ | 479 static_field(SystemDictionary, WK_KLASS(AccessControlContext_klass), klassOop) \ |
480 static_field(SystemDictionary, WK_KLASS(reference_klass), klassOop) \ | 480 static_field(SystemDictionary, WK_KLASS(Reference_klass), klassOop) \ |
481 static_field(SystemDictionary, WK_KLASS(soft_reference_klass), klassOop) \ | 481 static_field(SystemDictionary, WK_KLASS(SoftReference_klass), klassOop) \ |
482 static_field(SystemDictionary, WK_KLASS(weak_reference_klass), klassOop) \ | 482 static_field(SystemDictionary, WK_KLASS(WeakReference_klass), klassOop) \ |
483 static_field(SystemDictionary, WK_KLASS(final_reference_klass), klassOop) \ | 483 static_field(SystemDictionary, WK_KLASS(FinalReference_klass), klassOop) \ |
484 static_field(SystemDictionary, WK_KLASS(phantom_reference_klass), klassOop) \ | 484 static_field(SystemDictionary, WK_KLASS(PhantomReference_klass), klassOop) \ |
485 static_field(SystemDictionary, WK_KLASS(finalizer_klass), klassOop) \ | 485 static_field(SystemDictionary, WK_KLASS(Finalizer_klass), klassOop) \ |
486 static_field(SystemDictionary, WK_KLASS(thread_klass), klassOop) \ | 486 static_field(SystemDictionary, WK_KLASS(Thread_klass), klassOop) \ |
487 static_field(SystemDictionary, WK_KLASS(threadGroup_klass), klassOop) \ | 487 static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), klassOop) \ |
488 static_field(SystemDictionary, WK_KLASS(properties_klass), klassOop) \ | 488 static_field(SystemDictionary, WK_KLASS(Properties_klass), klassOop) \ |
489 static_field(SystemDictionary, WK_KLASS(stringBuffer_klass), klassOop) \ | 489 static_field(SystemDictionary, WK_KLASS(StringBuffer_klass), klassOop) \ |
490 static_field(SystemDictionary, WK_KLASS(vector_klass), klassOop) \ | |
491 static_field(SystemDictionary, WK_KLASS(hashtable_klass), klassOop) \ | |
492 static_field(SystemDictionary, _box_klasses[0], klassOop) \ | 490 static_field(SystemDictionary, _box_klasses[0], klassOop) \ |
493 static_field(SystemDictionary, _java_system_loader, oop) \ | 491 static_field(SystemDictionary, _java_system_loader, oop) \ |
494 \ | 492 \ |
495 /*******************/ \ | 493 /*******************/ \ |
496 /* HashtableBucket */ \ | 494 /* HashtableBucket */ \ |