Philipp Tomsich
Edwin Steiner
- $Id: global.h 991 2004-03-29 11:22:34Z stefan $
+ $Id: global.h 1326 2004-07-21 13:22:33Z twisti $
*/
#ifndef _GLOBAL_H
#define _GLOBAL_H
-#define _GNU_SOURCE
#include "config.h"
#include "types.h"
#include "toolbox/list.h"
+
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
#include <pthread.h>
#endif
* categories for stack manipulations (POP,POP2,SWAP,DUP,DUP2,DUP_X1,
* DUP2_X1,DUP_X2,DUP2_X2).
*/
-/* #define TYPECHECK_STACK_COMPCAT */
+#define TYPECHECK_STACK_COMPCAT
/*
* Macros for configuration of the typechecking code
#define true 1
#define false 0
+typedef void (*functionptr) (); /* generic function pointer */
+
/* immediate data union */
#define PRIMITIVETYPE_BOOLEAN 7
#define PRIMITIVETYPE_VOID 8
-typedef void (*functionptr) (); /* generic function pointer */
-
#define MAX_ALIGN 8 /* most generic alignment for JavaVM values */
-/* shutdown function **********************************************************/
-
-void cacao_shutdown(s4 status);
-
/* basic data types ***********************************************************/
/* Java class file constants **************************************************/
#define MAGIC 0xcafebabe
-#define MINOR_VERSION 3
-#define MAJOR_VERSION 45
+#define MINOR_VERSION 0
+#define MAJOR_VERSION 48
#define CONSTANT_Class 7
#define CONSTANT_Fieldref 9
typedef struct literalstring literalstring;
typedef struct java_objectheader java_objectheader;
typedef struct classinfo classinfo;
-typedef struct vftbl vftbl;
+typedef struct _vftbl vftbl_t;
typedef u1* methodptr;
typedef struct fieldinfo fieldinfo;
+typedef struct exceptiontable exceptiontable;
typedef struct methodinfo methodinfo;
typedef struct lineinfo lineinfo;
typedef struct arraydescriptor arraydescriptor;
/* data structure for storing information needed for a stacktrace across native functions*/
struct native_stackframeinfo {
+ void *oldThreadspecificHeadValue;
+ void **addressOfThreadspecificHead;
+ methodinfo *method;
+ void *returnToFromNative;
+
+#if 0
void *returnFromNative;
void *addrReturnFromNative;
methodinfo *method;
struct native_stackframeinfo *next;
struct native_stackframeinfo *prev;
+#endif
};
typedef struct native_stackframeinfo native_stackframeinfo;
/* data structure for calls from c code to java methods */
struct jni_callblock {
- u1 itemtype;
+ u8 itemtype;
u8 item;
};
*/
struct java_objectheader { /* header for all objects */
- vftbl *vftbl; /* pointer to virtual function table */
+ vftbl_t *vftbl; /* pointer to virtual function table */
#if defined(USE_THREADS) && defined(NATIVE_THREADS)
long monitorBits;
#endif
char *name; /* name of primitive class */
char *arrayname; /* name of primitive array class */
classinfo *arrayclass; /* primitive array class */
- vftbl *arrayvftbl; /* vftbl of primitive array class */
+ vftbl_t *arrayvftbl; /* vftbl of primitive array class */
} primitivetypeinfo;
/* field, method and class structures *****************************************/
-#include "sets.h"
+#include "jit/sets.h"
typedef struct xtafldinfo {
bool fieldChecked;
classinfo *fldClassType;
xtafldinfo *xta;
};
-struct basicblock;
-
/* exceptiontable *************************************************************/
-typedef struct xtable { /* exceptiontable entry in a method */
+struct exceptiontable { /* exceptiontable entry in a method */
s4 startpc; /* start pc of guarded area (inclusive) */
struct basicblock *start;
struct basicblock *handler;
classinfo *catchtype; /* catchtype of exception (NULL == catchall) */
- struct xtable *next; /* used to build a list of exception when */
+ exceptiontable *next; /* used to build a list of exception when */
/* loops are copied */
- struct xtable *down; /* instead of the old array, a list is used */
-} xtable;
-
-
-typedef struct exceptiontable { /* exceptiontable entry in a method */
- s4 startpc; /* start pc of guarded area (inclusive) */
- s4 endpc; /* end pc of guarded area (exklusive) */
- s4 handlerpc; /* pc of exception handler */
- classinfo *catchtype; /* catchtype of exception (NULL == catchall) */
-} exceptiontable;
+ exceptiontable *down; /* instead of the old array, a list is used */
+};
/* methodinfo static info ****************************************************/
+
typedef struct xtainfo {
s4 XTAmethodUsed; /* XTA if used in callgraph - not used /used */
classSet *XTAclassSet; /* method class type set */
/* lineinfo *****************************************************************/
+
struct lineinfo {
u2 start_pc;
u2 line_number;
};
+
/* methodinfo *****************************************************************/
struct methodinfo { /* method structure */
+ java_objectheader header; /* we need this in jit's monitorenter */
s4 flags; /* ACC flags */
utf *name; /* name of method */
utf *descriptor; /* JavaVM descriptor string of method */
s4 paramcount; /* only temporary valid, parameter count */
u1 *paramtypes; /* only temporary valid, parameter types */
classinfo **paramclass; /* pointer to classinfo for a parameter */ /*XTA*/
-
+
+ bool isleafmethod; /* does method call subroutines */
+
classinfo *class; /* class, the method belongs to */
s4 vftblindex; /* index of method in virtual function table
(if it is a virtual method) */
s4 jcodelength; /* length of JavaVM code */
u1 *jcode; /* pointer to JavaVM code */
+ s4 basicblockcount; /* number of basic blocks */
+ struct basicblock *basicblocks; /* points to basic block array */
+ s4 *basicblockindex; /* a table which contains for every byte */
+ /* of JavaVM code a basic block index if */
+ /* at this byte is the start of a basic */
+ /* block */
+
+ s4 instructioncount; /* number of JavaVM instructions */
+ struct instruction *instructions; /* points to intermediate code instructions */
+
+ s4 stackcount; /* number of stack elements */
+ struct stackelement *stack; /* points to intermediate code instructions */
+
s4 exceptiontablelength;/* exceptiontable length */
exceptiontable *exceptiontable; /* the exceptiontable */
- u2 thrownexceptionscount; /*number of exceptions declared to be thrown by a method*/
- classinfo **thrownexceptions; /*array of classinfos of declared exceptions*/
+ u2 thrownexceptionscount;/*number of exceptions declared to be thrown by a method*/
+ classinfo **thrownexceptions; /*array of classinfos of declared exceptions*/
+
+ u2 linenumbercount; /* number of linenumber attributes */
+ lineinfo *linenumbers; /* array of lineinfo items */
- u2 linenumbercount; /*number of linenumber attributes*/
- lineinfo *linenumbers; /*array of lineinfo items (start_pc,line_number)*/
+ struct registerdata *registerdata; /* struct with all regalloc stuff */
- u1 *stubroutine; /* stub for compiling or calling natives */
+ struct codegendata *codegendata;/* struct with codegen stuff */
+
+ u1 *stubroutine; /* stub for compiling or calling natives */
s4 mcodelength; /* legth of generated machine code */
u1 *mcode; /* pointer to machine code */
u1 *entrypoint; /* entry point in machine code */
/* should # method def'd and used be kept after static parse (will it be used?) */
s4 subRedefs;
s4 subRedefsUsed;
+ s4 nativelyoverloaded; /*used in header.c and only valid there*/
};
struct java_lang_VMClass* vmClass;
struct java_lang_reflect_Constructor* constructor;
-
- s4 initializing_thread; /* gnu classpath */
- s4 erroneous_state; /* gnu classpath */
- struct gnu_classpath_RawData* vmData; /* gnu classpath */
+ s4 initializing_thread; /* gnu classpath */
+ s4 erroneous_state; /* gnu classpath */
+ struct gnu_classpath_RawData* vmData; /* gnu classpath */
s4 flags; /* ACC flags */
utf *name; /* class name */
listnode listnode; /* linkage */
- bool initialized; /* true, if class already initialised */
+ bool initialized; /* true, if class already initialised */
+ bool initializing; /* flag for the compiler */
bool loaded; /* true, if class already loaded */
bool linked; /* true, if class already linked */
s4 index; /* hierarchy depth (classes) or index
- (interfaces) */
+ (interfaces) */
s4 instancesize; /* size of an instance of this class */
#ifdef SIZE_FROM_CLASSINFO
s4 alignedsize; /* size of an instance, aligned to the
allocation size on the heap */
#endif
- vftbl *vftbl; /* pointer to virtual function table */
+ vftbl_t *vftbl; /* pointer to virtual function table */
methodinfo *finalizer; /* finalizer method */
*******************************************************************************/
-struct vftbl {
+struct _vftbl {
methodptr *interfacetable[1]; /* interface table (access via macro) */
classinfo *class; /* class, the vtbl belongs to */
*******************************************************************************/
struct arraydescriptor {
- vftbl *componentvftbl; /* vftbl of the component type, NULL for primit. */
- vftbl *elementvftbl; /* vftbl of the element type, NULL for primitive */
+ vftbl_t *componentvftbl; /* vftbl of the component type, NULL for primit. */
+ vftbl_t *elementvftbl; /* vftbl of the element type, NULL for primitive */
short arraytype; /* ARRAYTYPE_* constant */
short dimension; /* dimension of the array (always >= 1) */
s4 dataoffset; /* offset of the array data from object pointer */
};
-/* references to some system classes ******************************************/
-
-extern classinfo *class_java_lang_Object;
-extern classinfo *class_java_lang_String;
-extern classinfo *class_java_lang_Throwable;
-extern classinfo *class_java_lang_Cloneable;
-extern classinfo *class_java_io_Serializable;
-extern classinfo *class_java_lang_ClassCastException;
-extern classinfo *class_java_lang_NullPointerException;
-extern classinfo *class_java_lang_ArrayIndexOutOfBoundsException;
-extern classinfo *class_java_lang_NegativeArraySizeException;
-extern classinfo *class_java_lang_OutOfMemoryError;
-extern classinfo *class_java_lang_ArithmeticException;
-extern classinfo *class_java_lang_ArrayStoreException;
-extern classinfo *class_java_lang_ThreadDeath;
-
-/* pseudo classes for the type checker ****************************************/
-
-/*
- * pseudo_class_Arraystub
- * (extends Object implements Cloneable, java.io.Serializable)
- *
- * If two arrays of incompatible component types are merged,
- * the resulting reference has no accessible components.
- * The result does, however, implement the interfaces Cloneable
- * and java.io.Serializable. This pseudo class is used internally
- * to represent such results. (They are *not* considered arrays!)
- *
- * pseudo_class_Null
- *
- * This pseudo class is used internally to represent the
- * null type.
- *
- * pseudo_class_New
- *
- * This pseudo class is used internally to represent the
- * the 'uninitialized object' type.
- */
-
-extern classinfo *pseudo_class_Arraystub;
-extern classinfo *pseudo_class_Null;
-extern classinfo *pseudo_class_New;
-extern vftbl *pseudo_class_Arraystub_vftbl;
-
-extern utf *array_packagename;
-
-
-/* instances of some system classes *******************************************/
-
-extern java_objectheader *proto_java_lang_ClassCastException;
-extern java_objectheader *proto_java_lang_NullPointerException;
-extern java_objectheader *proto_java_lang_ArrayIndexOutOfBoundsException;
-extern java_objectheader *proto_java_lang_NegativeArraySizeException;
-extern java_objectheader *proto_java_lang_OutOfMemoryError;
-extern java_objectheader *proto_java_lang_ArithmeticException;
-extern java_objectheader *proto_java_lang_ArrayStoreException;
-extern java_objectheader *proto_java_lang_ThreadDeath;
-
-
/* flag variables *************************************************************/
-extern bool compileall;
-extern bool runverbose;
-extern bool verboseexception;
-extern bool verbose;
-extern bool opt_rt; /* Rapid Type Analysis for better inlining CO-RT*/
-extern bool opt_xta; /* X Type Analysis for better inlining CO-XTA*/
-extern bool opt_vta; /* Variable Type Analysis for better inlining CO-VTA*/
-extern bool opt_verify; /* true if classfiles should be verified */
+extern bool cacao_initializing;
+
#ifdef TYPECHECK_VERBOSE_OPT
extern bool typecheckverbose;
#endif
/*extern void RT_jit_parse(methodinfo *m);*/
-/* statistic variables ********************************************************/
-
-extern int count_class_infos;
-extern int count_const_pool_len;
-extern int count_vftbl_len;
-extern int count_utf_len;
-extern int count_all_methods;
-extern int count_vmcode_len;
-extern int count_extable_len;
-extern int count_class_loads;
-extern int count_class_inits;
-extern int count_utf_new;
-extern int count_utf_new_found;
-
-
/* table of primitive types ***************************************************/
/* This array can be indexed by the PRIMITIVETYPE_ and ARRAYTYPE_
projects / cacao.git / blobdiff