* src/vm/jit/alpha/patcher.c (patcher_wrapper): Added return address
[cacao.git] / src / vm / jit / jit.c
index 4ca845697a613cdf916a0c599acf3da749e9c7b4..f73600b206d26e02add8f63d1bbbb87bf69e5a70 100644 (file)
             Christian Thalinger
             Christian Ullrich
 
-   $Id: jit.c 4595 2006-03-14 20:51:12Z edwin $
+   $Id: jit.c 5099 2006-07-10 14:20:38Z twisti $
 
 */
 
 
 #include "config.h"
-
 #include "vm/types.h"
 
+#include <assert.h>
+
 #include "mm/memory.h"
 #include "native/native.h"
 #include "toolbox/logging.h"
 #include "vm/jit/disass.h"
 #include "vm/jit/dseg.h"
 #include "vm/jit/jit.h"
+#include "vm/jit/show.h"
 
 
 #include "vm/jit/parse.h"
 #include "vm/jit/reg.h"
 #include "vm/jit/stack.h"
+
 #include "vm/jit/allocator/simplereg.h"
 #if defined(ENABLE_LSRA)
 # include "vm/jit/allocator/lsra.h"
 #endif
 
+#if defined(ENABLE_IFCONV)
+# include "vm/jit/ifconv/ifconv.h"
+#endif
+
 #include "vm/jit/loop/analyze.h"
 #include "vm/jit/loop/graph.h"
 #include "vm/jit/loop/loop.h"
 #include "vm/jit/verify/typecheck.h"
+#include "vm/rt-timing.h"
 
-#if defined(USE_THREADS)
-# if defined(NATIVE_THREADS)
-#  include "threads/native/threads.h"
-# else
-#  include "threads/green/threads.h"
-# endif
+#if defined(ENABLE_THREADS)
+# include "threads/native/threads.h"
 #endif
 
 
