Skip to content

R
riscv-gcc-1
Commit b247341e by Keith Seitz Committed by Keith Seitz
Options

natThread.cc (_Jv_ThreadGetData): New function. 

        * java/lang/natThread.cc (_Jv_ThreadGetData): New function.
        * Makefile.am (java/lang/Thread.h): Add friend function
        _Jv_ThreadGetData.
        * Makefile.in: Regenerate.

From-SVN: r115646
parent 3a2419a7
Showing with 20 additions and 0 deletions
libjava/ChangeLog
2006-07-21 Keith Seitz <keiths@redhat.com>
* java/lang/natThread.cc (_Jv_ThreadGetData): New function.
* Makefile.am (java/lang/Thread.h): Add friend function
_Jv_ThreadGetData.
* Makefile.in: Regenerate.
2006-07-20 Keith Seitz <keiths@redhat.com> 2006-07-20 Keith Seitz <keiths@redhat.com>
* jvmti.cc (_Jv_JVMTI_DisposeEnvironment): New function. * jvmti.cc (_Jv_JVMTI_DisposeEnvironment): New function.
......
libjava/Makefile.am
...@@ -380,6 +380,7 @@ java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class ...@@ -380,6 +380,7 @@ java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class
java/lang/Thread.h: classpath/lib/java/lang/Thread.class java/lang/Thread.h: classpath/lib/java/lang/Thread.class
$(GCJH) -classpath '' -bootclasspath classpath/lib \ $(GCJH) -classpath '' -bootclasspath classpath/lib \
-prepend 'class _Jv_JNIEnv;' \ -prepend 'class _Jv_JNIEnv;' \
-prepend 'class _Jv_Thread_t;' \
-prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \ -prepend '#define _JV_INTERRUPTED 2' \
-prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
...@@ -389,6 +390,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class ...@@ -389,6 +390,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ -prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ -prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'jint _Jv_DetachCurrentThread ();' \ -prepend 'jint _Jv_DetachCurrentThread ();' \
-prepend '_Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);' \
-friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \ -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \ -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
...@@ -396,6 +398,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class ...@@ -396,6 +398,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ -friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ -friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint (::_Jv_DetachCurrentThread) ();' \ -friend 'jint (::_Jv_DetachCurrentThread) ();' \
-friend '_Jv_Thread_t* ::_Jv_ThreadGetData (java::lang::Thread* thread);' \
java/lang/Thread java/lang/Thread
java/lang/String.h: classpath/lib/java/lang/String.class java/lang/String.h: classpath/lib/java/lang/String.class
......
libjava/Makefile.in
...@@ -11157,6 +11157,7 @@ java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class ...@@ -11157,6 +11157,7 @@ java/lang/ClassLoader.h: classpath/lib/java/lang/ClassLoader.class
java/lang/Thread.h: classpath/lib/java/lang/Thread.class java/lang/Thread.h: classpath/lib/java/lang/Thread.class
$(GCJH) -classpath '' -bootclasspath classpath/lib \ $(GCJH) -classpath '' -bootclasspath classpath/lib \
-prepend 'class _Jv_JNIEnv;' \ -prepend 'class _Jv_JNIEnv;' \
-prepend 'class _Jv_Thread_t;' \
-prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \ -prepend '#define _JV_INTERRUPTED 2' \
-prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ -prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
...@@ -11166,6 +11167,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class ...@@ -11166,6 +11167,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ -prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ -prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'jint _Jv_DetachCurrentThread ();' \ -prepend 'jint _Jv_DetachCurrentThread ();' \
-prepend '_Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);' \
-friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \ -friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ -friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \ -friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
...@@ -11173,6 +11175,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class ...@@ -11173,6 +11175,7 @@ java/lang/Thread.h: classpath/lib/java/lang/Thread.class
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \ -friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \ -friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint (::_Jv_DetachCurrentThread) ();' \ -friend 'jint (::_Jv_DetachCurrentThread) ();' \
-friend '_Jv_Thread_t* ::_Jv_ThreadGetData (java::lang::Thread* thread);' \
java/lang/Thread java/lang/Thread
java/lang/String.h: classpath/lib/java/lang/String.class java/lang/String.h: classpath/lib/java/lang/String.class
......
libjava/java/lang/natThread.cc
...@@ -318,6 +318,13 @@ _Jv_ThreadRun (java::lang::Thread* thread) ...@@ -318,6 +318,13 @@ _Jv_ThreadRun (java::lang::Thread* thread)
thread->finish_ (); thread->finish_ ();
} }
_Jv_Thread_t*
_Jv_ThreadGetData (java::lang::Thread* thread)
{
natThread* nt = (natThread*) thread->data;
return nt->thread;
}
void void
java::lang::Thread::start (void) java::lang::Thread::start (void)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment