X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjavaobjects.hpp;h=b6061a1b8258f02210274a653fb8179155de4157;hb=03349a3953e0f217d686d88b99fa176509a27559;hp=b8ee1215a26280226c6296bd90cfcfb2a268d55c;hpb=6e920e48a314cfed80ff5db1b026c28049cba600;p=cacao.git diff --git a/src/vm/javaobjects.hpp b/src/vm/javaobjects.hpp index b8ee1215a..b6061a1b8 100644 --- a/src/vm/javaobjects.hpp +++ b/src/vm/javaobjects.hpp @@ -1,6 +1,8 @@ /* src/vm/javaobjects.hpp - functions to create and access Java objects - Copyright (C) 2008 Theobroma Systems Ltd. + Copyright (C) 1996-2011 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO + Copyright (C) 2008, 2009 Theobroma Systems Ltd. This file is part of CACAO. @@ -509,6 +511,21 @@ inline void java_lang_Double::set_value(double value) #if defined(ENABLE_JAVASE) +/** + * java/lang/management/MemoryUsage + * + * Object layout: + * + * 0. object header + * [other fields are not used] + */ +class java_lang_management_MemoryUsage : public java_lang_Object, private FieldAccess { +public: + java_lang_management_MemoryUsage(java_handle_t* h) : java_lang_Object(h) {} + java_lang_management_MemoryUsage(int64_t init, int64_t used, int64_t commited, int64_t maximum); +}; + + # if defined(ENABLE_ANNOTATIONS) /** * OpenJDK sun/reflect/ConstantPool @@ -554,6 +571,8 @@ inline void sun_reflect_ConstantPool::set_constantPoolOop(jclass value) #endif // ENABLE_JAVASE +void jobjects_register_dyn_offsets(); +bool jobjects_run_dynoffsets_hook(classinfo *c); #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) @@ -590,6 +609,39 @@ inline void java_lang_Class::set_pd(java_handle_t* value) } +/** + * GNU Classpath java/lang/ClassLoader + * + * Object layout: + * + * 0. object header + * 1. java.util.HashMap definedPackages + * 2. java.lang.ClassLoader parent + * [other fields are not used] + */ +class java_lang_ClassLoader : public java_lang_Object, private FieldAccess { +private: + // Static offsets of the object's instance fields. + // TODO These offsets need to be checked on VM startup. + static const off_t offset_definedPackages = MEMORY_ALIGN(sizeof(java_object_t), SIZEOF_VOID_P); + static const off_t offset_parent = MEMORY_ALIGN(offset_definedPackages + SIZEOF_VOID_P, SIZEOF_VOID_P); + +public: + java_lang_ClassLoader(java_handle_t* h) : java_lang_Object(h) {} + + // Getters. + java_handle_t* get_parent() const; + + // Invocation wrappers for static methods. + static java_handle_t* invoke_getSystemClassLoader(); +}; + +inline java_handle_t* java_lang_ClassLoader::get_parent() const +{ + return get(_handle, offset_parent); +} + + /** * GNU Classpath java/lang/StackTraceElement * @@ -704,47 +756,19 @@ inline void java_lang_String::set_offset(int32_t value) /** * GNU Classpath java/lang/Thread - * - * Object layout: - * - * 0. object header - * 1. java.lang.VMThread vmThread; - * 2. java.lang.ThreadGroup group; - * 3. java.lang.Runnable runnable; - * 4. java.lang.String name; - * 5. boolean daemon; - * 6. int priority; - * 7. long stacksize; - * 8. java.lang.Throwable stillborn; - * 9. java.lang.ClassLoader contextClassLoader; - * 10. boolean contextClassLoaderIsSystemClassLoader; - * 11. long threadId; - * 12. java.lang.Object parkBlocker; - * 13. gnu.java.util.WeakIdentityHashMap locals; - * 14. java_lang_Thread_UncaughtExceptionHandler exceptionHandler; */ class java_lang_Thread : public java_lang_Object, private FieldAccess { private: // Static offsets of the object's instance fields. - // TODO These offsets need to be checked on VM startup. - static const off_t offset_vmThread = MEMORY_ALIGN(sizeof(java_object_t), SIZEOF_VOID_P); - static const off_t offset_group = MEMORY_ALIGN(offset_vmThread + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_runnable = MEMORY_ALIGN(offset_group + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_name = MEMORY_ALIGN(offset_runnable + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_daemon = MEMORY_ALIGN(offset_name + SIZEOF_VOID_P, sizeof(int32_t)); - static const off_t offset_priority = MEMORY_ALIGN(offset_daemon + sizeof(int32_t), sizeof(int32_t)); - static const off_t offset_stacksize = MEMORY_ALIGN(offset_priority + sizeof(int32_t), sizeof(int64_t)); - static const off_t offset_stillborn = MEMORY_ALIGN(offset_stacksize + sizeof(int64_t), SIZEOF_VOID_P); - static const off_t offset_contextClassLoader = MEMORY_ALIGN(offset_stillborn + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_contextClassLoaderIsSystemClassLoader = MEMORY_ALIGN(offset_contextClassLoader + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_threadId = MEMORY_ALIGN(offset_contextClassLoaderIsSystemClassLoader + sizeof(int32_t), sizeof(int64_t)); - static const off_t offset_parkBlocker = MEMORY_ALIGN(offset_threadId + sizeof(int64_t), SIZEOF_VOID_P); - static const off_t offset_locals = MEMORY_ALIGN(offset_parkBlocker + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_exceptionHandler = MEMORY_ALIGN(offset_locals + SIZEOF_VOID_P, SIZEOF_VOID_P); + static off_t offset_vmThread; + static off_t offset_group; + static off_t offset_name; + static off_t offset_daemon; + static off_t offset_priority; + static off_t offset_exceptionHandler; public: java_lang_Thread(java_handle_t* h) : java_lang_Object(h) {} -// java_lang_Thread(threadobject* t); // Getters. java_handle_t* get_vmThread () const; @@ -756,13 +780,15 @@ public: // Setters. void set_group(java_handle_t* value); -}; - -// inline java_lang_Thread::java_lang_Thread(threadobject* t) : java_lang_Object(h) -// { -// java_lang_Thread(thread_get_object(t)); -// } + // Offset initializers + static void set_vmThread_offset(int32_t off) { offset_vmThread = off; } + static void set_group_offset(int32_t off) { offset_group = off; } + static void set_name_offset(int32_t off) { offset_name = off; } + static void set_daemon_offset(int32_t off) { offset_daemon = off; } + static void set_priority_offset(int32_t off) { offset_priority = off; } + static void set_exceptionHandler_offset(int32_t off) { offset_exceptionHandler = off; } +}; inline java_handle_t* java_lang_Thread::get_vmThread() const @@ -1715,7 +1741,7 @@ public: gnu_classpath_Pointer(java_handle_t* h) : java_lang_Object(h) {} gnu_classpath_Pointer(java_handle_t* h, void* data); - // Setters. + // Getters. void* get_data() const; // Setters. @@ -1788,6 +1814,39 @@ inline java_lang_AssertionStatusDirectives::java_lang_AssertionStatusDirectives( } +/** + * OpenJDK java/lang/ClassLoader + * + * Object layout: + * + * 0. object header + * 1. boolean initialized + * 2. java.lang.ClassLoader parent + * [other fields are not used] + */ +class java_lang_ClassLoader : public java_lang_Object, private FieldAccess { +private: + // Static offsets of the object's instance fields. + // TODO These offsets need to be checked on VM startup. + static const off_t offset_initialized = MEMORY_ALIGN(sizeof(java_object_t), sizeof(int32_t)); + static const off_t offset_parent = MEMORY_ALIGN(offset_initialized + sizeof(int32_t), SIZEOF_VOID_P); + +public: + java_lang_ClassLoader(java_handle_t* h) : java_lang_Object(h) {} + + // Getters. + java_handle_t* get_parent() const; + + // Invocation wrappers for static methods. + static java_handle_t* invoke_getSystemClassLoader(); +}; + +inline java_handle_t* java_lang_ClassLoader::get_parent() const +{ + return get(_handle, offset_parent); +} + + /** * OpenJDK java/lang/StackTraceElement * @@ -1902,65 +1961,18 @@ inline void java_lang_String::set_count(int32_t value) /** * OpenJDK java/lang/Thread - * - * Object layout: - * - * 0. object header - * 1. char[] name; - * 2. int priority; - * 3. java_lang_Thread threadQ; - * 4. long eetop; - * 5. boolean single_step; - * 6. boolean daemon; - * 7. boolean stillborn; - * 8. java_lang_Runnable target; - * 9. java_lang_ThreadGroup group; - * 10. java_lang_ClassLoader contextClassLoader; - * 11. java_security_AccessControlContext inheritedAccessControlContext; - * 12. java_lang_ThreadLocal_ThreadLocalMap threadLocals; - * 13. java_lang_ThreadLocal_ThreadLocalMap inheritableThreadLocals; - * 14. long stackSize; - * 15. long nativeParkEventPointer; - * 16. long tid; - * 17. int threadStatus; - * 18. java_lang_Object parkBlocker; - * 19. sun_nio_ch_Interruptible blocker; - * 20. java_lang_Object blockerLock; - * 21. boolean stopBeforeStart; - * 22. java_lang_Throwable throwableFromStop; - * 23. java.lang.Thread.UncaughtExceptionHandler uncaughtExceptionHandler; */ class java_lang_Thread : public java_lang_Object, private FieldAccess { private: - // Static offsets of the object's instance fields. - // TODO These offsets need to be checked on VM startup. - static const off_t offset_name = MEMORY_ALIGN(sizeof(java_object_t), SIZEOF_VOID_P); - static const off_t offset_priority = MEMORY_ALIGN(offset_name + SIZEOF_VOID_P, sizeof(int32_t)); - static const off_t offset_threadQ = MEMORY_ALIGN(offset_priority + sizeof(int32_t), SIZEOF_VOID_P); - static const off_t offset_eetop = MEMORY_ALIGN(offset_threadQ + SIZEOF_VOID_P, sizeof(int64_t)); - static const off_t offset_single_step = MEMORY_ALIGN(offset_eetop + sizeof(int64_t), sizeof(int32_t)); - static const off_t offset_daemon = MEMORY_ALIGN(offset_single_step + sizeof(int32_t), sizeof(int32_t)); - static const off_t offset_stillborn = MEMORY_ALIGN(offset_daemon + sizeof(int32_t), sizeof(int32_t)); - static const off_t offset_target = MEMORY_ALIGN(offset_stillborn + sizeof(int32_t), SIZEOF_VOID_P); - static const off_t offset_group = MEMORY_ALIGN(offset_target + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_contextClassLoader = MEMORY_ALIGN(offset_group + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_inheritedAccessControlContext = MEMORY_ALIGN(offset_contextClassLoader + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_threadLocals = MEMORY_ALIGN(offset_inheritedAccessControlContext + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_inheritableThreadLocals = MEMORY_ALIGN(offset_threadLocals + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_stackSize = MEMORY_ALIGN(offset_inheritableThreadLocals + SIZEOF_VOID_P, sizeof(int64_t)); - static const off_t offset_nativeParkEventPointer = MEMORY_ALIGN(offset_stackSize + sizeof(int64_t), sizeof(int64_t)); - static const off_t offset_tid = MEMORY_ALIGN(offset_nativeParkEventPointer + sizeof(int64_t), sizeof(int64_t)); - static const off_t offset_threadStatus = MEMORY_ALIGN(offset_tid + sizeof(int64_t), sizeof(int32_t)); - static const off_t offset_parkBlocker = MEMORY_ALIGN(offset_threadStatus + sizeof(int32_t), SIZEOF_VOID_P); - static const off_t offset_blocker = MEMORY_ALIGN(offset_parkBlocker + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_blockerLock = MEMORY_ALIGN(offset_blocker + SIZEOF_VOID_P, SIZEOF_VOID_P); - static const off_t offset_stopBeforeStart = MEMORY_ALIGN(offset_blockerLock + SIZEOF_VOID_P, sizeof(int32_t)); - static const off_t offset_throwableFromStop = MEMORY_ALIGN(offset_stopBeforeStart + sizeof(int32_t), SIZEOF_VOID_P); - static const off_t offset_uncaughtExceptionHandler = MEMORY_ALIGN(offset_throwableFromStop + SIZEOF_VOID_P, SIZEOF_VOID_P); + static off_t offset_priority; + static off_t offset_daemon; + static off_t offset_group; + static off_t offset_uncaughtExceptionHandler; + static off_t offset_threadStatus; + static off_t offset_me; public: java_lang_Thread(java_handle_t* h) : java_lang_Object(h) {} -// java_lang_Thread(threadobject* t); // Getters. int32_t get_priority () const; @@ -1972,6 +1984,15 @@ public: void set_priority (int32_t value); void set_group (java_handle_t* value); void set_threadStatus(int32_t value); + void set_me (java_handle_t* value); + + // Offset initializers + static void set_priority_offset(int32_t off) { offset_priority = off; } + static void set_daemon_offset(int32_t off) { offset_daemon = off; } + static void set_group_offset(int32_t off) { offset_group = off; } + static void set_uncaughtExceptionHandler_offset(int32_t off) { offset_uncaughtExceptionHandler = off; } + static void set_threadStatus_offset(int32_t off) { offset_threadStatus = off; } + static void set_me_offset(int32_t off) { offset_me = off; } }; @@ -2011,6 +2032,11 @@ inline void java_lang_Thread::set_threadStatus(int32_t value) set(_handle, offset_threadStatus, value); } +inline void java_lang_Thread::set_me(java_handle_t* value) +{ + set(_handle, offset_me, value); +} + /** @@ -2544,6 +2570,7 @@ public: // Getters. void* get_address() const; + int32_t get_capacity() const; }; @@ -2552,6 +2579,11 @@ inline void* java_nio_Buffer::get_address() const return get(_handle, offset_address); } +inline int32_t java_nio_Buffer::get_capacity() const +{ + return get(_handle, offset_capacity); +} + #endif // WITH_JAVA_RUNTIME_LIBRARY_OPENJDK @@ -2747,12 +2779,6 @@ public: }; -// inline java_lang_Thread::java_lang_Thread(threadobject* t) : java_lang_Object(h) -// { -// java_lang_Thread(thread_get_object(t)); -// } - - inline int32_t java_lang_Thread::get_priority() const { return get(_handle, offset_priority); @@ -2837,4 +2863,5 @@ inline void java_lang_Throwable::set_backtrace(java_handle_bytearray_t* value) * c-basic-offset: 4 * tab-width: 4 * End: + * vim:noexpandtab:sw=4:ts=4: */