* src/vm/builtin.c (builtin_canstore): Throw an ArrayStoreException.

[cacao.git] / src / vm / jit / parse.h

diff --git a/src/vm/jit/parse.h b/src/vm/jit/parse.h
index 6e650317b82cd4eac1ae9d458703d188243f83dd..4b791301bf56f75c77820af0c93ee2f6788bf7b4 100644 (file)
--- a/src/vm/jit/parse.h
+++ b/src/vm/jit/parse.h
@@ -27,8 +27,6 @@
    Author:  Christian Thalinger
             Edwin Steiner
 
-   $Id: parse.h 7619 2007-03-30 11:41:27Z twisti $
-
 */
 
 
@@ -90,17 +88,14 @@
 
 /* basic block generating macro ***********************************************/
 
-#define MARK_BASICBLOCK(i)                                           \
+#define MARK_BASICBLOCK(pd, i)                                       \
     do {                                                             \
-        if (!(jd->basicblockindex[(i)] & 1)) {                   \
-            b_count++;                                               \
-            jd->basicblockindex[(i)] |= 1;                       \
-        }                                                            \
+        (pd)->basicblockstart[(i)] = 1;                              \
     } while (0)
 
 #define INSTRUCTIONS_CHECK(i)                                        \
-    if ((icount + (i)) > pd.instructionslength)                      \
-        iptr = parse_realloc_instructions(&pd, icount, (i))
+    if ((ircount + (i)) > pd.instructionslength)                     \
+        iptr = parse_realloc_instructions(&pd, ircount, (i))
 
 
 /* intermediate code generating macros ****************************************/
@@ -120,12 +115,12 @@
 /* afterwards.                                                                */
 
 #define PINC                                                         \
-    iptr++; icount++
+    iptr++; ircount++
 
 #define OP_PREPARE_FLAGS(o, f)                                       \
-    iptr->opc                = (o);                                  \
-    iptr->line               = currentline;                          \
-    iptr->flags.bits         = (f) | (icount << INS_FLAG_ID_SHIFT);
+    iptr->opc         = (o);                                         \
+    iptr->line        = currentline;                                 \
+    iptr->flags.bits |= (f) | (ircount << INS_FLAG_ID_SHIFT);
 
 #define OP_PREPARE_ZEROFLAGS(o)                                      \
     OP_PREPARE_FLAGS(o, 0)
@@ -279,12 +274,6 @@
     iptr->sx.s23.s3.fmiref   = (fmiref);
 
 
-/* external macros ************************************************************/
-
-#define BLOCK_OF(index)                                              \
-    (jd->basicblocks + jd->basicblockindex[index])
-
-
 /* function prototypes ********************************************************/
 
 bool parse(jitdata *jd);