X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fglobal.h;h=eb2f080f021a7a2e40a58ebedd46e9c9dc26c1d6;hb=d75b6037acf17c342166b9c9bd6e657dfdd12cd9;hp=8f5f2c63b99bd23e6428be21cdf933d3fc481b45;hpb=bc21650c967b161e3a86e67baae5b63ee7b30189;p=cacao.git

diff --git a/src/vm/global.h b/src/vm/global.h
index 8f5f2c63b..eb2f080f0 100644
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -1,9 +1,9 @@
 /* global.h - global definitions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -30,8 +30,9 @@
    Changes: Mark Probst
             Philipp Tomsich
 			Edwin Steiner
+            Joseph Wenninger
 
-   $Id: global.h 1680 2004-12-04 12:02:08Z jowenn $
+   $Id: global.h 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -82,7 +83,8 @@ typedef int   bool;                     /* boolean data type                  */
 
 /* define path to rt.jar plus ending : ****************************************/
 
-#define RT_JAR_PATH    "/jre/lib/rt.jar:"
+#define CACAO_LIBRARY_PATH    "/jre/lib/"ARCH_DIR"/"
+#define CACAO_RT_JAR_PATH     "/jre/lib/rt.jar:"
 
 
 #define STATISTICS          /* if enabled collects program statistics         */
@@ -299,10 +301,16 @@ struct literalstring {
 
 
 /* data structure for storing information needed for a stacktrace across native functions*/
+
+typedef struct native_stackframeinfo native_stackframeinfo;
+
 struct native_stackframeinfo {
 	void *oldThreadspecificHeadValue;
 	void **addressOfThreadspecificHead;
 	methodinfo *method;
+#ifdef __ALPHA__
+	void *savedpv;
+#endif
 	void *beginOfJavaStackframe; /*only used if != 0*/
 	void *returnToFromNative;
 
@@ -315,7 +323,8 @@ struct native_stackframeinfo {
 #endif
 };
 
-typedef struct native_stackframeinfo native_stackframeinfo;
+
+typedef struct stacktraceelement stacktraceelement;
 
 struct stacktraceelement {
 #if POINTERSIZE == 8
@@ -326,14 +335,15 @@ struct stacktraceelement {
 	methodinfo *method;
 };
 
-typedef struct stacktraceelement stacktraceelement;
 
-typedef struct stackTraceBuffer {
-        int needsFree;
-        struct stacktraceelement* start;
-        size_t size;
-        size_t full;
-} stackTraceBuffer;
+typedef struct stackTraceBuffer stackTraceBuffer;
+
+struct stackTraceBuffer {
+	s4                 needsFree;
+	stacktraceelement *start;
+	s4                 size;
+	s4                 full;
+};