[llvm-commits] CVS: llvm-java/runtime/runtime.c Makefile

[Alkis Evlogimenos]

Changes in directory llvm-java/runtime:

runtime.c updated: 1.9 -> 1.10
Makefile updated: 1.3 -> 1.4
---
Log message:

Add the JNI interface stub.


---
Diffs of the changes:  (+241 -16)

Index: llvm-java/runtime/runtime.c
diff -u llvm-java/runtime/runtime.c:1.9 llvm-java/runtime/runtime.c:1.10
--- llvm-java/runtime/runtime.c:1.9	Mon Oct 18 00:48:02 2004
+++ llvm-java/runtime/runtime.c	Wed Nov 24 02:59:19 2004
@@ -10,22 +10,7 @@
 typedef unsigned jfieldID;
 typedef unsigned jmethodID;
 #define _JNI_VM_INTERNAL_TYPES_DEFINED
-
-/* Define some types*/
-/* FIXME: this should really be picked up from jni_md.h */
-typedef unsigned char jboolean;
-typedef signed char jbyte;
-typedef unsigned short jchar;
-typedef short jshort;
-typedef int jint;
-typedef long long jlong;
-typedef float jfloat;
-typedef double jdouble;
-
-/* Used for jboolean type  */
-/* FIXME: this should really be picked up from jni.h */
-#define JNI_TRUE  1
-#define JNI_FALSE 0
+#include <jni.h>
 
 struct llvm_java_object_header {
   /* gc info, hash info, locking */
@@ -90,6 +75,243 @@
   abort();
 }
 
+
+/* The JNI interface definition */
+const struct JNINativeInterface llvm_java_JNIEnv = {
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+};
+
 extern void llvm_java_static_init(void);
 extern void llvm_java_main(int, char**);
 


Index: llvm-java/runtime/Makefile
diff -u llvm-java/runtime/Makefile:1.3 llvm-java/runtime/Makefile:1.4
--- llvm-java/runtime/Makefile:1.3	Mon Sep 13 14:54:11 2004
+++ llvm-java/runtime/Makefile	Wed Nov 24 02:59:19 2004
@@ -7,6 +7,9 @@
 #
 ##===----------------------------------------------------------------------===##
 LEVEL := ..
+# FIXME: This needs to be handled by the configure script or alternatively
+# import jni.h in the java-fe.
+CPPFLAGS+=-I$(HOME)/projects/college/classpath-0.12/include
 BYTECODE_LIBRARY=1
 LIBRARYNAME=jrt