You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by dl...@apache.org on 2005/10/28 10:30:48 UTC
svn commit: r329154 - in
/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src:
./ java/lang/
Author: dlydick
Date: Fri Oct 28 01:30:22 2005
New Revision: 329154
URL: http://svn.apache.org/viewcvs?rev=329154&view=rev
Log:
Added strings to support 'getsvndata.sh', etc.
Modified:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Class.java
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Object.java
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/String.java
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Thread.java
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Class.c
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Object.c
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_String.c
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Thread.c
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/sampleJNImain.c
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Class.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Class.java?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Class.java (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Class.java Fri Oct 28 01:30:22 2005
@@ -49,6 +49,8 @@
package java.lang;
+import org.apache.harmony.Copyright.*;
+
/*!
* @brief Java class definition of @c @b java.lang.Class, a
* class that describes the class features of any Java object.
@@ -61,6 +63,12 @@
*/
public class Class
{
+ /* Please see 'jvm/include/arch.h' for corresponding 'C' defns */
+ private static final String copyright =
+ "\0$URL$ " +
+ "$Id$ " +
+ org.apache.harmony.Copyright.copyrightText;
+
/*!
* @brief Native definition
* for @c @b java.lang.Class.registerNatives()
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Object.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Object.java?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Object.java (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Object.java Fri Oct 28 01:30:22 2005
@@ -47,6 +47,8 @@
package java.lang;
+import org.apache.harmony.Copyright.*;
+
/*!
* @brief Java class definition of @c @b java.lang.Object,
* the class that is the root of the object hierarchy.
@@ -59,6 +61,12 @@
*/
public class Object
{
+ /* Please see 'jvm/include/arch.h' for corresponding 'C' defns */
+ private static final String copyright =
+"\0$URL$ " +
+"$Id$ " +
+ org.apache.harmony.Copyright.copyrightText;
+
/*!
* @brief Native definition
* for @c @b java.lang.Object.registerNatives()
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/String.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/String.java?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/String.java (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/String.java Fri Oct 28 01:30:22 2005
@@ -47,6 +47,8 @@
package java.lang;
+import org.apache.harmony.Copyright.*;
+
/*!
* @brief Java class definition of @c @b java.lang.String,
* the Java pseudo-primative class for defining and manipulating
@@ -61,6 +63,12 @@
*/
public class String
{
+ /* Please see 'jvm/include/arch.h' for corresponding 'C' defns */
+ private static final String copyright =
+"\0$URL$ " +
+"$Id$ " +
+ org.apache.harmony.Copyright.copyrightText;
+
/*!
* @brief Native definition
* for @c @b java.lang.String.registerNatives()
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Thread.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Thread.java?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Thread.java (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java/lang/Thread.java Fri Oct 28 01:30:22 2005
@@ -47,6 +47,8 @@
package java.lang;
+import org.apache.harmony.Copyright.*;
+
/*!
* @brief Java class definition of @c @b java.lang.Thread,
* the JVM thread model implementation class.
@@ -60,6 +62,12 @@
*/
public class Thread
{
+ /* Please see 'jvm/include/arch.h' for corresponding 'C' defns */
+ private static final String copyright =
+"\0$URL$ " +
+"$Id$ " +
+ org.apache.harmony.Copyright.copyrightText;
+
/*!
* @brief Native definition
* for @c @b java.lang.Thread.registerNatives()
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Class.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Class.c?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Class.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Class.c Fri Oct 28 01:30:22 2005
@@ -51,6 +51,12 @@
*
*/
+#include "arch.h"
+ARCH_SOURCE_COPYRIGHT_APACHE(java_lang_Class, c,
+"$URL$",
+"$Id$");
+
+
#include <jni.h>
#include "java_lang_Class.h"
#include "jlClass.h"
@@ -69,6 +75,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Class_registerNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Class_registerNatives);
+
/* Contents to be determined */
}
@@ -87,6 +95,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Class_unregisterNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Class_unregisterNatives);
+
/* Contents to be determined */
}
@@ -105,6 +115,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Class_isArray(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Class_isArray);
+
return(jlClass_isArray(jo));
}
@@ -123,6 +135,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Class_isPrimitive(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Class_isPrimitive);
+
return(jlClass_isPrimative(jo));
}
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Object.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Object.c?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Object.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Object.c Fri Oct 28 01:30:22 2005
@@ -51,6 +51,12 @@
*
*/
+#include "arch.h"
+ARCH_SOURCE_COPYRIGHT_APACHE(java_lang_Object, c,
+"$URL$",
+"$Id$");
+
+
#include <jni.h>
#include "java_lang_Object.h"
#include "jlObject.h"
@@ -73,6 +79,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Object_registerNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_registerNatives);
+
/* Contents to be determined */
}
@@ -91,6 +99,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Object_unregisterNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_unregisterNatives);
+
/* Contents to be determined */
}
@@ -109,6 +119,8 @@
JNIEXPORT jobject JNICALL
Java_java_lang_Object_getClass(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_getClass);
+
return(jlObject_getClass(jo));
}
@@ -127,6 +139,8 @@
JNIEXPORT jint JNICALL
Java_java_lang_Object_hashCode(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_hashCode);
+
return(jlObject_hashCode(jo));
}
@@ -145,6 +159,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Object_wait(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_wait);
+
jlObject_wait4ever(jo);
return;
@@ -165,6 +181,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Object_wait__J(JNIEnv *env, jobject jo, jlong jl)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Object_wait__J);
+
jlObject_waittimed(jo, jl);
return;
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_String.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_String.c?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_String.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_String.c Fri Oct 28 01:30:22 2005
@@ -51,6 +51,12 @@
*
*/
+#include "arch.h"
+ARCH_SOURCE_COPYRIGHT_APACHE(java_lang_String, c,
+"$URL$",
+"$Id$");
+
+
#include <jni.h>
#include "java_lang_String.h"
#include "jlString.h"
@@ -73,13 +79,15 @@
JNIEXPORT void JNICALL
Java_java_lang_String_registerNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_String_registerNatives);
+
/* Contents to be determined */
}
/*!
* @brief Native implementation
- * of @c @b java.lang.String.registerNatives()
+ * of @c @b java.lang.String.unregisterNatives()
*
* @verbatim
Class: java_lang_String
@@ -91,6 +99,8 @@
JNIEXPORT void JNICALL
Java_java_lang_String_unregisterNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_String_unregisterNatives);
+
/* Contents to be determined */
}
@@ -109,6 +119,8 @@
JNIEXPORT jstring JNICALL
Java_java_lang_String_intern(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_String_intern);
+
return(jlString_intern(jo));
}
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Thread.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Thread.c?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Thread.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/java_lang_Thread.c Fri Oct 28 01:30:22 2005
@@ -51,6 +51,12 @@
*
*/
+#include "arch.h"
+ARCH_SOURCE_COPYRIGHT_APACHE(java_lang_Thread, c,
+"$URL$",
+"$Id$");
+
+
#include <jni.h>
#include "java_lang_Thread.h"
#include "jlThread.h"
@@ -73,6 +79,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_registerNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_registerNatives);
+
/* Contents to be determined */
}
@@ -91,6 +99,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_unregisterNatives(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_unregisterNatives);
+
/* Contents to be determined */
}
@@ -109,6 +119,8 @@
JNIEXPORT jobject JNICALL
Java_java_lang_Thread_currentThread(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_currentThread);
+
return(jlThread_currentThread(jc));
}
@@ -127,6 +139,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_yield(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_yield);
+
return(jlThread_yield(jc));
}
@@ -145,6 +159,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_interrupt(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_interrupt);
+
return(jlThread_interrupt(jo));
}
@@ -163,6 +179,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Thread_interrupted(JNIEnv *env, jclass jc)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_interrupted);
+
return(jlThread_interrupted(jc));
}
@@ -181,6 +199,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Thread_isInterrupted(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_isInterrupted);
+
return(jlThread_isInterrupted(jo));
}
@@ -199,6 +219,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_sleep__J(JNIEnv *env, jclass jc, jlong jl)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_sleep__J);
+
jlThread_sleep(jc, jl);
return;
@@ -222,6 +244,8 @@
jlong jl,
jint ji)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_sleep__JI);
+
jlThread_sleep_nanos(jc, jl, ji);
return;
@@ -242,6 +266,8 @@
JNIEXPORT void JNICALL Java_java_lang_Thread_join(JNIEnv *env,
jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_join);
+
jlThread_join4ever(jo);
return;
@@ -262,6 +288,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_join__J(JNIEnv *env, jobject jo, jlong jl)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_join__J);
+
jlThread_jointimed(jo, jl);
return;
@@ -285,6 +313,8 @@
jlong jl,
jint ji)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_join__JI);
+
jlThread_jointimed_nanos(jo, jl, ji);
return;
@@ -305,6 +335,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Thread_isAlive(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_isAlive);
+
return(jlThread_isAlive(jo));
}
@@ -323,6 +355,8 @@
JNIEXPORT void JNICALL Java_java_lang_Thread_start(JNIEnv *env,
jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_start);
+
jlThread_start(jo);
return;
@@ -347,6 +381,8 @@
JNIEXPORT jint JNICALL
Java_java_lang_Thread_countStackFrames(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_countStackFrames);
+
return(jlThread_countStackFrames(jo));
}
@@ -365,6 +401,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Thread_holdsLock(JNIEnv *env, jclass jc, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_holdsLock);
+
return(jlThread_holdsLock(jc, jo));
}
@@ -383,6 +421,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_setPriority(JNIEnv *env, jobject jo, jint ji)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_setPriority);
+
jlThread_setPriority(jo, ji);
return;
@@ -403,6 +443,8 @@
JNIEXPORT jint JNICALL
Java_java_lang_Thread_getPriority(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_getPriority);
+
return(jlThread_getPriority(jo));
}
@@ -421,6 +463,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_destroy(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_destroy);
+
jlThread_destroy(jo);
return;
@@ -441,6 +485,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_checkAccess(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_checkAccess);
+
jlThread_checkAccess(jo);
return;
@@ -463,6 +509,8 @@
jobject jo,
jboolean jb)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_setDaemon);
+
jlThread_setDaemon(jo, jb);
return;
@@ -483,6 +531,8 @@
JNIEXPORT jboolean JNICALL
Java_java_lang_Thread_isDaemon(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_isDaemon);
+
return(jlThread_isDaemon(jo));
}
@@ -505,6 +555,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_stop(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_stop);
+
return(jlThread_stop(jo));
}
@@ -527,6 +579,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_suspend(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_suspend);
+
return(jlThread_suspend(jo));
}
@@ -549,6 +603,8 @@
JNIEXPORT void JNICALL
Java_java_lang_Thread_resume(JNIEnv *env, jobject jo)
{
+ ARCH_FUNCTION_NAME(Java_java_lang_Thread_resume);
+
return(jlThread_resume(jo));
}
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/sampleJNImain.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/sampleJNImain.c?rev=329154&r1=329153&r2=329154&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/sampleJNImain.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/sampleJNImain.c Fri Oct 28 01:30:22 2005
@@ -55,6 +55,11 @@
*
*/
+#include "arch.h"
+ARCH_SOURCE_COPYRIGHT_APACHE(sampleJNImain, c,
+"$URL$",
+"$Id$");
+
#include <stdlib.h>
#include <jni.h>
@@ -73,6 +78,8 @@
int main(int argc, char **argv, char **envp)
{
+ ARCH_FUNCTION_NAME(sampleJNImain /* or simply: main */ );
+
JNIEnv *penv = &env;
/* Register natives for all appropriate classes */