X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fglobal.h;h=0664da6b368e3d85e62e8ec276049cdd0626a09a;hb=59dee6e40c57f79dcfdd77ec9fe48af4a8bcf2f6;hp=86f87c29b6e1f0409ee93a46c5a319704c0e9d23;hpb=ca23d654bd142ec328732687906266eb9a0f127b;p=cacao.git

diff --git a/src/vm/global.h b/src/vm/global.h
index 86f87c29b..0664da6b3 100644
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 2559 2005-06-06 15:01:54Z twisti $
+   $Id: global.h 3811 2005-11-28 16:23:40Z edwin $
 
 */
 
@@ -76,24 +76,17 @@ typedef struct java_objectheader java_objectheader;
 typedef struct java_objectarray java_objectarray;
 
 
-/* define some cacao paths ****************************************************/
+/* define some CACAO paths ****************************************************/
 
-#define CACAO_JRE_DIR               "/jre"
-#define CACAO_LIBRARY_PATH          "/jre/lib/"ARCH_DIR"/"
-#define CACAO_RT_JAR_PATH           "/jre/lib/rt.jar"
-#define CACAO_EXT_DIR               "/jre/lib/ext"
-
-#if defined(WITH_EXTERNAL_CLASSPATH)
-#define CACAO_VM_ZIP_PATH           "/jre/lib/vm.zip"
+#define CACAO_VM_ZIP_PATH           "/share/cacao/vm.zip"
 #define CLASSPATH_LIBRARY_PATH      "/lib/classpath"
-#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/glibj.zip"
-#endif
+#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/" GLIBJZ_STRING
 
 
 /*
- * CACAO_TYPECHECK activates typechecking (part of bytecode verification)
+ * ENABLE_VERIFIER activates bytecode verification and other checks
  */
-#define CACAO_TYPECHECK
+#define ENABLE_VERIFIER
 
 /*
  * TYPECHECK_STACK_COMPCAT activates full checking of computational
@@ -146,12 +139,21 @@ typedef struct java_objectarray java_objectarray;
 #define PRIMITIVETYPE_DUMMY2  9            /* not used! */
 #define PRIMITIVETYPE_VOID    TYPE_VOID
 
+/* some Java related defines **************************************************/
+
+#define JAVA_VERSION    "1.4.2"         /* this version is supported by CACAO */
+#define CLASS_VERSION   "49.0"
+
+
 /* Java class file constants **************************************************/
 
 #define MAGIC             0xCAFEBABE
-#define MAJOR_VERSION     48
+#define MAJOR_VERSION     49
 #define MINOR_VERSION     0
 
+
+/* Constant pool tags *********************************************************/
+
 #define CONSTANT_Class                 7
 #define CONSTANT_Fieldref              9
 #define CONSTANT_Methodref            10
@@ -167,6 +169,8 @@ typedef struct java_objectarray java_objectarray;
 #define CONSTANT_UNUSED                0
 
 
+/* Class/Field/Method access and property flags *******************************/
+
 #define ACC_UNDEF               -1      /* used internally                    */
 #define ACC_NONE                 0      /* used internally                    */
 
@@ -178,11 +182,16 @@ typedef struct java_objectarray java_objectarray;
 #define ACC_SUPER           0x0020
 #define ACC_SYNCHRONIZED    0x0020
 #define ACC_VOLATILE        0x0040
+#define ACC_BRIDGE          0x0040
 #define ACC_TRANSIENT       0x0080
+#define ACC_VARARGS         0x0080
 #define ACC_NATIVE          0x0100
 #define ACC_INTERFACE       0x0200
 #define ACC_ABSTRACT        0x0400
 #define ACC_STRICT          0x0800
+#define ACC_SYNTHETIC       0x1000
+#define ACC_ANNOTATION      0x2000
+#define ACC_ENUM            0x4000
 
 
 /* data structure for calls from c code to java methods */