* src/vm/jit/codegen-common.c (codegen_setup): Removed maxstack stuff.

* src/vm/jit/codegen-common.h (codegendata): Likewise.

* src/vm/jit/inline/inline.c: Fixed includes.
(inline_jit_compile): Removed maxstack stuff.
(inline_transform): Removed basicblockindex.

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 9497ca9eafc6eb942fb3cc04239e0ebfac7b8e76..abe950fefaf3db9165ca890efc2a07106a59de29 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -22,7 +22,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 ##
-## $Id: Makefile.am 7725 2007-04-16 21:09:39Z twisti $
+## $Id: Makefile.am 7727 2007-04-16 21:18:43Z michi $
 
 ## Process this file with automake to produce Makefile.in
 

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 2a9e7882a2b2fb7111b5e7844be760dcd719979d..6dc0be8fd8e9d7c0b1d3d867ebfce2bc2faa6b0e 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -39,7 +39,7 @@
    memory. All functions writing values into the data area return the offset
    relative the begin of the code area (start of procedure).   
 
-   $Id: codegen-common.c 7692 2007-04-12 14:47:24Z twisti $
+   $Id: codegen-common.c 7731 2007-04-16 22:24:30Z twisti $
 
 */
 
@@ -200,8 +200,6 @@ void codegen_setup(jitdata *jd)
        cd->linenumbertablestartpos = 0;
        cd->linenumbertab = 0;
        
-       cd->maxstack = m->maxstack;
-
 #if defined(ENABLE_THREADS)
        cd->threadcritcurrent.next = NULL;
        cd->threadcritcount = 0;

diff --git a/src/vm/jit/codegen-common.h b/src/vm/jit/codegen-common.h
index 6ade02195ee26d8349036a1d907f63017c91a4f5..d4d1e9b0609b72a5ea12889a1e98b15b966448b5 100644 (file)
--- a/src/vm/jit/codegen-common.h
+++ b/src/vm/jit/codegen-common.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen-common.h 7692 2007-04-12 14:47:24Z twisti $
+   $Id: codegen-common.h 7731 2007-04-16 22:24:30Z twisti $
 
 */
 
@@ -162,7 +162,6 @@ struct codegendata {
        codegen_critical_section_t threadcritcurrent;
        s4                 threadcritcount; /* Number of critical regions         */
 
-       s4              maxstack;
        s4              stackframesize;    /* stackframe size of this method      */
 
 #if defined(ENABLE_REPLACEMENT)

diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c
index 40cb9d49372c24ac50201ff7ecb40c8166b2638a..769222751cf7a81dc94a89f6dfdb77dc69597755 100644 (file)
--- a/src/vm/jit/inline/inline.c
+++ b/src/vm/jit/inline/inline.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/inline/inline.c - method inlining
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -22,50 +22,47 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Edwin Steiner
-
-   Changes:
-
-   $Id: inline.c 7486 2007-03-08 13:50:07Z twisti $
+   $Id: inline.c 7731 2007-04-16 22:24:30Z twisti $
 
 */
 
-#include "config.h"
 
-#include "vm/types.h"
+#include "config.h"
 
 #include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <limits.h>
+
+#include "vm/types.h"
 
 #include "mm/memory.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/threads.h"
+#endif
+
 #include "toolbox/logging.h"
+
 #include "vm/builtin.h"
 #include "vm/global.h"
-#include "vmcore/options.h"
-#include "vmcore/statistics.h"
-#include "vm/jit/jit.h"
-#include "vm/jit/parse.h"
-#include "vm/jit/inline/inline.h"
-#include "vm/jit/loop/loop.h"
-
-#include "vmcore/class.h"
 #include "vm/initialize.h"
-#include "vmcore/method.h"
-#include "vm/jit/jit.h"
-#include "vm/jit/show.h"
 
+#include "vm/jit/jit.h"
+#include "vm/jit/parse.h"
 #include "vm/jit/reg.h"
+#include "vm/jit/show.h"
 #include "vm/jit/stack.h"
 
+#include "vm/jit/inline/inline.h"
+#include "vm/jit/loop/loop.h"
+
 #include "vm/jit/verify/typecheck.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/threads.h"
-#endif
+#include "vmcore/class.h"
+#include "vmcore/method.h"
+#include "vmcore/options.h"
+#include "vmcore/statistics.h"
 
 
 /* algorithm tuning constants *************************************************/
@@ -364,7 +361,6 @@ static bool inline_jit_compile(inline_node *iln)
        /* XXX do a pseudo setup */
        jd->cd = DNEW(codegendata);
        MZERO(jd->cd, codegendata, 1);
-       jd->cd->maxstack = m->maxstack;
        jd->cd->method = m;
        /* XXX uses too much dump memory codegen_setup(jd); */
 
@@ -2025,7 +2021,7 @@ static bool inline_transform(inline_node *iln, jitdata *jd)
 #if defined(INLINE_VERIFY_RESULT)
        static int debug_verify_inlined_code = 1;
 #endif
-#if defined(ENABLE_INLINING_DEBUG)
+#if defined(ENABLE_INLINING_DEBUG) || !defined(NDEBUG)
        static int debug_counter = 0;
 #endif
 
@@ -2096,7 +2092,6 @@ static bool inline_transform(inline_node *iln, jitdata *jd)
        /* store created code in jitdata */
 
        n_jd->basicblocks = iln->inlined_basicblocks;
-       n_jd->basicblockindex = NULL;
        n_jd->instructioncount = iln->cumul_instructioncount;
        n_jd->instructions = iln->inlined_iinstr;
 

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index aa559cf62f379fb6348462c6dec8f5b3d1b99346..4eaa355de56c7894046cf9143fea7f19105bd93b 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7724 2007-04-16 21:07:10Z twisti $
+   $Id: codegen.c 7727 2007-04-16 21:18:43Z michi $
 
 */
 

diff --git a/src/vm/jit/powerpc64/linux/md-abi.c b/src/vm/jit/powerpc64/linux/md-abi.c
index 14765c6e71366a376067f84a9d03fddae317d9df..9c291ca4b9916d6415a70cef66a177f7d2dd3834 100644 (file)
--- a/src/vm/jit/powerpc64/linux/md-abi.c
+++ b/src/vm/jit/powerpc64/linux/md-abi.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 7724 2007-04-16 21:07:10Z twisti $
+   $Id: md-abi.c 7727 2007-04-16 21:18:43Z michi $
 
 */