@@ -101,633 +105,245 @@ int stackreq[256];
                                 
 int jcommandsize[256] = {
 
-#define JAVA_NOP               0
-#define ICMD_NOP               0
-       1,
-#define JAVA_ACONST_NULL       1
-#define ICMD_ACONST            1        /* val.a = constant                   */
-       1,
-#define JAVA_ICONST_M1         2
-#define ICMD_CHECKNULL         2
-       1,
-#define JAVA_ICONST_0          3
-#define ICMD_ICONST            3        /* val.i = constant                   */
-       1,
-#define JAVA_ICONST_1          4
-       1,
-#define JAVA_ICONST_2          5
-#define ICMD_IDIVPOW2          5        /* val.i = constant                   */
-       1,
-#define JAVA_ICONST_3          6
-#define ICMD_LDIVPOW2          6        /* val.l = constant                   */
-       1,
-#define JAVA_ICONST_4          7
-       1,
-#define JAVA_ICONST_5          8
-       1,
-#define JAVA_LCONST_0          9
-#define ICMD_LCONST            9        /* val.l = constant                   */
-       1,
-#define JAVA_LCONST_1         10
-#define ICMD_LCMPCONST        10        /* val.l = constant                   */
-       1,
-#define JAVA_FCONST_0         11
-#define ICMD_FCONST           11        /* val.f = constant                   */
-       1,
-#define JAVA_FCONST_1         12
-       1,
-#define JAVA_FCONST_2         13
-#define ICMD_ELSE_ICONST      13
-       1,
-#define JAVA_DCONST_0         14
-#define ICMD_DCONST           14        /* val.d = constant                   */
-       1,
-#define JAVA_DCONST_1         15
-#define ICMD_IFEQ_ICONST      15
-       1,
-#define JAVA_BIPUSH           16
-#define ICMD_IFNE_ICONST      16
-       2,
-#define JAVA_SIPUSH           17
-#define ICMD_IFLT_ICONST      17
-       3,
-#define JAVA_LDC1             18
-#define ICMD_IFGE_ICONST      18
-       2,
-#define JAVA_LDC2             19
-#define ICMD_IFGT_ICONST      19
-       3,
-#define JAVA_LDC2W            20
-#define ICMD_IFLE_ICONST      20
-       3,
-                                           /* order of LOAD instructions must be */
-                                           /* equal to order of TYPE_XXX defines */
-#define JAVA_ILOAD            21
-#define ICMD_ILOAD            21        /* op1 = local variable               */
-       2,                      
-#define JAVA_LLOAD            22
-#define ICMD_LLOAD            22        /* op1 = local variable               */
-       2,
-#define JAVA_FLOAD            23
-#define ICMD_FLOAD            23        /* op1 = local variable               */
-       2,
-#define JAVA_DLOAD            24
-#define ICMD_DLOAD            24        /* op1 = local variable               */
-       2,
-#define JAVA_ALOAD            25
-#define ICMD_ALOAD            25        /* op1 = local variable               */
-       2,
-#define JAVA_ILOAD_0          26
-#define ICMD_IADDCONST        26        /* val.i = constant                   */
-       1,
-#define JAVA_ILOAD_1          27
-#define ICMD_ISUBCONST        27        /* val.i = constant                   */
-       1,
-#define JAVA_ILOAD_2          28
-#define ICMD_IMULCONST        28        /* val.i = constant                   */
-       1,
-#define JAVA_ILOAD_3          29
-#define ICMD_IANDCONST        29        /* val.i = constant                   */
-       1,
-#define JAVA_LLOAD_0          30
-#define ICMD_IORCONST         30        /* val.i = constant                   */
-       1,
-#define JAVA_LLOAD_1          31
-#define ICMD_IXORCONST        31        /* val.i = constant                   */
-       1,
-#define JAVA_LLOAD_2          32
-#define ICMD_ISHLCONST        32        /* val.i = constant                   */
-       1,
-#define JAVA_LLOAD_3          33
-#define ICMD_ISHRCONST        33        /* val.i = constant                   */
-       1,
-#define JAVA_FLOAD_0          34
-#define ICMD_IUSHRCONST       34        /* val.i = constant                   */
-       1,
-#define JAVA_FLOAD_1          35
-#define ICMD_IREMPOW2         35        /* val.i = constant                   */
-       1,
-#define JAVA_FLOAD_2          36
-#define ICMD_LADDCONST        36        /* val.l = constant                   */
-       1,
-#define JAVA_FLOAD_3          37
-#define ICMD_LSUBCONST        37        /* val.l = constant                   */
-       1,
-#define JAVA_DLOAD_0          38
-#define ICMD_LMULCONST        38        /* val.l = constant                   */
-       1,
-#define JAVA_DLOAD_1          39
-#define ICMD_LANDCONST        39        /* val.l = constant                   */
-       1,
-#define JAVA_DLOAD_2          40
-#define ICMD_LORCONST         40        /* val.l = constant                   */
-       1,
-#define JAVA_DLOAD_3          41
-#define ICMD_LXORCONST        41        /* val.l = constant                   */
-       1,
-#define JAVA_ALOAD_0          42
-#define ICMD_LSHLCONST        42        /* val.l = constant                   */
-       1,
-#define JAVA_ALOAD_1          43
-#define ICMD_LSHRCONST        43        /* val.l = constant                   */
-       1,
-#define JAVA_ALOAD_2          44
-#define ICMD_LUSHRCONST       44        /* val.l = constant                   */
-       1,
-#define JAVA_ALOAD_3          45
-#define ICMD_LREMPOW2         45        /* val.l = constant                   */
-       1,
-#define JAVA_IALOAD           46
-#define ICMD_IALOAD           46
-       1,
-#define JAVA_LALOAD           47
-#define ICMD_LALOAD           47
-       1,
-#define JAVA_FALOAD           48
-#define ICMD_FALOAD           48
-       1,
-#define JAVA_DALOAD           49
-#define ICMD_DALOAD           49
-       1,
-#define JAVA_AALOAD           50
-#define ICMD_AALOAD           50
-       1,
-#define JAVA_BALOAD           51
-#define ICMD_BALOAD           51
-       1,
-#define JAVA_CALOAD           52
-#define ICMD_CALOAD           52
-       1,
-#define JAVA_SALOAD           53
-#define ICMD_SALOAD           53
-       1,
-                                           /* order of STORE instructions must be*/
-                                           /* equal to order of TYPE_XXX defines */
-#define JAVA_ISTORE           54
-#define ICMD_ISTORE           54        /* op1 = local variable               */
-       2,
-#define JAVA_LSTORE           55
-#define ICMD_LSTORE           55        /* op1 = local variable               */
-       2,
-#define JAVA_FSTORE           56
-#define ICMD_FSTORE           56        /* op1 = local variable               */
-       2,
-#define JAVA_DSTORE           57
-#define ICMD_DSTORE           57        /* op1 = local variable               */
-       2,
-#define JAVA_ASTORE           58
-#define ICMD_ASTORE           58        /* op1 = local variable               */
-       2,
-#define JAVA_ISTORE_0         59
-#define ICMD_IF_LEQ           59        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_ISTORE_1         60
-#define ICMD_IF_LNE           60        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_ISTORE_2         61
-#define ICMD_IF_LLT           61        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_ISTORE_3         62
-#define ICMD_IF_LGE           62        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_LSTORE_0         63
-#define ICMD_IF_LGT           63        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_LSTORE_1         64
-#define ICMD_IF_LLE           64        /* op1 = target JavaVM pc, val.l      */
-       1,
-#define JAVA_LSTORE_2         65
-#define ICMD_IF_LCMPEQ        65        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_LSTORE_3         66
-#define ICMD_IF_LCMPNE        66        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_FSTORE_0         67
-#define ICMD_IF_LCMPLT        67        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_FSTORE_1         68
-#define ICMD_IF_LCMPGE        68        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_FSTORE_2         69
-#define ICMD_IF_LCMPGT        69        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_FSTORE_3         70
-#define ICMD_IF_LCMPLE        70        /* op1 = target JavaVM pc             */
-       1,
-#define JAVA_DSTORE_0         71
-       1,
-#define JAVA_DSTORE_1         72
-       1,
-#define JAVA_DSTORE_2         73
-       1,
-#define JAVA_DSTORE_3         74
-       1,
-#define JAVA_ASTORE_0         75
-       1,
-#define JAVA_ASTORE_1         76
-       1,
-#define JAVA_ASTORE_2         77
-       1,
-#define JAVA_ASTORE_3         78
-       1,
-#define JAVA_IASTORE          79
-#define ICMD_IASTORE          79
-       1,
-#define JAVA_LASTORE          80
-#define ICMD_LASTORE          80
-       1,
-#define JAVA_FASTORE          81
-#define ICMD_FASTORE          81
-       1,
-#define JAVA_DASTORE          82
-#define ICMD_DASTORE          82
-       1,
-#define JAVA_AASTORE          83
-#define ICMD_AASTORE          83
-       1,
-#define JAVA_BASTORE          84
-#define ICMD_BASTORE          84
-       1,
-#define JAVA_CASTORE          85
-#define ICMD_CASTORE          85
-       1,
-#define JAVA_SASTORE          86
-#define ICMD_SASTORE          86
-       1,
-#define JAVA_POP              87
-#define ICMD_POP              87
-       1,
-#define JAVA_POP2             88
-#define ICMD_POP2             88
-       1,
-#define JAVA_DUP              89
-#define ICMD_DUP              89
-       1,
-#define JAVA_DUP_X1           90
-#define ICMD_DUP_X1           90
-       1,
-#define JAVA_DUP_X2           91
-#define ICMD_DUP_X2           91
-       1,
-#define JAVA_DUP2             92
-#define ICMD_DUP2             92
-       1,
-#define JAVA_DUP2_X1          93
-#define ICMD_DUP2_X1          93
-       1,
-#define JAVA_DUP2_X2          94
-#define ICMD_DUP2_X2          94
-       1,
-#define JAVA_SWAP             95
-#define ICMD_SWAP             95
-       1,
-#define JAVA_IADD             96
-#define ICMD_IADD             96
-       1,
-#define JAVA_LADD             97
-#define ICMD_LADD             97
+       1,    /* JAVA_NOP                         0 */
+       1,    /* JAVA_ACONST_NULL                 1 */
+       1,    /* JAVA_ICONST_M1                   2 */
+       1,    /* JAVA_ICONST_0                    3 */
+       1,    /* JAVA_ICONST_1                    4 */
+       1,    /* JAVA_ICONST_2                    5 */
+       1,    /* JAVA_ICONST_3                    6 */
+       1,    /* JAVA_ICONST_4                    7 */
+       1,    /* JAVA_ICONST_5                    8 */
+       1,    /* JAVA_LCONST_0                    9 */
+       1,    /* JAVA_LCONST_1                   10 */
+       1,    /* JAVA_FCONST_0                   11 */
+       1,    /* JAVA_FCONST_1                   12 */
+       1,    /* JAVA_FCONST_2                   13 */
+       1,    /* JAVA_DCONST_0                   14 */
+       1,    /* JAVA_DCONST_1                   15 */
+       2,    /* JAVA_BIPUSH                     16 */
+       3,    /* JAVA_SIPUSH                     17 */
+       2,    /* JAVA_LDC1                       18 */
+       3,    /* JAVA_LDC2                       19 */
+       3,    /* JAVA_LDC2W                      20 */
+       2,    /* JAVA_ILOAD                      21 */
+       2,    /* JAVA_LLOAD                      22 */
+       2,    /* JAVA_FLOAD                      23 */
+       2,    /* JAVA_DLOAD                      24 */
+       2,    /* JAVA_ALOAD                      25 */
+       1,    /* JAVA_ILOAD_0                    26 */
+       1,    /* JAVA_ILOAD_1                    27 */
+       1,    /* JAVA_ILOAD_2                    28 */
+       1,    /* JAVA_ILOAD_3                    29 */
+       1,    /* JAVA_LLOAD_0                    30 */
+       1,    /* JAVA_LLOAD_1                    31 */
+       1,    /* JAVA_LLOAD_2                    32 */
+       1,    /* JAVA_LLOAD_3                    33 */
+       1,    /* JAVA_FLOAD_0                    34 */
+       1,    /* JAVA_FLOAD_1                    35 */
+       1,    /* JAVA_FLOAD_2                    36 */
+       1,    /* JAVA_FLOAD_3                    37 */
+       1,    /* JAVA_DLOAD_0                    38 */
+       1,    /* JAVA_DLOAD_1                    39 */
+       1,    /* JAVA_DLOAD_2                    40 */
+       1,    /* JAVA_DLOAD_3                    41 */
+       1,    /* JAVA_ALOAD_0                    42 */
+       1,    /* JAVA_ALOAD_1                    43 */
+       1,    /* JAVA_ALOAD_2                    44 */
+       1,    /* JAVA_ALOAD_3                    45 */
+       1,    /* JAVA_IALOAD                     46 */
+       1,    /* JAVA_LALOAD                     47 */
+       1,    /* JAVA_FALOAD                     48 */
+       1,    /* JAVA_DALOAD                     49 */
+       1,    /* JAVA_AALOAD                     50 */
+       1,    /* JAVA_BALOAD                     51 */
+       1,    /* JAVA_CALOAD                     52 */
+       1,    /* JAVA_SALOAD                     53 */
+       2,    /* JAVA_ISTORE                     54 */
+       2,    /* JAVA_LSTORE                     55 */
+       2,    /* JAVA_FSTORE                     56 */
+       2,    /* JAVA_DSTORE                     57 */
+       2,    /* JAVA_ASTORE                     58 */
+       1,    /* JAVA_ISTORE_0                   59 */
+       1,    /* JAVA_ISTORE_1                   60 */
+       1,    /* JAVA_ISTORE_2                   61 */
+       1,    /* JAVA_ISTORE_3                   62 */
+       1,    /* JAVA_LSTORE_0                   63 */
+       1,    /* JAVA_LSTORE_1                   64 */
+       1,    /* JAVA_LSTORE_2                   65 */
+       1,    /* JAVA_LSTORE_3                   66 */
+       1,    /* JAVA_FSTORE_0                   67 */
+       1,    /* JAVA_FSTORE_1                   68 */
+       1,    /* JAVA_FSTORE_2                   69 */
+       1,    /* JAVA_FSTORE_3                   70 */
+       1,    /* JAVA_DSTORE_0                   71 */
+       1,    /* JAVA_DSTORE_1                   72 */
+       1,    /* JAVA_DSTORE_2                   73 */
+       1,    /* JAVA_DSTORE_3                   74 */
+       1,    /* JAVA_ASTORE_0                   75 */
+       1,    /* JAVA_ASTORE_1                   76 */
+       1,    /* JAVA_ASTORE_2                   77 */
+       1,    /* JAVA_ASTORE_3                   78 */
+       1,    /* JAVA_IASTORE                    79 */
+       1,    /* JAVA_LASTORE                    80 */
+       1,    /* JAVA_FASTORE                    81 */
+       1,    /* JAVA_DASTORE                    82 */
+       1,    /* JAVA_AASTORE                    83 */
+       1,    /* JAVA_BASTORE                    84 */
+       1,    /* JAVA_CASTORE                    85 */
+       1,    /* JAVA_SASTORE                    86 */
+       1,    /* JAVA_POP                        87 */
+       1,    /* JAVA_POP2                       88 */
+       1,    /* JAVA_DUP                        89 */
+       1,    /* JAVA_DUP_X1                     90 */
+       1,    /* JAVA_DUP_X2                     91 */
+       1,    /* JAVA_DUP2                       92 */
+       1,    /* JAVA_DUP2_X1                    93 */
+       1,    /* JAVA_DUP2_X2                    94 */
+       1,    /* JAVA_SWAP                       95 */
+       1,    /* JAVA_IADD                       96 */
+       1,    /* JAVA_LADD                       97 */
+       1,    /* JAVA_FADD                       98 */
+       1,    /* JAVA_DADD                       99 */
+       1,    /* JAVA_ISUB                      100 */
+       1,    /* JAVA_LSUB                      101 */
+       1,    /* JAVA_FSUB                      102 */
+       1,    /* JAVA_DSUB                      103 */
+       1,    /* JAVA_IMUL                      104 */
+       1,    /* JAVA_LMUL                      105 */
+       1,    /* JAVA_FMUL                      106 */
+       1,    /* JAVA_DMUL                      107 */
+       1,    /* JAVA_IDIV                      108 */
+       1,    /* JAVA_LDIV                      109 */
+       1,    /* JAVA_FDIV                      110 */
+       1,    /* JAVA_DDIV                      111 */
+       1,    /* JAVA_IREM                      112 */
+       1,    /* JAVA_LREM                      113 */
+       1,    /* JAVA_FREM                      114 */
+       1,    /* JAVA_DREM                      115 */
+       1,    /* JAVA_INEG                      116 */
+       1,    /* JAVA_LNEG                      117 */
+       1,    /* JAVA_FNEG                      118 */
+       1,    /* JAVA_DNEG                      119 */
+       1,    /* JAVA_ISHL                      120 */
+       1,    /* JAVA_LSHL                      121 */
+       1,    /* JAVA_ISHR                      122 */
+       1,    /* JAVA_LSHR                      123 */
+       1,    /* JAVA_IUSHR                     124 */
+       1,    /* JAVA_LUSHR                     125 */
+       1,    /* JAVA_IAND                      126 */
+       1,    /* JAVA_LAND                      127 */
+       1,    /* JAVA_IOR                       128 */
+       1,    /* JAVA_LOR                       129 */
+       1,    /* JAVA_IXOR                      130 */
+       1,    /* JAVA_LXOR                      131 */
+       3,    /* JAVA_IINC                      132 */
+       1,    /* JAVA_I2L                       133 */
+       1,    /* JAVA_I2F                       134 */
+       1,    /* JAVA_I2D                       135 */
+       1,    /* JAVA_L2I                       136 */
+       1,    /* JAVA_L2F                       137 */
+       1,    /* JAVA_L2D                       138 */
+       1,    /* JAVA_F2I                       139 */
+       1,    /* JAVA_F2L                       140 */
+       1,    /* JAVA_F2D                       141 */
+       1,    /* JAVA_D2I                       142 */
+       1,    /* JAVA_D2L                       143 */
+       1,    /* JAVA_D2F                       144 */
+       1,    /* JAVA_INT2BYTE                  145 */
+       1,    /* JAVA_INT2CHAR                  146 */
+       1,    /* JAVA_INT2SHORT                 147 */
+       1,    /* JAVA_LCMP                      148 */
+       1,    /* JAVA_FCMPL                     149 */
+       1,    /* JAVA_FCMPG                     150 */
+       1,    /* JAVA_DCMPL                     151 */
+       1,    /* JAVA_DCMPG                     152 */
+       3,    /* JAVA_IFEQ                      153 */
+       3,    /* JAVA_IFNE                      154 */
+       3,    /* JAVA_IFLT                      155 */
+       3,    /* JAVA_IFGE                      156 */
+       3,    /* JAVA_IFGT                      157 */
+       3,    /* JAVA_IFLE                      158 */
+       3,    /* JAVA_IF_ICMPEQ                 159 */
+       3,    /* JAVA_IF_ICMPNE                 160 */
+       3,    /* JAVA_IF_ICMPLT                 161 */
+       3,    /* JAVA_IF_ICMPGE                 162 */
+       3,    /* JAVA_IF_ICMPGT                 163 */
+       3,    /* JAVA_IF_ICMPLE                 164 */
+       3,    /* JAVA_IF_ACMPEQ                 165 */
+       3,    /* JAVA_IF_ACMPNE                 166 */
+       3,    /* JAVA_GOTO                      167 */
+       3,    /* JAVA_JSR                       168 */
+       2,    /* JAVA_RET                       169 */
+       0,    /* JAVA_TABLESWITCH               170 */ /* variable length */
+       0,    /* JAVA_LOOKUPSWITCH              171 */ /* variable length */
+       1,    /* JAVA_IRETURN                   172 */
+       1,    /* JAVA_LRETURN                   173 */
+       1,    /* JAVA_FRETURN                   174 */
+       1,    /* JAVA_DRETURN                   175 */
+       1,    /* JAVA_ARETURN                   176 */
+       1,    /* JAVA_RETURN                    177 */
+       3,    /* JAVA_GETSTATIC                 178 */
+       3,    /* JAVA_PUTSTATIC                 179 */
+       3,    /* JAVA_GETFIELD                  180 */
+       3,    /* JAVA_PUTFIELD                  181 */
+       3,    /* JAVA_INVOKEVIRTUAL             182 */
+       3,    /* JAVA_INVOKESPECIAL             183 */
+       3,    /* JAVA_INVOKESTATIC              184 */
+       5,    /* JAVA_INVOKEINTERFACE           185 */
+       1,    /* UNDEF186 */
+       3,    /* JAVA_NEW                       187 */
+       2,    /* JAVA_NEWARRAY                  188 */
+       3,    /* JAVA_ANEWARRAY                 189 */
+       1,    /* JAVA_ARRAYLENGTH               190 */
+       1,    /* JAVA_ATHROW                    191 */
+       3,    /* JAVA_CHECKCAST                 192 */
+       3,    /* JAVA_INSTANCEOF                193 */
+       1,    /* JAVA_MONITORENTER              194 */
+       1,    /* JAVA_MONITOREXIT               195 */
+       0,    /* JAVA_WIDE                      196 */ /* variable length */
+       4,    /* JAVA_MULTIANEWARRAY            197 */
+       3,    /* JAVA_IFNULL                    198 */
+       3,    /* JAVA_IFNONNULL                 199 */
+       5,    /* JAVA_GOTO_W                    200 */
+       5,    /* JAVA_JSR_W                     201 */
+       1,    /* JAVA_BREAKPOINT                202 */
+
+       1,    /* UNDEF203 */
+       1,
+       1,
+       1,
+       1,
+       1,
+       1,
+       1,    /* UNDEF210 */
+       1,
+       1,
        1,
-#define JAVA_FADD             98
-#define ICMD_FADD             98
        1,
-#define JAVA_DADD             99
-#define ICMD_DADD             99
        1,
-#define JAVA_ISUB             100
-#define ICMD_ISUB             100
        1,
-#define JAVA_LSUB             101
-#define ICMD_LSUB             101
        1,
-#define JAVA_FSUB             102
-#define ICMD_FSUB             102
        1,
-#define JAVA_DSUB             103
-#define ICMD_DSUB             103
        1,
-#define JAVA_IMUL             104
-#define ICMD_IMUL             104
+       1,    /* UNDEF220 */
        1,
-#define JAVA_LMUL             105
-#define ICMD_LMUL             105
        1,
-#define JAVA_FMUL             106
-#define ICMD_FMUL             106
        1,
-#define JAVA_DMUL             107
-#define ICMD_DMUL             107
        1,
-#define JAVA_IDIV             108
-#define ICMD_IDIV             108
        1,
-#define JAVA_LDIV             109
-#define ICMD_LDIV             109
        1,
-#define JAVA_FDIV             110
-#define ICMD_FDIV             110
        1,
-#define JAVA_DDIV             111
-#define ICMD_DDIV             111
        1,
-#define JAVA_IREM             112
-#define ICMD_IREM             112
        1,
-#define JAVA_LREM             113
-#define ICMD_LREM             113
+       1,    /* UNDEF230 */
        1,
-#define JAVA_FREM             114
-#define ICMD_FREM             114
        1,
-#define JAVA_DREM             115
-#define ICMD_DREM             115
        1,
-#define JAVA_INEG             116
-#define ICMD_INEG             116
-       1,
-#define JAVA_LNEG             117
-#define ICMD_LNEG             117
-       1,
-#define JAVA_FNEG             118
-#define ICMD_FNEG             118
-       1,
-#define JAVA_DNEG             119
-#define ICMD_DNEG             119
-       1,
-#define JAVA_ISHL             120
-#define ICMD_ISHL             120
-       1,
-#define JAVA_LSHL             121
-#define ICMD_LSHL             121
-       1,
-#define JAVA_ISHR             122
-#define ICMD_ISHR             122
-       1,
-#define JAVA_LSHR             123
-#define ICMD_LSHR             123
-       1,
-#define JAVA_IUSHR            124
-#define ICMD_IUSHR            124
-       1,
-#define JAVA_LUSHR            125
-#define ICMD_LUSHR            125
-       1,
-#define JAVA_IAND             126
-#define ICMD_IAND             126
-       1,
-#define JAVA_LAND             127
-#define ICMD_LAND             127
-       1,
-#define JAVA_IOR              128
-#define ICMD_IOR              128
-       1,
-#define JAVA_LOR              129
-#define ICMD_LOR              129
-       1,
-#define JAVA_IXOR             130
-#define ICMD_IXOR             130
-       1,
-#define JAVA_LXOR             131
-#define ICMD_LXOR             131
-       1,
-#define JAVA_IINC             132
-#define ICMD_IINC             132   /* op1 = local variable, val.i = constant */
-       3,
-#define JAVA_I2L              133
-#define ICMD_I2L              133
-       1,
-#define JAVA_I2F              134
-#define ICMD_I2F              134
-       1,
-#define JAVA_I2D              135
-#define ICMD_I2D              135
-       1,
-#define JAVA_L2I              136
-#define ICMD_L2I              136
-       1,
-#define JAVA_L2F              137
-#define ICMD_L2F              137
-       1,
-#define JAVA_L2D              138
-#define ICMD_L2D              138
-       1,
-#define JAVA_F2I              139
-#define ICMD_F2I              139
-       1,
-#define JAVA_F2L              140
-#define ICMD_F2L              140
-       1,
-#define JAVA_F2D              141
-#define ICMD_F2D              141
-       1,
-#define JAVA_D2I              142
-#define ICMD_D2I              142
-       1,
-#define JAVA_D2L              143
-#define ICMD_D2L              143
-       1,
-#define JAVA_D2F              144
-#define ICMD_D2F              144
-       1,
-#define JAVA_INT2BYTE         145
-#define ICMD_INT2BYTE         145
-       1,
-#define JAVA_INT2CHAR         146
-#define ICMD_INT2CHAR         146
-       1,
-#define JAVA_INT2SHORT        147
-#define ICMD_INT2SHORT        147
-       1,
-#define JAVA_LCMP             148
-#define ICMD_LCMP             148
-       1,
-#define JAVA_FCMPL            149
-#define ICMD_FCMPL            149
-       1,
-#define JAVA_FCMPG            150
-#define ICMD_FCMPG            150
-       1,
-#define JAVA_DCMPL            151
-#define ICMD_DCMPL            151
-       1,
-#define JAVA_DCMPG            152
-#define ICMD_DCMPG            152
-       1,
-#define JAVA_IFEQ             153
-#define ICMD_IFEQ             153       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IFNE             154
-#define ICMD_IFNE             154       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IFLT             155
-#define ICMD_IFLT             155       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IFGE             156
-#define ICMD_IFGE             156       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IFGT             157
-#define ICMD_IFGT             157       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IFLE             158
-#define ICMD_IFLE             158       /* op1 = target JavaVM pc, val.i      */
-       3,
-#define JAVA_IF_ICMPEQ        159
-#define ICMD_IF_ICMPEQ        159       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ICMPNE        160
-#define ICMD_IF_ICMPNE        160       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ICMPLT        161
-#define ICMD_IF_ICMPLT        161       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ICMPGE        162
-#define ICMD_IF_ICMPGE        162       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ICMPGT        163
-#define ICMD_IF_ICMPGT        163       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ICMPLE        164
-#define ICMD_IF_ICMPLE        164       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ACMPEQ        165
-#define ICMD_IF_ACMPEQ        165       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IF_ACMPNE        166
-#define ICMD_IF_ACMPNE        166       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_GOTO             167
-#define ICMD_GOTO             167       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_JSR              168
-#define ICMD_JSR              168       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_RET              169
-#define ICMD_RET              169       /* op1 = local variable               */
-       2,
-#define JAVA_TABLESWITCH      170
-#define ICMD_TABLESWITCH      170       /* val.a = pointer to s4 table        */
-       0,                                  /* length must be computed            */
-#define JAVA_LOOKUPSWITCH     171
-#define ICMD_LOOKUPSWITCH     171       /* val.a = pointer to s4 table        */
-       0,                                  /* length must be computed            */
-#define JAVA_IRETURN          172
-#define ICMD_IRETURN          172
-       1,
-#define JAVA_LRETURN          173
-#define ICMD_LRETURN          173
-       1,
-#define JAVA_FRETURN          174
-#define ICMD_FRETURN          174
-       1,
-#define JAVA_DRETURN          175
-#define ICMD_DRETURN          175
-       1,
-#define JAVA_ARETURN          176
-#define ICMD_ARETURN          176
-       1,
-#define JAVA_RETURN           177
-#define ICMD_RETURN           177
-       1,
-#define JAVA_GETSTATIC        178
-#define ICMD_GETSTATIC        178       /* op1 = type, val.a = field address  */
-       3,
-#define JAVA_PUTSTATIC        179
-#define ICMD_PUTSTATIC        179       /* op1 = type, val.a = field address  */
-       3,
-#define JAVA_GETFIELD         180
-#define ICMD_GETFIELD         180       /* op1 = type, val.i = field offset   */
-       3,
-#define JAVA_PUTFIELD         181
-#define ICMD_PUTFIELD         181       /* op1 = type, val.i = field offset   */
-       3,
-#define JAVA_INVOKEVIRTUAL    182
-#define ICMD_INVOKEVIRTUAL    182       /* val.a = method info pointer        */
-       3,
-#define JAVA_INVOKESPECIAL    183
-#define ICMD_INVOKESPECIAL    183       /* val.a = method info pointer        */
-       3,
-#define JAVA_INVOKESTATIC     184
-#define ICMD_INVOKESTATIC     184       /* val.a = method info pointer        */
-       3,
-#define JAVA_INVOKEINTERFACE  185
-#define ICMD_INVOKEINTERFACE  185       /* val.a = method info pointer        */
-       5,
-/* UNDEF186 */
-       1,
-#define JAVA_NEW              187
-#define ICMD_NEW              187       /* op1 = 1, val.a = class pointer     */
-       3,
-#define JAVA_NEWARRAY         188
-#define ICMD_NEWARRAY         188       /* op1 = basic type                   */
-       2,
-#define JAVA_ANEWARRAY        189
-#define ICMD_ANEWARRAY        189       /* op1 = 0, val.a = array pointer     */
-       3,                                  /* op1 = 1, val.a = class pointer     */
-#define JAVA_ARRAYLENGTH      190
-#define ICMD_ARRAYLENGTH      190
-       1,
-#define JAVA_ATHROW           191
-#define ICMD_ATHROW           191
-       1,
-#define JAVA_CHECKCAST        192
-#define ICMD_CHECKCAST        192       /* op1 = 0, val.a = array pointer     */
-       3,                                  /* op1 = 1, val.a = class pointer     */
-#define JAVA_INSTANCEOF       193
-#define ICMD_INSTANCEOF       193       /* op1 = 0, val.a = array pointer     */
-       3,                                  /* op1 = 1, val.a = class pointer     */
-#define JAVA_MONITORENTER     194
-#define ICMD_MONITORENTER     194
-       1,
-#define JAVA_MONITOREXIT      195
-#define ICMD_MONITOREXIT      195
-       1,
-#define JAVA_WIDE             196
-       0, /* length must be computed */
-#define JAVA_MULTIANEWARRAY   197
-#define ICMD_MULTIANEWARRAY   197       /* op1 = dimension, val.a = array     */
-       4,                                  /* pointer                            */
-#define JAVA_IFNULL           198
-#define ICMD_IFNULL           198       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_IFNONNULL        199
-#define ICMD_IFNONNULL        199       /* op1 = target JavaVM pc             */
-       3,
-#define JAVA_GOTO_W           200
-       5,
-#define JAVA_JSR_W            201
-       5,
-#define JAVA_BREAKPOINT       202
-       1,
-/* UNDEF 203 */
-       1,
-#define ICMD_IASTORECONST     204
-       1,
-#define ICMD_LASTORECONST     205
-       1,
-#define ICMD_FASTORECONST     206
-       1,
-#define ICMD_DASTORECONST     207
-       1,
-#define ICMD_AASTORECONST     208
-       1,
-#define ICMD_BASTORECONST     209
-       1,
-#define ICMD_CASTORECONST     210
-       1,
-#define ICMD_SASTORECONST     211
-       1,
-#define ICMD_PUTSTATICCONST   212
-       1,
-#define ICMD_PUTFIELDCONST    213
-       1,
-#define ICMD_IMULPOW2         214
-       1,
-#define ICMD_LMULPOW2         215
        1,
 
        /* unused */
-                   1,1,1,1,
-       1,1,1,1,1,1,1,1,1,1,
-       1,1,1,1,1,1,1,1,1,1,
+               1,1,1,1,1,1,
        1,1,1,1,1,1,1,1,1,1,
        1,1,1,1,1
 };
