- created jitcache-arm-x86 branch

[cacao.git] / src / vmcore / class.h

diff --git a/src/vmcore/class.h b/src/vmcore/class.h
index 2bd79593c9cd54f28e7f8f78a43b671fedbf45d2..4b8be1be518b80facab19da89b63c5eda1bda154 100644 (file)
--- a/src/vmcore/class.h
+++ b/src/vmcore/class.h
@@ -56,7 +56,6 @@ typedef struct castinfo       castinfo;
 #include "vmcore/references.h"
 #include "vmcore/utf8.h"
 
-
 /* class state defines ********************************************************/
 
 #define CLASS_LOADING         0x0001
@@ -83,11 +82,11 @@ typedef struct castinfo       castinfo;
 
 typedef struct {
        java_object_t      header;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
        intptr_t           padding[4];
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
        intptr_t           padding[19];
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
        intptr_t           padding[3];
 #else
 # error unknown classpath configuration
@@ -161,11 +160,14 @@ struct classinfo {                /* class structure                          */
        classloader_t *classloader;       /* NULL for bootstrap classloader         */
 
 #if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
        java_object_t      *protectiondomain;
        java_objectarray_t *signers;
 # endif
 #endif
+#if defined(ENABLE_JITCACHE)
+       int         cache_file_fd;
+#endif
 };
 
 
@@ -224,13 +226,13 @@ extern classinfo *class_java_lang_Exception;
 extern classinfo *class_java_lang_ClassNotFoundException;
 extern classinfo *class_java_lang_RuntimeException;
 
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 extern classinfo *class_java_lang_VMSystem;
 extern classinfo *class_java_lang_VMThread;
 extern classinfo *class_java_lang_VMThrowable;
 #endif
 
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 extern classinfo *class_sun_reflect_MagicAccessorImpl;
 #endif
 
@@ -258,7 +260,7 @@ extern classinfo *class_java_security_PrivilegedAction;
 extern classinfo *class_java_util_Vector;
 extern classinfo *class_java_util_HashMap;
 
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 extern classinfo *class_java_lang_reflect_VMConstructor;
 extern classinfo *class_java_lang_reflect_VMField;
 extern classinfo *class_java_lang_reflect_VMMethod;
@@ -268,7 +270,7 @@ extern classinfo *arrayclass_java_lang_Object;
 
 # if defined(ENABLE_ANNOTATIONS)
 extern classinfo *class_sun_reflect_ConstantPool;
-#  if defined(WITH_CLASSPATH_GNU)
+#  if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 extern classinfo *class_sun_reflect_annotation_AnnotationParser;
 #  endif
 # endif
@@ -463,7 +465,7 @@ void       class_set_packagename(classinfo *c);
 bool       class_load_attributes(classbuffer *cb);
 
 /* retrieve constantpool element */
-voidptr class_getconstant(classinfo *class, u4 pos, u4 ctype);
+voidptr class_getconstant(classinfo *c, u4 pos, u4 ctype);
 voidptr innerclass_getconstant(classinfo *c, u4 pos, u4 ctype);
 
 /* frees all resources used by the class */