* LSRA: Renamed to ENABLE_LSRA.

diff --git a/src/vm/jit/reg.inc b/src/vm/jit/reg.inc
index 930097455ee22d674a637fe5a0439c00dcdc5f0a..1d946b345e8e467fb48f97fcaa3204dcf4fdb4b5 100644 (file)
--- a/src/vm/jit/reg.inc
+++ b/src/vm/jit/reg.inc
@@ -31,7 +31,7 @@
                        Christian Ullrich
             Michael Starzinger
 
-   $Id: reg.inc 3617 2005-11-07 18:39:10Z twisti $
+   $Id: reg.inc 3969 2005-12-21 00:07:23Z twisti $
 
 */
 
@@ -1659,7 +1659,7 @@ void reg_make_statistics( methodinfo *m, codegendata *cd, registerdata *rd) {
                while (bptr != NULL) {
                        if (bptr->flags >= BBREACHED) {
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
                        if (!opt_lsra) {
 #endif 
                                /* check for memory moves from interface to BB instack */
@@ -1708,7 +1708,7 @@ void reg_make_statistics( methodinfo *m, codegendata *cd, registerdata *rd) {
 
                                        dst = dst->prev;
                                }
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
                        }
 #endif 
 

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 31519cc4c7162a52aa1b9eec80c6aee83d41c246..0fb2cac50f95f03fc52ac522afba6d5a0d172245 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -30,7 +30,7 @@
             Christian Thalinger
            Christian Ullrich
 
-   $Id: stack.c 3953 2005-12-20 22:14:01Z twisti $
+   $Id: stack.c 3969 2005-12-21 00:07:23Z twisti $
 
 */
 
@@ -138,7 +138,7 @@ methodinfo *analyse_stack(methodinfo *m, codegendata *cd, registerdata *rd)
        unresolved_method  *um;
        methoddesc         *md;
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
        m->maxlifetimes = 0;
 #endif
 
@@ -2528,7 +2528,7 @@ void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd)
        }
        printf("\n");
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
        if (!opt_lsra) {
 #endif
 #if defined(ENABLE_INTRP)
@@ -2594,7 +2594,7 @@ void show_icmd_method(methodinfo *m, codegendata *cd, registerdata *rd)
 #if defined(ENABLE_INTRP)
                }
 #endif
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
        }
 #endif
 

diff --git a/src/vm/jit/stack.h b/src/vm/jit/stack.h
index fbdb6244efc07e08b44163ea38d7c0720531cdb5..9533ba62817159f16015c419aa5ba717fa6877d9 100644 (file)
--- a/src/vm/jit/stack.h
+++ b/src/vm/jit/stack.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: stack.h 3736 2005-11-22 22:47:00Z christian $
+   $Id: stack.h 3969 2005-12-21 00:07:23Z twisti $
 
 */
 
@@ -36,8 +36,12 @@
 #ifndef _STACK_H
 #define _STACK_H
 
-#include "vm/global.h"
+#include "config.h"
+
+#include "vm/types.h"
+
 #include "vm/exceptions.h"
+#include "vm/global.h"
 #include "vm/jit/reg.h"
 
 
@@ -51,10 +55,10 @@
 #define COUNT(cnt)
 #endif
 
-#ifdef LSRA
-#define INC_LIFETIMES(a) { m->maxlifetimes += (a); }
+#if defined(ENABLE_LSRA)
+# define INC_LIFETIMES(a) { m->maxlifetimes += (a); }
 #else
-#define INC_LIFETIMES(a)
+# define INC_LIFETIMES(a)
 #endif
 
 /* convenient abbreviations */

diff --git a/src/vm/method.h b/src/vm/method.h
index eaa2af8c07e15188c67311bd595be69bdce7a271..c5a55a825c0351443caaf0f0b49245a96489c7d9 100644 (file)
--- a/src/vm/method.h
+++ b/src/vm/method.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: method.h 3743 2005-11-22 23:41:34Z twisti $
+   $Id: method.h 3969 2005-12-21 00:07:23Z twisti $
 */
 
 
@@ -118,9 +118,9 @@ struct methodinfo {                 /* method structure                       */
        s4              subRedefs;
        s4              subRedefsUsed;
        s4              nativelyoverloaded; /* used in header.c and only valid there  */
-       /* helper for lsra */
-#ifdef LSRA
-       s4          maxlifetimes;
+
+#if defined(ENABLE_LSRA)
+       s4          maxlifetimes;           /* helper for lsra                        */
 #endif
 };
 

diff --git a/src/vm/options.c b/src/vm/options.c
index 0fef11f6f03fe8b18f462615573dd396c6184b4a..f6a059f32849eaee927f409a2acba5889cda30d4 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.c 3944 2005-12-13 01:31:14Z twisti $
+   $Id: options.c 3969 2005-12-21 00:07:23Z twisti $
 
 */
 
@@ -110,7 +110,8 @@ int has_ext_instr_set = 0;     /* has instruction set extensions */
 bool opt_stat = false;
 bool opt_verify = true;        /* true if classfiles should be verified      */
 bool opt_eager = false;
-#ifdef LSRA
+
+#if defined(ENABLE_LSRA)
 bool opt_lsra = false;
 #endif
 

diff --git a/src/vm/options.h b/src/vm/options.h
index 9a7b4c59c0a3332c82cf6e59b602e653a7ee51fb..dae59d7b7e99380d486e2a05b6dd77914b4805b0 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.h 3944 2005-12-13 01:31:14Z twisti $
+   $Id: options.h 3969 2005-12-21 00:07:23Z twisti $
 
 */
 
@@ -127,7 +127,7 @@ extern bool opt_stat;
 extern bool opt_verify;
 extern bool opt_eager;
 
-#ifdef LSRA
+#if defined(ENABLE_LSRA)
 extern bool opt_lsra;
 #endif