@@ -738,7 +354,7 @@ char *icmd_names[256] = {
        "ACONST         ", /*               1 */
        "CHECKNULL      ", /* ICONST_M1     2 */
        "ICONST         ", /*               3 */
-       "UNDEF4         ", /* ICONST_1      4 */
+       "CHECKNULL_POP  ", /* ICONST_1      4 */
        "IDIVPOW2       ", /* ICONST_2      5 */
        "LDIVPOW2       ", /* ICONST_3      6 */
        "UNDEF7         ", /* ICONST_4      7 */
@@ -951,10 +567,32 @@ char *icmd_names[256] = {
        "IMULPOW2       ", /*             214 */
        "LMULPOW2       ", /*             215 */
 
-       "UNDEF216", "UNDEF217", "UNDEF218", "UNDEF219", "UNDEF220",
-       "UNDEF221", "UNDEF222", "UNDEF223", "UNDEF224", "UNDEF225",
-       "UNDEF226", "UNDEF227", "UNDEF228", "UNDEF229", "UNDEF230",
-       "UNDEF231", "UNDEF232", "UNDEF233", "UNDEF234", "UNDEF235",
+       "IF_FCMPEQ      ", /*             216 */
+       "IF_FCMPNE      ", /*             217 */
+
+       "IF_FCMPL_LT    ", /*             218 */
+       "IF_FCMPL_GE    ", /*             219 */
+       "IF_FCMPL_GT    ", /*             220 */
+       "IF_FCMPL_LE    ", /*             221 */
+
+       "IF_FCMPG_LT    ", /*             222 */
+       "IF_FCMPG_GE    ", /*             223 */
+       "IF_FCMPG_GT    ", /*             224 */
+       "IF_FCMPG_LE    ", /*             225 */
+
+       "IF_DCMPEQ      ", /*             226 */
+       "IF_DCMPNE      ", /*             227 */
+
+       "IF_DCMPL_LT    ", /*             228 */
+       "IF_DCMPL_GE    ", /*             229 */
+       "IF_DCMPL_GT    ", /*             230 */
+       "IF_DCMPL_LE    ", /*             231 */
+       
+       "IF_DCMPG_LT    ", /*             232 */
+       "IF_DCMPG_GE    ", /*             233 */
+       "IF_DCMPG_GT    ", /*             234 */
+       "IF_DCMPG_LE    ", /*             235 */
+       
        "UNDEF236", "UNDEF237", "UNDEF238", "UNDEF239", "UNDEF240",
        "UNDEF241", "UNDEF242", "UNDEF243", "UNDEF244", "UNDEF245",
        "UNDEF246", "UNDEF247", "UNDEF248", "UNDEF249", "UNDEF250",
@@ -1283,6 +921,12 @@ void jit_init(void)
 
        (void) stack_init();
 
+       /* initialize show subsystem */
+
+#if !defined(NDEBUG)
+       (void) show_init();
+#endif
+
        /* initialize codegen subsystem */
 
        codegen_init();
@@ -1309,39 +953,88 @@ static u1 *do_nothing_function(void)
 }
 
 
+/* jit_jitdata_new *************************************************************
+
+   Allocates and initalizes a new jitdata structure.
+
+*******************************************************************************/
+
+static jitdata *jit_jitdata_new(methodinfo *m)
+{
+       jitdata *jd;
+
+       /* allocate jitdata structure and fill it */
+
+       jd = DNEW(jitdata);
+
+       jd->m     = m;
+       jd->cd    = DNEW(codegendata);
+       jd->rd    = DNEW(registerdata);
+#if defined(ENABLE_LOOP)
+       jd->ld    = DNEW(loopdata);
+#endif
+
+       /* Allocate codeinfo memory from the heap as we need to keep them. */
+
+       jd->code  = code_codeinfo_new(m);
+
+       /* initialize variables */
+
+       jd->flags        = 0;
+       jd->isleafmethod = true;
+
+       return jd;
+}
+
+
 /* jit_compile *****************************************************************
 
-   jit_compile, new version of compiler, translates one method to machine code
+   Translates one method to machine code.
 
 *******************************************************************************/
 
-static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
-                                                         loopdata *ld);
+static u1 *jit_compile_intern(jitdata *jd);
 
 u1 *jit_compile(methodinfo *m)
 {
-       u1                 *r;
-       codegendata        *cd;
-       registerdata       *rd;
-       loopdata           *ld;
-       s4                  dumpsize;
+       u1      *r;
+       jitdata *jd;
+       s4       dumpsize;
 
        STATISTICS(count_jit_calls++);
 
-#if defined(USE_THREADS)
-       /* enter a monitor on the method */
+       /* Initialize the static function's class. */
+
+       /* ATTENTION: This MUST be done before the method lock is aquired,
+          otherwise we could run into a deadlock with <clinit>'s that
+          call static methods of it's own class. */
 
-       builtin_monitorenter((java_objectheader *) m);
+       if ((m->flags & ACC_STATIC) && !(m->class->state & CLASS_INITIALIZED)) {
+#if !defined(NDEBUG)
+               if (initverbose)
+                       log_message_class("Initialize class ", m->class);
 #endif
 
+               if (!initialize_class(m->class))
+                       return NULL;
+
+               /* check if the method has been compiled during initialization */
+
+               if ((m->code != NULL) && (m->code->entrypoint != NULL))
+                       return m->code->entrypoint;
+       }
+
+       /* enter a monitor on the method */
+
+       BUILTIN_MONITOR_ENTER(m);
+
        /* if method has been already compiled return immediately */
 
-       if (m->entrypoint) {
-#if defined(USE_THREADS)
-               builtin_monitorexit((java_objectheader *) m);
-#endif
+       if (m->code != NULL) {
+               BUILTIN_MONITOR_EXIT(m);
 
-               return m->entrypoint;
+               assert(m->code->entrypoint);
+               return m->code->entrypoint;
        }
 
        STATISTICS(count_methods++);
@@ -1349,7 +1042,7 @@ u1 *jit_compile(methodinfo *m)
 #if defined(ENABLE_STATISTICS)
        /* measure time */
 
-       if (getcompilingtime)
+       if (opt_getcompilingtime)
                compilingtime_start();
 #endif
 
@@ -1357,11 +1050,31 @@ u1 *jit_compile(methodinfo *m)
 
        dumpsize = dump_size();
 
-       /* allocate memory */
+       /* create jitdata structure */
 
-       cd = DNEW(codegendata);
-       rd = DNEW(registerdata);
-       ld = DNEW(loopdata);
+       jd = jit_jitdata_new(m);
+
+       /* set the flags for the current JIT run */
+
+       jd->flags = JITDATA_FLAG_PARSE;
+
+       if (opt_verify)
+               jd->flags |= JITDATA_FLAG_VERIFY;
+
+       if (opt_prof)
+               jd->flags |= JITDATA_FLAG_INSTRUMENT;
+
+       if (opt_ifconv)
+               jd->flags |= JITDATA_FLAG_IFCONV;
+
+       if (opt_showintermediate)
+               jd->flags |= JITDATA_FLAG_SHOWINTERMEDIATE;
+
+       if (opt_showdisassemble)
+               jd->flags |= JITDATA_FLAG_SHOWDISASSEMBLE;
+
+       if (opt_verbosecall)
+               jd->flags |= JITDATA_FLAG_VERBOSECALL;
 
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
@@ -1369,33 +1082,40 @@ u1 *jit_compile(methodinfo *m)
 # endif
                /* initialize the register allocator */
 
-               reg_setup(m, rd);
+               reg_setup(jd);
 #endif
 
        /* setup the codegendata memory */
 
-       codegen_setup(m, cd);
+       codegen_setup(jd);
 
        /* now call internal compile function */
 
-       r = jit_compile_intern(m, cd, rd, ld);
-
-       /* free some memory */
-
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (!opt_intrp)
-# endif
-               codegen_free(m, cd);
-#endif
+       r = jit_compile_intern(jd);
 
        /* clear pointers to dump memory area */
 
-       m->basicblocks = NULL;
+       m->basicblocks     = NULL;
        m->basicblockindex = NULL;
-       m->instructions = NULL;
-       m->stack = NULL;
-       /* NO !!! m->exceptiontable = NULL; */
+       m->instructions    = NULL;
+       m->stack           = NULL;
+
+       if (r == NULL) {
+               /* We had an exception! Finish stuff here if necessary. */
+
+               /* release codeinfo */
+
+               code_codeinfo_free(jd->code);
+
+               /* Release memory for basic block profiling information. */
+
+               if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
+                       if (jd->code->bbfrequency != NULL)
+                               MFREE(jd->code->bbfrequency, u4, jd->code->basicblockcount);
+       }
+       else {
+               DEBUG_JIT_COMPILEVERBOSE("Running: ");
+       }
 
        /* release dump area */
 
@@ -1404,31 +1124,116 @@ u1 *jit_compile(methodinfo *m)
 #if defined(ENABLE_STATISTICS)
        /* measure time */
 
-       if (getcompilingtime)
+       if (opt_getcompilingtime)
                compilingtime_stop();
 #endif
 
-
-#if defined(USE_THREADS)
        /* leave the monitor */
 
-       builtin_monitorexit((java_objectheader *) m);
+       BUILTIN_MONITOR_EXIT(m);
+
+       /* return pointer to the methods entry point */
+
+       return r;
+}
+
+
+/* jit_recompile ***************************************************************
+
+   Recompiles a Java method.
+
+*******************************************************************************/
+
+u1 *jit_recompile(methodinfo *m)
+{
+       u1      *r;
+       jitdata *jd;
+       u1       optlevel;
+       s4       dumpsize;
+
+       /* check for max. optimization level */
+
+       optlevel = m->code->optlevel;
+
+       if (optlevel == 1) {
+               log_message_method("not recompiling: ", m);
+               return NULL;
+       }
+
+       log_message_method("Recompiling start: ", m);
+
+       STATISTICS(count_jit_calls++);
+
+#if defined(ENABLE_STATISTICS)
+       /* measure time */
+
+       if (opt_getcompilingtime)
+               compilingtime_start();
 #endif
 
-       if (r) {
-               if (compileverbose)
-                       log_message_method("Running: ", m);
+       /* mark start of dump memory area */
+
+       dumpsize = dump_size();
+
+       /* create jitdata structure */
+
+       jd = jit_jitdata_new(m);
+
+       /* set the current optimization level to the previous one plus 1 */
+
+       jd->code->optlevel = optlevel + 1;
+
+       /* get the optimization flags for the current JIT run */
+
+       jd->flags |= JITDATA_FLAG_SHOWINTERMEDIATE;
+       jd->flags |= JITDATA_FLAG_SHOWDISASSEMBLE;
+/*     jd->flags |= JITDATA_FLAG_VERBOSECALL; */
+
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+       if (!opt_intrp)
+# endif
+               /* initialize the register allocator */
 
-       } else {
+               reg_setup(jd);
+#endif
+
+       /* setup the codegendata memory */
+
+       codegen_setup(jd);
+
+       /* now call internal compile function */
+
+       r = jit_compile_intern(jd);
+
+       /* clear pointers to dump memory area */
+
+       m->basicblocks     = NULL;
+       m->basicblockindex = NULL;
+       m->instructions    = NULL;
+       m->stack           = NULL;
+
+       if (r == NULL) {
                /* We had an exception! Finish stuff here if necessary. */
 
-               /* Release memory for basic block profiling information. */
+               /* release codeinfo */
 
-               if (opt_prof)
-                       if (m->bbfrequency)
-                               MFREE(m->bbfrequency, u4, m->basicblockcount);
+               code_codeinfo_free(jd->code);
        }
 
+       /* release dump area */
+
+       dump_release(dumpsize);
+
+#if defined(ENABLE_STATISTICS)
+       /* measure time */
+
+       if (opt_getcompilingtime)
+               compilingtime_stop();
+#endif
+
+       log_message_method("Recompiling done: ", m);
+
        /* return pointer to the methods entry point */
 
        return r;
@@ -1441,28 +1246,29 @@ u1 *jit_compile(methodinfo *m)
 
 *******************************************************************************/
 
-static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
-                                                         loopdata *ld)
+static u1 *jit_compile_intern(jitdata *jd)
 {
-       /* print log message for compiled method */
-
-       DEBUG_JIT_COMPILEVERBOSE("Compiling: ");
-
-       /* initialize the static function's class */
-
-       if ((m->flags & ACC_STATIC) && !CLASS_IS_OR_ALMOST_INITIALIZED(m->class)) {
-#if !defined(NDEBUG)
-               if (initverbose)
-                       log_message_class("Initialize class ", m->class);
+       methodinfo  *m;
+       codegendata *cd;
+       codeinfo    *code;
+
+#if defined(ENABLE_RT_TIMING)
+       struct timespec time_start,time_checks,time_parse,time_stack,
+                                       time_typecheck,time_loop,time_ifconv,time_alloc,
+                                       time_rplpoints,time_codegen;
 #endif
+       
+       RT_TIMING_GET_TIME(time_start);
 
-               if (!initialize_class(m->class))
-                       return NULL;
+       /* get required compiler data */
 
-               /* check if the method has been compiled during initialization */
-               if (m->entrypoint)
-                       return m->entrypoint;
-       }
+       m    = jd->m;
+       code = jd->code;
+       cd   = jd->cd;
+       
+       /* print log message for compiled method */
+
+       DEBUG_JIT_COMPILEVERBOSE("Compiling: ");
 
        /* handle native methods and create a native stub */
 
@@ -1475,29 +1281,28 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
                if (f == NULL)
                        return NULL;
 #else
-
                f = NULL;
 #endif
 
-               m->entrypoint = codegen_createnativestub(f, m);
+               code = codegen_createnativestub(f, m);
 
-               return m->entrypoint;
+               assert(!m->code); /* native methods are never recompiled */
+               m->code = code;
+               
+               return code->entrypoint;
        }
 
        /* if there is no javacode, print error message and return empty method   */
 
-       if (!m->jcode) {
+       if (m->jcode == NULL) {
                DEBUG_JIT_COMPILEVERBOSE("No code given for: ");
 
-               m->entrypoint = (u1 *) (ptrint) do_nothing_function;
+               code->entrypoint = (u1 *) (ptrint) do_nothing_function;
+               m->code = code;
 
-               return m->entrypoint;           /* return empty method                */
+               return code->entrypoint;        /* return empty method                */
        }
 
-       /* initialisation of variables and subsystems */
-
-       m->isleafmethod = true;
-
 #if defined(ENABLE_STATISTICS)
        if (opt_stat) {
                count_tryblocks    += m->exceptiontablelength;
@@ -1506,37 +1311,41 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
        }
 #endif
 
+       RT_TIMING_GET_TIME(time_checks);
+
        /* call the compiler passes ***********************************************/
 
        DEBUG_JIT_COMPILEVERBOSE("Parsing: ");
 
        /* call parse pass */
 
-       if (!parse(m, cd)) {
+       if (!parse(jd)) {
                DEBUG_JIT_COMPILEVERBOSE("Exception while parsing: ");
 
                return NULL;
        }
+       RT_TIMING_GET_TIME(time_parse);
 
        DEBUG_JIT_COMPILEVERBOSE("Parsing done: ");
        DEBUG_JIT_COMPILEVERBOSE("Analysing: ");
 
        /* call stack analysis pass */
 
-       if (!analyse_stack(m, cd, rd)) {
+       if (!stack_analyse(jd)) {
                DEBUG_JIT_COMPILEVERBOSE("Exception while analysing: ");
 
                return NULL;
        }
+       RT_TIMING_GET_TIME(time_stack);
 
        DEBUG_JIT_COMPILEVERBOSE("Analysing done: ");
 
 #ifdef ENABLE_VERIFIER
-       if (opt_verify) {
+       if (jd->flags & JITDATA_FLAG_VERIFY) {
                DEBUG_JIT_COMPILEVERBOSE("Typechecking: ");
 
                /* call typecheck pass */
-       if (!typecheck(m, cd, rd)) {
+               if (!typecheck(jd)) {
                        DEBUG_JIT_COMPILEVERBOSE("Exception while typechecking: ");
 
                        return NULL;
@@ -1545,12 +1354,23 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
                DEBUG_JIT_COMPILEVERBOSE("Typechecking done: ");
        }
 #endif
+       RT_TIMING_GET_TIME(time_typecheck);
 
+#if defined(ENABLE_LOOP)
        if (opt_loops) {
-               depthFirst(m, ld);
-               analyseGraph(m, ld);
-               optimize_loops(m, cd, ld);
+               depthFirst(jd);
+               analyseGraph(jd);
+               optimize_loops(jd);
        }
+#endif
+       RT_TIMING_GET_TIME(time_loop);
+
+#if defined(ENABLE_IFCONV)
+       if (JITDATA_HAS_FLAG_IFCONV(jd))
+               if (!ifconv_static(jd))
+                       return NULL;
+#endif
+       RT_TIMING_GET_TIME(time_ifconv);
 
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
@@ -1561,7 +1381,8 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
                /* allocate registers */
 # if defined(ENABLE_LSRA)
                if (opt_lsra) {
-                       lsra(m, cd, rd);
+                       if (!lsra(jd))
+                               return NULL;
 
                        STATISTICS(count_methods_allocated_by_lsra++);
 
@@ -1570,32 +1391,39 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
                {
                        STATISTICS(count_locals_conflicts += (cd->maxlocals - 1) * (cd->maxlocals));
 
-                       regalloc(m, cd, rd);
+                       regalloc(jd);
                }
 
-               STATISTICS(reg_make_statistics(m, cd, rd));
+               STATISTICS(reg_make_statistics(jd));
 
                DEBUG_JIT_COMPILEVERBOSE("Allocating registers done: ");
 # if defined(ENABLE_INTRP)
        }
 # endif
 #endif /* defined(ENABLE_JIT) */
+       RT_TIMING_GET_TIME(time_alloc);
 
        /* Allocate memory for basic block profiling information. This
           _must_ be done after loop optimization and register allocation,
           since they can change the basic block count. */
 
-       if (opt_prof)
-               m->bbfrequency = MNEW(u4, m->basicblockcount);
+       if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
+               code->bbfrequency = MNEW(u4, code->basicblockcount);
 
        DEBUG_JIT_COMPILEVERBOSE("Generating code: ");
 
+       /* create the replacement points */
+
+       if (!replace_create_replacement_points(jd))
+               return NULL;
+       RT_TIMING_GET_TIME(time_rplpoints);
+
        /* now generate the machine code */
 
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (opt_intrp) {
-               if (!intrp_codegen(m, cd, rd)) {
+               if (!intrp_codegen(jd)) {
                        DEBUG_JIT_COMPILEVERBOSE("Exception while generating code: ");
 
                        return NULL;
@@ -1603,50 +1431,122 @@ static u1 *jit_compile_intern(methodinfo *m, codegendata *cd, registerdata *rd,
        } else
 # endif
                {
-                       if (!codegen(m, cd, rd)) {
+                       if (!codegen(jd)) {
                                DEBUG_JIT_COMPILEVERBOSE("Exception while generating code: ");
 
                                return NULL;
                        }
                }
 #else
-       if (!intrp_codegen(m, cd, rd)) {
+       if (!intrp_codegen(jd)) {
                DEBUG_JIT_COMPILEVERBOSE("Exception while generating code: ");
 
                return NULL;
        }
 #endif
+       RT_TIMING_GET_TIME(time_codegen);
 
        DEBUG_JIT_COMPILEVERBOSE("Generating code done: ");
 
 #if !defined(NDEBUG)
        /* intermediate and assembly code listings */
                
-       if (opt_showintermediate) {
-               show_icmd_method(m, cd, rd);
-
-       } else if (opt_showdisassemble) {
-               DISASSEMBLE(m->entrypoint,
-                                       m->entrypoint + (cd->code->mcodelength - cd->dseglen));
+       if (JITDATA_HAS_FLAG_SHOWINTERMEDIATE(jd)) {
+               show_method(jd);
+       }
+       else if (JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd)) {
+# if defined(ENABLE_DISASSEMBLER)
+               DISASSEMBLE(code->entrypoint,
+                                       code->entrypoint + (code->mcodelength - cd->dseglen));
+# endif
        }
 
        if (opt_showddatasegment)
-               dseg_display(m, cd);
+               dseg_display(jd);
 #endif
 
        DEBUG_JIT_COMPILEVERBOSE("Compiling done: ");
 
-       /* switch to the generated code */
+       /* switch to the newly generated code */
+
+       assert(code);
+       assert(code->entrypoint);
+
+       /* add the current compile version to the methodinfo */
+
+       code->prev = m->code;
+       m->code = code;
 
-       cd->code->prev = m->code;
-       m->code = cd->code;
+       RT_TIMING_TIME_DIFF(time_start,time_checks,RT_TIMING_JIT_CHECKS);
+       RT_TIMING_TIME_DIFF(time_checks,time_parse,RT_TIMING_JIT_PARSE);
+       RT_TIMING_TIME_DIFF(time_parse,time_stack,RT_TIMING_JIT_STACK);
+       RT_TIMING_TIME_DIFF(time_stack,time_typecheck,RT_TIMING_JIT_TYPECHECK);
+       RT_TIMING_TIME_DIFF(time_typecheck,time_loop,RT_TIMING_JIT_LOOP);
+       RT_TIMING_TIME_DIFF(time_loop,time_alloc,RT_TIMING_JIT_ALLOC);
+       RT_TIMING_TIME_DIFF(time_alloc,time_rplpoints,RT_TIMING_JIT_RPLPOINTS);
+       RT_TIMING_TIME_DIFF(time_rplpoints,time_codegen,RT_TIMING_JIT_CODEGEN);
+       RT_TIMING_TIME_DIFF(time_start,time_codegen,RT_TIMING_JIT_TOTAL);
 
        /* return pointer to the methods entry point */
 
-       return m->entrypoint;
+       return code->entrypoint;
 } 
 
 
+/* jit_asm_compile *************************************************************
+
+   This method is called from asm_vm_call_method and does:
+
+     - create stackframe info for exceptions
+     - compile the method
+     - patch the entrypoint of the method into the calculated address in
+       the JIT code
+     - flushes the instruction cache.
+
+*******************************************************************************/
+
+u1 *jit_asm_compile(methodinfo *m, u1 *mptr, u1 *sp, u1 *ra)
+{
+       stackframeinfo  sfi;
+       u1             *entrypoint;
+       u1             *pa;
+       ptrint         *p;
+
+       /* create the stackframeinfo (XPC is equal to RA) */
+
+       stacktrace_create_extern_stackframeinfo(&sfi, NULL, sp, ra, ra);
+
+       /* actually compile the method */
+
+       entrypoint = jit_compile(m);
+
+       /* remove the stackframeinfo */
+
+       stacktrace_remove_stackframeinfo(&sfi);
+
+       /* there was a problem during compilation */
+
+       if (entrypoint == NULL)
+               return NULL;
+
+       /* get the method patch address */
+
+       pa = md_get_method_patch_address(ra, &sfi, mptr);
+
+       /* patch the method entry point */
+
+       p = (ptrint *) pa;
+
+       *p = (ptrint) entrypoint;
+
+       /* flush the instruction cache */
+
+       md_icacheflush(pa, SIZEOF_VOID_P);
+
+       return entrypoint;
+}
+
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where