* src/vm/jit/parse.h: Removed old code.

* src/vm/jit/parse.c (new_parse): Do not modify m->maxlocals and cd->maxlocals.
They refer to the number of javalocals, and that's ok. We have jd->localcount
to keep the number of internal locals.

--HG--
branch : unified_variables

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index 646897af6089216dfbc2a9159e421200782c43f4..6e52a16cb9c355954b2e6b5cc6edf41bb11b545b 100644 (file)
--- a/src/vm/jit/parse.c
+++ b/src/vm/jit/parse.c
@@ -31,7 +31,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: parse.c 5410 2006-09-07 14:38:51Z edwin $
+   $Id: parse.c 5418 2006-09-08 12:10:39Z edwin $
 
 */
 
@@ -1571,8 +1571,6 @@ invoke_method:
                jd->vartop = nlocals;
                jd->var = DMNEW(varinfo, jd->varcount);
                MZERO(jd->var, varinfo, jd->varcount);
-               m->maxlocals = nlocals;
-               cd->maxlocals = nlocals;
 
                /* set types of all Locals in jd->var */
                for(mapptr = local_map, i = 0; i < (cd->maxlocals * 5); i++, mapptr++)

diff --git a/src/vm/jit/parse.h b/src/vm/jit/parse.h
index 6f247a5a06578b3d70f74f39e5771f005cf91f24..b54af4dca39c093dc6ecef228d7ff6d10dc82343 100644 (file)
--- a/src/vm/jit/parse.h
+++ b/src/vm/jit/parse.h
@@ -28,7 +28,7 @@
 
    Changes: Edwin Steiner
 
-   $Id: parse.h 5404 2006-09-07 13:29:05Z christian $
+   $Id: parse.h 5418 2006-09-08 12:10:39Z edwin $
 
 */
 
@@ -207,7 +207,6 @@
     iptr->dst.insindex       = (iindex);                               \
     PINC
 
-#if defined(NEW_VAR)
 # define OP_LOCALINDEX(o,index)                                        \
        OP_PREPARE_ZEROFLAGS(o);                                           \
     iptr->s1.varindex      = (index);                                \
@@ -223,20 +222,6 @@
        do {                                                                                                                       \
                local_map[(index) * 5 + (type)] = 1;                                               \
        } while (0)
-#else 
-# define OP_LOCALINDEX(o,index)                                        \
-       OP_PREPARE_ZEROFLAGS(o);                                           \
-    iptr->s1.localindex      = (index);                                  \
-    PINC
-
-# define OP_LOCALINDEX_I(o,index,v)                                    \
-       OP_PREPARE_ZEROFLAGS(o);                                           \
-    iptr->s1.localindex      = (index);                                \
-    iptr->sx.val.i           = (v);                                    \
-    PINC
-#error 333
-# define LOCALTYPE_USED(index,type)
-#endif /* defined(NEW_VAR) */
 
 #define OP_LOAD_ONEWORD(o,index,type)                                                         \
     do {                                                               \
@@ -252,7 +237,6 @@
                LOCALTYPE_USED(index,type);                                                                        \
        } while (0)
 
-#if defined(NEW_VAR)
 # define OP_STORE_ONEWORD(o,index,type)                                                               \
     do {                                                               \
         INDEX_ONEWORD(index);                                          \
@@ -270,25 +254,6 @@
                LOCALTYPE_USED(index,type);                                                                        \
         PINC;                                                          \
     } while (0)
-#else
-# define OP_STORE_ONEWORD(o,index,type)                                                               \
-    do {                                                               \
-        INDEX_ONEWORD(index);                                          \
-        OP_PREPARE_ZEROFLAGS(o);                                       \
-        iptr->dst.localindex = (index);                                \
-               LOCALTYPE_USED(index,type);                                                                        \
-        PINC;                                                          \
-    } while (0)
-
-# define OP_STORE_TWOWORD(o,index,type)                                                               \
-    do {                                                               \
-        INDEX_TWOWORD(index);                                          \
-        OP_PREPARE_ZEROFLAGS(o);                                       \
-        iptr->dst.localindex = (index);                                \
-               LOCALTYPE_USED(index,type);                                                                        \
-        PINC;                                                          \
-    } while (0)
-#endif /*  defined(NEW_VAR) */
 
 #define OP_BUILTIN_CHECK_EXCEPTION(bte)                                \
     jd->isleafmethod         = false;                                  \