PR156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21

[cacao.git] / src / vm / javaobjects.cpp

diff --git a/src/vm/javaobjects.cpp b/src/vm/javaobjects.cpp
index 4f63d89a5117b0828c9e7599acf699a83458eb50..0aa5af11f81de68d0da713a3ad6dc7b2e0dde43c 100644 (file)
--- a/src/vm/javaobjects.cpp
+++ b/src/vm/javaobjects.cpp
@@ -227,9 +227,47 @@ bool jobjects_run_dynoffsets_hook(classinfo *c)
        return true;
 }
 
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+
+off_t java_lang_Thread::offset_vmThread;
+off_t java_lang_Thread::offset_group;
+off_t java_lang_Thread::offset_name;
+off_t java_lang_Thread::offset_daemon;
+off_t java_lang_Thread::offset_priority;
+off_t java_lang_Thread::offset_exceptionHandler;
+
+static DynOffsetEntry dyn_entries_java_lang_Thread[] = {
+       { &java_lang_Thread::set_vmThread_offset,         "vmThread" },
+       { &java_lang_Thread::set_group_offset,            "group" },
+       { &java_lang_Thread::set_name_offset,             "name" },
+       { &java_lang_Thread::set_daemon_offset,           "daemon" },
+       { &java_lang_Thread::set_priority_offset,         "priority" },
+       { &java_lang_Thread::set_exceptionHandler_offset, "exceptionHandler" },
+       { 0, 0 }
+};
+
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
+
+off_t java_lang_Thread::offset_priority;
+off_t java_lang_Thread::offset_daemon;
+off_t java_lang_Thread::offset_group;
+off_t java_lang_Thread::offset_uncaughtExceptionHandler;
+off_t java_lang_Thread::offset_threadStatus;
+
+static DynOffsetEntry dyn_entries_java_lang_Thread[] = {
+       { &java_lang_Thread::set_priority_offset,                 "priority" },
+       { &java_lang_Thread::set_daemon_offset,                   "daemon" },
+       { &java_lang_Thread::set_group_offset,                    "group" },
+       { &java_lang_Thread::set_uncaughtExceptionHandler_offset, "uncaughtExceptionHandler" },
+       { &java_lang_Thread::set_threadStatus_offset,             "threadStatus" },
+       { 0, 0 }
+};
+
+#endif
 
 void jobjects_register_dyn_offsets()
 {
+       register_dyn_entry_table(class_java_lang_Thread, dyn_entries_java_lang_Thread);
 }
 
 #endif // ENABLE_JAVASE