X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Finline%2Finline.h;h=cdd41ee4daeeac32ee13b8396d09673fdbb5111b;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=7efa0696645825341f0eb39136eff0f12261d9bb;hpb=e9e5c44d57c7d68f7c7c202190889709fe8b65e7;p=cacao.git

diff --git a/src/vm/jit/inline/inline.h b/src/vm/jit/inline/inline.h
index 7efa06966..cdd41ee4d 100644
--- a/src/vm/jit/inline/inline.h
+++ b/src/vm/jit/inline/inline.h
@@ -1,9 +1,9 @@
-/* jit/inline.h - code inliner
+/* src/vm/jit/inline/inline.h - code inliner
 
-   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, 2006, 2007 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.
 
@@ -19,14 +19,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Dieter Thuernbeck
-
-   $Id: inline.h 1557 2004-11-22 12:01:16Z carolyn $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
@@ -34,130 +28,16 @@
 #ifndef _INLINE_H
 #define _INLINE_H
 
-#include "global.h"
-#include "toolbox/list.h"
-
-#define INLINING_MAXDEPTH       2  /*1*/ 
-#define INLINING_MAXCODESIZE    128 /*32*/
-#define INLINING_MAXMETHODS     32 /*8*/
-
-
-/*typedef struct {
-        listnode linkage;
-        instruction *iptr;
-        } t_patchlistnode;*/
-
-
-typedef struct {
-    listnode linkage;
-
-    methodinfo *method;
-    int startgp;
-    int stopgp;
-    int firstlocal;
-
-    bool *readonly;
-    int  *label_index;
-        
-    list *inlinedmethods;
-} inlining_methodinfo;
-
-
-typedef struct {
-    listnode linkage;
-        
-    /* saved static compiler variables */
-        
-    methodinfo *method;
-        
-    /* restored through method */
-
-    /* int jcodelength; */
-    /* u1 *jcode; */
-	/* classinfo *class; */
-
-    /* descriptor never used */
-    /* maxstack used outside of main for loop */
-    /* maxlocals never used */
-	
-    /* exceptiontablelength */
-    /* raw_extable used outside of main for loop */
-    /* mreturntype used outside of main for loop */
-    /* mparamcount used outside of main for loop */
-    /* mparamtypes used outside of main for loop */
-
-    /* local variables used in parse() */
-
-    int  i;                     /* temporary for different uses (counters)*/
-    int  p;                     /* java instruction counter               */
-    int  nextp;                 /* start of next java instruction         */
-    int  opcode;                /* java opcode                            */
-    u2 lineindex;
-    u2 currentline;
-    u2 linepcchange;
-    inlining_methodinfo *inlinfo;
-
-} t_inlining_stacknode;
-
-typedef struct t_inlining_globals {  /* try in parse.h with struct not include */
-        bool isinlinedmethod;
-        int cumjcodelength;   /* cumulative immediate intruction length */
-        int cummaxstack;
-        int cumextablelength;
-        int cumlocals;        /* was static */
-        int cummethods;       /* was static */
-        list *inlining_stack; /* was static */
-        inlining_methodinfo *inlining_rootinfo;
-        methodinfo *method;
-        classinfo *class;
-        int jcodelength;
-        u1 *jcode;
-	bool isleafmethod;
-} t_inlining_globals;
-
-
-/* function prototypes*/
-
-void inlining_setup(methodinfo *m, t_inlining_globals *inline_env);
-void inlining_cleanup(t_inlining_globals *inline_env);
-void inlining_push_compiler_variables(
-				      int i, int p, int nextp, int opcode, 
-				      u2 lineindex,u2 currentline,u2 linepcchange,
-                                      inlining_methodinfo* inlinfo,
-				      t_inlining_globals *inline_env);
-void inlining_pop_compiler_variables(
- 				    int *i, int *p, int *nextp, int *opcode,
-				    u2 *lineindex,u2 *currentline,u2 *linepcchange,
-                                    inlining_methodinfo **inlinfo,
-				    t_inlining_globals *inline_env);
-void inlining_set_compiler_variables_fun(methodinfo *m, 
-					 t_inlining_globals *inline_env);
-classinfo *first_occurence(classinfo* class, utf* name, utf* desc);
-bool is_unique_recOLD(classinfo *class, methodinfo *m, utf* name, utf* desc);
-bool is_unique_methodOLD(classinfo *class, methodinfo *m, utf* name, utf* desc);
-inlining_methodinfo *inlining_analyse_method(methodinfo *m, 
-					  int level, int gp,
-					  int firstlocal, int maxstackdepth,					      t_inlining_globals *inline_env);
-
-void print_t_inlining_globals (t_inlining_globals *g);
-void print_inlining_stack     ( list                *s);
-void print_inlining_methodinfo( inlining_methodinfo *r);
-
-#define inlining_save_compiler_variables() \
-    inlining_push_compiler_variables(i,p,nextp,opcode, lineindex,currentline, \
-	linepcchange,inlinfo,inline_env)
-
-#define inlining_restore_compiler_variables() \
-    inlining_pop_compiler_variables(&i, &p, &nextp, &opcode, \
-	&lineindex,&currentline,&linepcchange,&inlinfo, \
-	inline_env)
-
-#define inlining_set_compiler_variables(i) \
-    do { \
-        p = nextp = 0; \
-        inlining_set_compiler_variables_fun(i->method, inline_env); \
-        inlinfo = i; \
-    } while (0)
+#include "config.h"
+
+#include "vm/global.h"
+
+#include "vm/jit/jit.h"
+
+
+/* function prototypes ********************************************************/
+
+bool inline_inline(jitdata *jd);
 
 #endif /* _INLINE_H */
 
@@ -172,4 +52,5 @@ void print_inlining_methodinfo( inlining_methodinfo *r);
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */