New ICMDs: PUTSTATICCONST, PUTFIELDCONST, IMULPOW2, LMULPOW2
[cacao.git] / src / vm / jit / jit.c
index 178d3f611c460401d99e355fe91985b0a44d0a67..726bbcc76ed0e8bdfe6bf483e91a310c6f94b175 100644 (file)
@@ -1,9 +1,9 @@
-/* jit/jit.c - calls the code generation functions
+/* src/vm/jit/jit.c - calls the code generation functions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 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
 
    This file is part of CACAO.
 
             Reinhard Grafl
 
    Changes: Edwin Steiner
+            Christian Thalinger
 
-   $Id: jit.c 892 2004-01-19 12:32:29Z edwin $
+   $Id: jit.c 2038 2005-03-20 11:22:40Z twisti $
 
 */
 
 
 #include <stdlib.h>
-#include <string.h>
-#include "global.h"    /* we define _GNU_SOURCE there */
-#include "main.h"
-#include "tables.h"
-#include "loader.h"
-#include "jit.h"
-#include "parse.h"
-#include "stack.h"
-#include "reg.h"
-#include "inline.h"
-#include "builtin.h"
-#include "native.h"
-#include "asmpart.h"
+
+#include "config.h"
 #include "codegen.h"
-#include "types.h"
-#include "threads/thread.h"
 #include "disass.h"
-#include "loop/loop.h"
-#include "loop/graph.h"
-#include "loop/analyze.h"
-#include "toolbox/loging.h"
-#include "toolbox/memory.h"
-
-
-/* global switches ************************************************************/
-
-int count_jit_calls = 0;
-int count_methods = 0;
-int count_spills = 0;
-int count_pcmd_activ = 0;
-int count_pcmd_drop = 0;
-int count_pcmd_zero = 0;
-int count_pcmd_const_store = 0;
-int count_pcmd_const_alu = 0;
-int count_pcmd_const_bra = 0;
-int count_pcmd_load = 0;
-int count_pcmd_move = 0;
-int count_load_instruction = 0;
-int count_pcmd_store = 0;
-int count_pcmd_store_comb = 0;
-int count_dup_instruction = 0;
-int count_pcmd_op = 0;
-int count_pcmd_mem = 0;
-int count_pcmd_met = 0;
-int count_pcmd_bra = 0;
-int count_pcmd_table = 0;
-int count_pcmd_return = 0;
-int count_pcmd_returnx = 0;
-int count_check_null = 0;
-int count_check_bound = 0;
-int count_max_basic_blocks = 0;
-int count_basic_blocks = 0;
-int count_javainstr = 0;
-int count_max_javainstr = 0;
-int count_javacodesize = 0;
-int count_javaexcsize = 0;
-int count_calls = 0;
-int count_tryblocks = 0;
-int count_code_len = 0;
-int count_data_len = 0;
-int count_cstub_len = 0;
-int count_nstub_len = 0;
-int count_max_new_stack = 0;
-int count_upper_bound_new_stack = 0;
-static int count_block_stack_init[11] = {
-       0, 0, 0, 0, 0, 
-       0, 0, 0, 0, 0, 
-       0
-};
-int *count_block_stack = count_block_stack_init;
-static int count_analyse_iterations_init[5] = {
-       0, 0, 0, 0, 0
-};
-int *count_analyse_iterations = count_analyse_iterations_init;
-static int count_method_bb_distribution_init[9] = {
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0
-};
-int *count_method_bb_distribution = count_method_bb_distribution_init;
-static int count_block_size_distribution_init[18] = {
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0, 0, 0
-};
-int *count_block_size_distribution = count_block_size_distribution_init;
-static int count_store_length_init[21] = {
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0
-};
-int *count_store_length = count_store_length_init;
-static int count_store_depth_init[11] = {
-       0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0,
-       0
-};
-int *count_store_depth = count_store_depth_init;
-
-
-
-/* global compiler variables **************************************************/
-
-                                /* data about the currently compiled method   */
-
-classinfo  *class;              /* class the compiled method belongs to       */
-methodinfo *method;             /* pointer to method info of compiled method  */
-static utf *descriptor;         /* type descriptor of compiled method         */
-int         mparamcount;        /* number of parameters (incl. this)          */
-u1         *mparamtypes;        /* types of all parameters (TYPE_INT, ...)    */
-static int mreturntype;         /* return type of method                      */
-       
-int maxstack;                   /* maximal JavaVM stack size                  */
-int maxlocals;                  /* maximal number of local JavaVM variables   */
-int jcodelength;                /* length of JavaVM-codes                     */
-u1 *jcode;                      /* pointer to start of JavaVM-code            */
-int exceptiontablelength;       /* length of exception table                  */
-xtable *extable;                /* pointer to start of exception table        */
-exceptiontable *raw_extable;
-
-int block_count;                /* number of basic blocks                     */
-basicblock *block;              /* points to basic block array                */
-int *block_index;               /* a table which contains for every byte of   */
-                                /* JavaVM code a basic block index if at this */
-                                /* byte there is the start of a basic block   */
-
-int instr_count;                /* number of JavaVM instructions              */
-instruction *instr;             /* points to intermediate code instructions   */
-
-int stack_count;                /* number of stack elements                   */
-stackelement *stack;            /* points to intermediate code instructions   */
-
-bool isleafmethod;              /* true if a method doesn't call subroutines  */
+#include "types.h"
+#include "mm/memory.h"
+#include "toolbox/logging.h"
+#include "vm/builtin.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/statistics.h"
+#include "vm/tables.h"
+#include "vm/jit/codegen.inc.h"
+#include "vm/jit/jit.h"
+#ifdef LSRA
+#include "vm/jit/lsra.h"
+#endif
+#include "vm/jit/parse.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/stack.h"
+#include "vm/jit/inline/inline.h"
+#include "vm/jit/inline/parseRT.h"
+#include "vm/jit/inline/parseXTA.h"
+#include "vm/jit/loop/analyze.h"
+#include "vm/jit/loop/graph.h"
+#include "vm/jit/loop/loop.h"
+#include "vm/jit/verify/typecheck.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+#  include "threads/native/threads.h"
+# else
+#  include "threads/green/threads.h"
+# endif
+#endif
 
-basicblock *last_block;         /* points to the end of the BB list           */
 
-bool regs_ok;                   /* true if registers have been allocated      */
 
-/* list of all classes used by the compiled method which have to be           */
-/* initialised (if not already done) before execution of this method          */
-chain *uninitializedclasses;
+/* global switches ************************************************************/
 
 int stackreq[256];
 
                                 
-#if defined(__I386__)
-/* these define if a method has ICMDs which use %edx or %ecx */
-bool method_uses_ecx;
-bool method_uses_edx;
-#endif
-
-
 int jcommandsize[256] = {
 
 #define JAVA_NOP               0
@@ -204,7 +95,6 @@ int jcommandsize[256] = {
 #define ICMD_ICONST            3        /* val.i = constant                   */
        1,
 #define JAVA_ICONST_1          4
-#define ICMD_IREM0X10001       4
        1,
 #define JAVA_ICONST_2          5
 #define ICMD_IDIVPOW2          5        /* val.i = constant                   */
@@ -215,7 +105,6 @@ int jcommandsize[256] = {
 #define JAVA_ICONST_4          7
        1,
 #define JAVA_ICONST_5          8
-#define ICMD_LREM0X10001       8
        1,
 #define JAVA_LCONST_0          9
 #define ICMD_LCONST            9        /* val.l = constant                   */
@@ -789,9 +678,35 @@ int jcommandsize[256] = {
        5,
 #define JAVA_BREAKPOINT       202
        1,
+#define ICMD_CHECKEXCEPTION   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,
 
-           1,1,1,1,1,1,1,1,            /* unused */
-       1,1,1,1,1,1,1,1,1,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,
@@ -800,448 +715,456 @@ int jcommandsize[256] = {
 
 
 char *icmd_names[256] = {
-       "NOP          ", /*               0 */
-       "ACONST       ", /*               1 */
-       "NULLCHECKPOP ", /* ICONST_M1     2 */
-       "ICONST       ", /*               3 */
-       "IREM0X10001  ", /* ICONST_1      4 */
-       "IDIVPOW2     ", /* ICONST_2      5 */
-       "LDIVPOW2     ", /* ICONST_3      6 */
-       "UNDEF__7     ", /* ICONST_4      7 */
-       "LREM0X10001  ", /* ICONST_5      8 */
-       "LCONST       ", /*               9 */
-       "LCMPCONST    ", /* LCONST_1     10 */
-       "FCONST       ", /*              11 */
-       "UNDEF_12     ", /* FCONST_1     12 */
-       "ELSE_ICONST  ", /* FCONST_2     13 */
-       "DCONST       ", /*              14 */
-       "IFEQ_ICONST  ", /* DCONST_1     15 */
-       "IFNE_ICONST  ", /* BIPUSH       16 */
-       "IFLT_ICONST  ", /* SIPUSH       17 */
-       "IFGE_ICONST  ", /* LDC1         18 */
-       "IFGT_ICONST  ", /* LDC2         19 */
-       "IFLE_ICONST  ", /* LDC2W        20 */
-       "ILOAD        ", /*              21 */
-       "LLOAD        ", /*              22 */
-       "FLOAD        ", /*              23 */
-       "DLOAD        ", /*              24 */
-       "ALOAD        ", /*              25 */
-       "IADDCONST    ", /* ILOAD_0      26 */
-       "ISUBCONST    ", /* ILOAD_1      27 */
-       "IMULCONST    ", /* ILOAD_2      28 */
-       "IANDCONST    ", /* ILOAD_3      29 */
-       "IORCONST     ", /* LLOAD_0      30 */
-       "IXORCONST    ", /* LLOAD_1      31 */
-       "ISHLCONST    ", /* LLOAD_2      32 */
-       "ISHRCONST    ", /* LLOAD_3      33 */
-       "IUSHRCONST   ", /* FLOAD_0      34 */
-       "IREMPOW2     ", /* FLOAD_1      35 */
-       "LADDCONST    ", /* FLOAD_2      36 */
-       "LSUBCONST    ", /* FLOAD_3      37 */
-       "LMULCONST    ", /* DLOAD_0      38 */
-       "LANDCONST    ", /* DLOAD_1      39 */
-       "LORCONST     ", /* DLOAD_2      40 */
-       "LXORCONST    ", /* DLOAD_3      41 */
-       "LSHLCONST    ", /* ALOAD_0      42 */
-       "LSHRCONST    ", /* ALOAD_1      43 */
-       "LUSHRCONST   ", /* ALOAD_2      44 */
-       "LREMPOW2     ", /* ALOAD_3      45 */
-       "IALOAD       ", /*              46 */
-       "LALOAD       ", /*              47 */
-       "FALOAD       ", /*              48 */
-       "DALOAD       ", /*              49 */
-       "AALOAD       ", /*              50 */
-       "BALOAD       ", /*              51 */
-       "CALOAD       ", /*              52 */
-       "SALOAD       ", /*              53 */
-       "ISTORE       ", /*              54 */
-       "LSTORE       ", /*              55 */
-       "FSTORE       ", /*              56 */
-       "DSTORE       ", /*              57 */
-       "ASTORE       ", /*              58 */
-       "IF_LEQ       ", /* ISTORE_0     59 */
-       "IF_LNE       ", /* ISTORE_1     60 */
-       "IF_LLT       ", /* ISTORE_2     61 */
-       "IF_LGE       ", /* ISTORE_3     62 */
-       "IF_LGT       ", /* LSTORE_0     63 */
-       "IF_LLE       ", /* LSTORE_1     64 */
-       "IF_LCMPEQ    ", /* LSTORE_2     65 */
-       "IF_LCMPNE    ", /* LSTORE_3     66 */
-       "IF_LCMPLT    ", /* FSTORE_0     67 */
-       "IF_LCMPGE    ", /* FSTORE_1     68 */
-       "IF_LCMPGT    ", /* FSTORE_2     69 */
-       "IF_LCMPLE    ", /* FSTORE_3     70 */
-       "UNDEF_71     ", /* DSTORE_0     71 */
-       "UNDEF_72     ", /* DSTORE_1     72 */
-       "UNDEF_73     ", /* DSTORE_2     73 */
-       "UNDEF_74     ", /* DSTORE_3     74 */
-       "UNDEF_75     ", /* ASTORE_0     75 */
-       "UNDEF_76     ", /* ASTORE_1     76 */
-       "UNDEF_77     ", /* ASTORE_2     77 */
-       "UNDEF_78     ", /* ASTORE_3     78 */
-       "IASTORE      ", /*              79 */
-       "LASTORE      ", /*              80 */
-       "FASTORE      ", /*              81 */
-       "DASTORE      ", /*              82 */
-       "AASTORE      ", /*              83 */
-       "BASTORE      ", /*              84 */
-       "CASTORE      ", /*              85 */
-       "SASTORE      ", /*              86 */
-       "POP          ", /*              87 */
-       "POP2         ", /*              88 */
-       "DUP          ", /*              89 */
-       "DUP_X1       ", /*              90 */
-       "DUP_X2       ", /*              91 */
-       "DUP2         ", /*              92 */
-       "DUP2_X1      ", /*              93 */
-       "DUP2_X2      ", /*              94 */
-       "SWAP         ", /*              95 */
-       "IADD         ", /*              96 */
-       "LADD         ", /*              97 */
-       "FADD         ", /*              98 */
-       "DADD         ", /*              99 */
-       "ISUB         ", /*             100 */
-       "LSUB         ", /*             101 */
-       "FSUB         ", /*             102 */
-       "DSUB         ", /*             103 */
-       "IMUL         ", /*             104 */
-       "LMUL         ", /*             105 */
-       "FMUL         ", /*             106 */
-       "DMUL         ", /*             107 */
-       "IDIV         ", /*             108 */
-       "LDIV         ", /*             109 */
-       "FDIV         ", /*             110 */
-       "DDIV         ", /*             111 */
-       "IREM         ", /*             112 */
-       "LREM         ", /*             113 */
-       "FREM         ", /*             114 */
-       "DREM         ", /*             115 */
-       "INEG         ", /*             116 */
-       "LNEG         ", /*             117 */
-       "FNEG         ", /*             118 */
-       "DNEG         ", /*             119 */
-       "ISHL         ", /*             120 */
-       "LSHL         ", /*             121 */
-       "ISHR         ", /*             122 */
-       "LSHR         ", /*             123 */
-       "IUSHR        ", /*             124 */
-       "LUSHR        ", /*             125 */
-       "IAND         ", /*             126 */
-       "LAND         ", /*             127 */
-       "IOR          ", /*             128 */
-       "LOR          ", /*             129 */
-       "IXOR         ", /*             130 */
-       "LXOR         ", /*             131 */
-       "IINC         ", /*             132 */
-       "I2L          ", /*             133 */
-       "I2F          ", /*             134 */
-       "I2D          ", /*             135 */
-       "L2I          ", /*             136 */
-       "L2F          ", /*             137 */
-       "L2D          ", /*             138 */
-       "F2I          ", /*             139 */
-       "F2L          ", /*             140 */
-       "F2D          ", /*             141 */
-       "D2I          ", /*             142 */
-       "D2L          ", /*             143 */
-       "D2F          ", /*             144 */
-       "INT2BYTE     ", /*             145 */
-       "INT2CHAR     ", /*             146 */
-       "INT2SHORT    ", /*             147 */
-       "LCMP         ", /*             148 */
-       "FCMPL        ", /*             149 */
-       "FCMPG        ", /*             150 */
-       "DCMPL        ", /*             151 */
-       "DCMPG        ", /*             152 */
-       "IFEQ         ", /*             153 */
-       "IFNE         ", /*             154 */
-       "IFLT         ", /*             155 */
-       "IFGE         ", /*             156 */
-       "IFGT         ", /*             157 */
-       "IFLE         ", /*             158 */
-       "IF_ICMPEQ    ", /*             159 */
-       "IF_ICMPNE    ", /*             160 */
-       "IF_ICMPLT    ", /*             161 */
-       "IF_ICMPGE    ", /*             162 */
-       "IF_ICMPGT    ", /*             163 */
-       "IF_ICMPLE    ", /*             164 */
-       "IF_ACMPEQ    ", /*             165 */
-       "IF_ACMPNE    ", /*             166 */
-       "GOTO         ", /*             167 */
-       "JSR          ", /*             168 */
-       "RET          ", /*             169 */
-       "TABLESWITCH  ", /*             170 */
-       "LOOKUPSWITCH ", /*             171 */
-       "IRETURN      ", /*             172 */
-       "LRETURN      ", /*             173 */
-       "FRETURN      ", /*             174 */
-       "DRETURN      ", /*             175 */
-       "ARETURN      ", /*             176 */
-       "RETURN       ", /*             177 */
-       "GETSTATIC    ", /*             178 */
-       "PUTSTATIC    ", /*             179 */
-       "GETFIELD     ", /*             180 */
-       "PUTFIELD     ", /*             181 */
-       "INVOKEVIRTUAL", /*             182 */
-       "INVOKESPECIAL", /*             183 */
-       "INVOKESTATIC ", /*             184 */
-       "INVOKEINTERFACE",/*            185 */
-       "CHECKASIZE   ", /* UNDEF186    186 */
-       "NEW          ", /*             187 */
-       "NEWARRAY     ", /*             188 */
-       "ANEWARRAY    ", /*             189 */
-       "ARRAYLENGTH  ", /*             190 */
-       "ATHROW       ", /*             191 */
-       "CHECKCAST    ", /*             192 */
-       "INSTANCEOF   ", /*             193 */
-       "MONITORENTER ", /*             194 */
-       "MONITOREXIT  ", /*             195 */
-       "UNDEF196     ", /* WIDE        196 */
-       "MULTIANEWARRAY",/*             197 */
-       "IFNULL       ", /*             198 */
-       "IFNONNULL    ", /*             199 */
-       "UNDEF200     ", /* GOTO_W      200 */
-       "UNDEF201     ", /* JSR_W       201 */
-       "UNDEF202     ", /* BREAKPOINT  202 */
-
-                             "UNDEF203","UNDEF204","UNDEF205",
-       "UNDEF206","UNDEF207","UNDEF208","UNDEF209","UNDEF210",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF216","UNDEF217","UNDEF218","UNDEF219","UNDEF220",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF226","UNDEF227","UNDEF228","UNDEF229","UNDEF230",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF236","UNDEF237","UNDEF238","UNDEF239","UNDEF240",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF246","UNDEF247","UNDEF248","UNDEF249","UNDEF250",
-       "UNDEF251","UNDEF252",
-
-       "BUILTIN3     ", /*             253 */
-       "BUILTIN2     ", /*             254 */
-       "BUILTIN1     "  /*             255 */
+       "NOP            ", /*               0 */
+       "ACONST         ", /*               1 */
+       "NULLCHECKPOP   ", /* ICONST_M1     2 */
+       "ICONST         ", /*               3 */
+       "UNDEF4         ", /* ICONST_1      4 */
+       "IDIVPOW2       ", /* ICONST_2      5 */
+       "LDIVPOW2       ", /* ICONST_3      6 */
+       "UNDEF7         ", /* ICONST_4      7 */
+       "UNDEF8         ", /* ICONST_5      8 */
+       "LCONST         ", /*               9 */
+       "LCMPCONST      ", /* LCONST_1     10 */
+       "FCONST         ", /*              11 */
+       "UNDEF12        ", /* FCONST_1     12 */
+       "ELSE_ICONST    ", /* FCONST_2     13 */
+       "DCONST         ", /*              14 */
+       "IFEQ_ICONST    ", /* DCONST_1     15 */
+       "IFNE_ICONST    ", /* BIPUSH       16 */
+       "IFLT_ICONST    ", /* SIPUSH       17 */
+       "IFGE_ICONST    ", /* LDC1         18 */
+       "IFGT_ICONST    ", /* LDC2         19 */
+       "IFLE_ICONST    ", /* LDC2W        20 */
+       "ILOAD          ", /*              21 */
+       "LLOAD          ", /*              22 */
+       "FLOAD          ", /*              23 */
+       "DLOAD          ", /*              24 */
+       "ALOAD          ", /*              25 */
+       "IADDCONST      ", /* ILOAD_0      26 */
+       "ISUBCONST      ", /* ILOAD_1      27 */
+       "IMULCONST      ", /* ILOAD_2      28 */
+       "IANDCONST      ", /* ILOAD_3      29 */
+       "IORCONST       ", /* LLOAD_0      30 */
+       "IXORCONST      ", /* LLOAD_1      31 */
+       "ISHLCONST      ", /* LLOAD_2      32 */
+       "ISHRCONST      ", /* LLOAD_3      33 */
+       "IUSHRCONST     ", /* FLOAD_0      34 */
+       "IREMPOW2       ", /* FLOAD_1      35 */
+       "LADDCONST      ", /* FLOAD_2      36 */
+       "LSUBCONST      ", /* FLOAD_3      37 */
+       "LMULCONST      ", /* DLOAD_0      38 */
+       "LANDCONST      ", /* DLOAD_1      39 */
+       "LORCONST       ", /* DLOAD_2      40 */
+       "LXORCONST      ", /* DLOAD_3      41 */
+       "LSHLCONST      ", /* ALOAD_0      42 */
+       "LSHRCONST      ", /* ALOAD_1      43 */
+       "LUSHRCONST     ", /* ALOAD_2      44 */
+       "LREMPOW2       ", /* ALOAD_3      45 */
+       "IALOAD         ", /*              46 */
+       "LALOAD         ", /*              47 */
+       "FALOAD         ", /*              48 */
+       "DALOAD         ", /*              49 */
+       "AALOAD         ", /*              50 */
+       "BALOAD         ", /*              51 */
+       "CALOAD         ", /*              52 */
+       "SALOAD         ", /*              53 */
+       "ISTORE         ", /*              54 */
+       "LSTORE         ", /*              55 */
+       "FSTORE         ", /*              56 */
+       "DSTORE         ", /*              57 */
+       "ASTORE         ", /*              58 */
+       "IF_LEQ         ", /* ISTORE_0     59 */
+       "IF_LNE         ", /* ISTORE_1     60 */
+       "IF_LLT         ", /* ISTORE_2     61 */
+       "IF_LGE         ", /* ISTORE_3     62 */
+       "IF_LGT         ", /* LSTORE_0     63 */
+       "IF_LLE         ", /* LSTORE_1     64 */
+       "IF_LCMPEQ      ", /* LSTORE_2     65 */
+       "IF_LCMPNE      ", /* LSTORE_3     66 */
+       "IF_LCMPLT      ", /* FSTORE_0     67 */
+       "IF_LCMPGE      ", /* FSTORE_1     68 */
+       "IF_LCMPGT      ", /* FSTORE_2     69 */
+       "IF_LCMPLE      ", /* FSTORE_3     70 */
+       "UNDEF71        ", /* DSTORE_0     71 */
+       "UNDEF72        ", /* DSTORE_1     72 */
+       "UNDEF73        ", /* DSTORE_2     73 */
+       "UNDEF74        ", /* DSTORE_3     74 */
+       "UNDEF75        ", /* ASTORE_0     75 */
+       "UNDEF76        ", /* ASTORE_1     76 */
+       "UNDEF77        ", /* ASTORE_2     77 */
+       "UNDEF78        ", /* ASTORE_3     78 */
+       "IASTORE        ", /*              79 */
+       "LASTORE        ", /*              80 */
+       "FASTORE        ", /*              81 */
+       "DASTORE        ", /*              82 */
+       "AASTORE        ", /*              83 */
+       "BASTORE        ", /*              84 */
+       "CASTORE        ", /*              85 */
+       "SASTORE        ", /*              86 */
+       "POP            ", /*              87 */
+       "POP2           ", /*              88 */
+       "DUP            ", /*              89 */
+       "DUP_X1         ", /*              90 */
+       "DUP_X2         ", /*              91 */
+       "DUP2           ", /*              92 */
+       "DUP2_X1        ", /*              93 */
+       "DUP2_X2        ", /*              94 */
+       "SWAP           ", /*              95 */
+       "IADD           ", /*              96 */
+       "LADD           ", /*              97 */
+       "FADD           ", /*              98 */
+       "DADD           ", /*              99 */
+       "ISUB           ", /*             100 */
+       "LSUB           ", /*             101 */
+       "FSUB           ", /*             102 */
+       "DSUB           ", /*             103 */
+       "IMUL           ", /*             104 */
+       "LMUL           ", /*             105 */
+       "FMUL           ", /*             106 */
+       "DMUL           ", /*             107 */
+       "IDIV           ", /*             108 */
+       "LDIV           ", /*             109 */
+       "FDIV           ", /*             110 */
+       "DDIV           ", /*             111 */
+       "IREM           ", /*             112 */
+       "LREM           ", /*             113 */
+       "FREM           ", /*             114 */
+       "DREM           ", /*             115 */
+       "INEG           ", /*             116 */
+       "LNEG           ", /*             117 */
+       "FNEG           ", /*             118 */
+       "DNEG           ", /*             119 */
+       "ISHL           ", /*             120 */
+       "LSHL           ", /*             121 */
+       "ISHR           ", /*             122 */
+       "LSHR           ", /*             123 */
+       "IUSHR          ", /*             124 */
+       "LUSHR          ", /*             125 */
+       "IAND           ", /*             126 */
+       "LAND           ", /*             127 */
+       "IOR            ", /*             128 */
+       "LOR            ", /*             129 */
+       "IXOR           ", /*             130 */
+       "LXOR           ", /*             131 */
+       "IINC           ", /*             132 */
+       "I2L            ", /*             133 */
+       "I2F            ", /*             134 */
+       "I2D            ", /*             135 */
+       "L2I            ", /*             136 */
+       "L2F            ", /*             137 */
+       "L2D            ", /*             138 */
+       "F2I            ", /*             139 */
+       "F2L            ", /*             140 */
+       "F2D            ", /*             141 */
+       "D2I            ", /*             142 */
+       "D2L            ", /*             143 */
+       "D2F            ", /*             144 */
+       "INT2BYTE       ", /*             145 */
+       "INT2CHAR       ", /*             146 */
+       "INT2SHORT      ", /*             147 */
+       "LCMP           ", /*             148 */
+       "FCMPL          ", /*             149 */
+       "FCMPG          ", /*             150 */
+       "DCMPL          ", /*             151 */
+       "DCMPG          ", /*             152 */
+       "IFEQ           ", /*             153 */
+       "IFNE           ", /*             154 */
+       "IFLT           ", /*             155 */
+       "IFGE           ", /*             156 */
+       "IFGT           ", /*             157 */
+       "IFLE           ", /*             158 */
+       "IF_ICMPEQ      ", /*             159 */
+       "IF_ICMPNE      ", /*             160 */
+       "IF_ICMPLT      ", /*             161 */
+       "IF_ICMPGE      ", /*             162 */
+       "IF_ICMPGT      ", /*             163 */
+       "IF_ICMPLE      ", /*             164 */
+       "IF_ACMPEQ      ", /*             165 */
+       "IF_ACMPNE      ", /*             166 */
+       "GOTO           ", /*             167 */
+       "JSR            ", /*             168 */
+       "RET            ", /*             169 */
+       "TABLESWITCH    ", /*             170 */
+       "LOOKUPSWITCH   ", /*             171 */
+       "IRETURN        ", /*             172 */
+       "LRETURN        ", /*             173 */
+       "FRETURN        ", /*             174 */
+       "DRETURN        ", /*             175 */
+       "ARETURN        ", /*             176 */
+       "RETURN         ", /*             177 */
+       "GETSTATIC      ", /*             178 */
+       "PUTSTATIC      ", /*             179 */
+       "GETFIELD       ", /*             180 */
+       "PUTFIELD       ", /*             181 */
+       "INVOKEVIRTUAL  ", /*             182 */
+       "INVOKESPECIAL  ", /*             183 */
+       "INVOKESTATIC   ", /*             184 */
+       "INVOKEINTERFACE", /*             185 */
+       "CHECKASIZE     ", /* UNDEF186    186 */
+       "NEW            ", /*             187 */
+       "NEWARRAY       ", /*             188 */
+       "ANEWARRAY      ", /*             189 */
+       "ARRAYLENGTH    ", /*             190 */
+       "ATHROW         ", /*             191 */
+       "CHECKCAST      ", /*             192 */
+       "INSTANCEOF     ", /*             193 */
+       "MONITORENTER   ", /*             194 */
+       "MONITOREXIT    ", /*             195 */
+       "UNDEF196       ", /* WIDE        196 */
+       "MULTIANEWARRAY ", /*             197 */
+       "IFNULL         ", /*             198 */
+       "IFNONNULL      ", /*             199 */
+       "UNDEF200       ", /* GOTO_W      200 */
+       "UNDEF201       ", /* JSR_W       201 */
+       "UNDEF202       ", /* BREAKPOINT  202 */
+       "CHECKEXCEPTION ", /* UNDEF203    203 */
+       "IASTORECONST   ", /*             204 */
+       "LASTORECONST   ", /*             205 */
+       "FASTORECONST   ", /*             206 */
+       "DASTORECONST   ", /*             207 */
+       "AASTORECONST   ", /*             208 */
+       "BASTORECONST   ", /*             209 */
+       "CASTORECONST   ", /*             210 */
+       "SASTORECONST   ", /*             211 */
+       "PUTSTATICCONST ", /*             212 */
+       "PUTFIELDCONST  ", /*             213 */
+       "IMULPOW2       ", /*             214 */
+       "LMULPOW2       ", /*             215 */
+
+       "UNDEF216", "UNDEF217", "UNDEF218", "UNDEF219", "UNDEF220",
+       "UNDEF221", "UNDEF222", "UNDEF223", "UNDEF224", "UNDEF225",
+       "UNDEF226", "UNDEF227", "UNDEF228", "UNDEF229", "UNDEF230",
+       "UNDEF231", "UNDEF232", "UNDEF233", "UNDEF234", "UNDEF235",
+       "UNDEF236", "UNDEF237", "UNDEF238", "UNDEF239", "UNDEF240",
+       "UNDEF241", "UNDEF242", "UNDEF243", "UNDEF244", "UNDEF245",
+       "UNDEF246", "UNDEF247", "UNDEF248", "UNDEF249", "UNDEF250",
+
+       "INLINE_START   ", /*             251 */
+       "INLINE_END     ", /*             252 */
+
+       "BUILTIN3       ", /*             253 */
+       "BUILTIN2       ", /*             254 */
+       "BUILTIN1       "  /*             255 */
 };
 
 
 char *opcode_names[256] = {
-       "NOP          ", /*               0 */
-       "ACONST       ", /*               1 */
-       "ICONST_M1    ", /* ICONST_M1     2 */
-       "ICONST_0     ", /* ICONST_0      3 */
-       "ICONST_1     ", /* ICONST_1      4 */
-       "ICONST_2     ", /* ICONST_2      5 */
-       "ICONST_3     ", /* ICONST_3      6 */
-       "ICONST_4     ", /* ICONST_4      7 */
-       "ICONST_5     ", /* ICONST_5      8 */
-       "LCONST_0     ", /* LCONST_0      9 */
-       "LCONST_1     ", /* LCONST_1     10 */
-       "FCONST_0     ", /* FCONST_0     11 */
-       "FCONST_1     ", /* FCONST_1     12 */
-       "FCONST_2     ", /* FCONST_2     13 */
-       "DCONST_0     ", /* DCONST_0     14 */
-       "DCONST_1     ", /* DCONST_1     15 */
-       "BIPUSH       ", /* BIPUSH       16 */
-       "SIPUSH       ", /* SIPUSH       17 */
-       "LDC          ", /* LDC          18 */
-       "LDC_W        ", /* LDC_W        19 */
-       "LDC2_W       ", /* LDC2_W       20 */
-       "ILOAD        ", /*              21 */
-       "LLOAD        ", /*              22 */
-       "FLOAD        ", /*              23 */
-       "DLOAD        ", /*              24 */
-       "ALOAD        ", /*              25 */
-       "ILOAD_0      ", /* ILOAD_0      26 */
-       "ILOAD_1      ", /* ILOAD_1      27 */
-       "ILOAD_2      ", /* ILOAD_2      28 */
-       "ILOAD_3      ", /* ILOAD_3      29 */
-       "LLOAD_0      ", /* LLOAD_0      30 */
-       "LLOAD_1      ", /* LLOAD_1      31 */
-       "LLOAD_2      ", /* LLOAD_2      32 */
-       "LLOAD_3      ", /* LLOAD_3      33 */
-       "FLOAD_0      ", /* FLOAD_0      34 */
-       "FLOAD_1      ", /* FLOAD_1      35 */
-       "FLOAD_2      ", /* FLOAD_2      36 */
-       "FLOAD_3      ", /* FLOAD_3      37 */
-       "DLOAD_0      ", /* DLOAD_0      38 */
-       "DLOAD_1      ", /* DLOAD_1      39 */
-       "DLOAD_2      ", /* DLOAD_2      40 */ 
-       "DLOAD_3      ", /* DLOAD_3      41 */
-       "ALOAD_0      ", /* ALOAD_0      42 */
-       "ALOAD_1      ", /* ALOAD_1      43 */
-       "ALOAD_2      ", /* ALOAD_2      44 */
-       "ALOAD_3      ", /* ALOAD_3      45 */
-       "IALOAD       ", /*              46 */
-       "LALOAD       ", /*              47 */
-       "FALOAD       ", /*              48 */
-       "DALOAD       ", /*              49 */
-       "AALOAD       ", /*              50 */
-       "BALOAD       ", /*              51 */
-       "CALOAD       ", /*              52 */
-       "SALOAD       ", /*              53 */
-       "ISTORE       ", /*              54 */
-       "LSTORE       ", /*              55 */
-       "FSTORE       ", /*              56 */
-       "DSTORE       ", /*              57 */
-       "ASTORE       ", /*              58 */
-       "ISTORE_0     ", /* ISTORE_0     59 */
-       "ISTORE_1     ", /* ISTORE_1     60 */
-       "ISTORE_2     ", /* ISTORE_2     61 */
-       "ISTORE_3     ", /* ISTORE_3     62 */
-       "LSTORE_0     ", /* LSTORE_0     63 */
-       "LSTORE_1     ", /* LSTORE_1     64 */
-       "LSTORE_2     ", /* LSTORE_2     65 */
-       "LSTORE_3     ", /* LSTORE_3     66 */
-       "FSTORE_0     ", /* FSTORE_0     67 */
-       "FSTORE_1     ", /* FSTORE_1     68 */
-       "FSTORE_2     ", /* FSTORE_2     69 */
-       "FSTORE_3     ", /* FSTORE_3     70 */
-       "DSTORE_0     ", /* DSTORE_0     71 */
-       "DSTORE_1     ", /* DSTORE_1     72 */
-       "DSTORE_2     ", /* DSTORE_2     73 */
-       "DSTORE_3     ", /* DSTORE_3     74 */
-       "ASTORE_0     ", /* ASTORE_0     75 */
-       "ASTORE_1     ", /* ASTORE_1     76 */
-       "ASTORE_2     ", /* ASTORE_2     77 */
-       "ASTORE_3     ", /* ASTORE_3     78 */
-       "IASTORE      ", /*              79 */
-       "LASTORE      ", /*              80 */
-       "FASTORE      ", /*              81 */
-       "DASTORE      ", /*              82 */
-       "AASTORE      ", /*              83 */
-       "BASTORE      ", /*              84 */
-       "CASTORE      ", /*              85 */
-       "SASTORE      ", /*              86 */
-       "POP          ", /*              87 */
-       "POP2         ", /*              88 */
-       "DUP          ", /*              89 */
-       "DUP_X1       ", /*              90 */
-       "DUP_X2       ", /*              91 */
-       "DUP2         ", /*              92 */
-       "DUP2_X1      ", /*              93 */
-       "DUP2_X2      ", /*              94 */
-       "SWAP         ", /*              95 */
-       "IADD         ", /*              96 */
-       "LADD         ", /*              97 */
-       "FADD         ", /*              98 */
-       "DADD         ", /*              99 */
-       "ISUB         ", /*             100 */
-       "LSUB         ", /*             101 */
-       "FSUB         ", /*             102 */
-       "DSUB         ", /*             103 */
-       "IMUL         ", /*             104 */
-       "LMUL         ", /*             105 */
-       "FMUL         ", /*             106 */
-       "DMUL         ", /*             107 */
-       "IDIV         ", /*             108 */
-       "LDIV         ", /*             109 */
-       "FDIV         ", /*             110 */
-       "DDIV         ", /*             111 */
-       "IREM         ", /*             112 */
-       "LREM         ", /*             113 */
-       "FREM         ", /*             114 */
-       "DREM         ", /*             115 */
-       "INEG         ", /*             116 */
-       "LNEG         ", /*             117 */
-       "FNEG         ", /*             118 */
-       "DNEG         ", /*             119 */
-       "ISHL         ", /*             120 */
-       "LSHL         ", /*             121 */
-       "ISHR         ", /*             122 */
-       "LSHR         ", /*             123 */
-       "IUSHR        ", /*             124 */
-       "LUSHR        ", /*             125 */
-       "IAND         ", /*             126 */
-       "LAND         ", /*             127 */
-       "IOR          ", /*             128 */
-       "LOR          ", /*             129 */
-       "IXOR         ", /*             130 */
-       "LXOR         ", /*             131 */
-       "IINC         ", /*             132 */
-       "I2L          ", /*             133 */
-       "I2F          ", /*             134 */
-       "I2D          ", /*             135 */
-       "L2I          ", /*             136 */
-       "L2F          ", /*             137 */
-       "L2D          ", /*             138 */
-       "F2I          ", /*             139 */
-       "F2L          ", /*             140 */
-       "F2D          ", /*             141 */
-       "D2I          ", /*             142 */
-       "D2L          ", /*             143 */
-       "D2F          ", /*             144 */
-       "INT2BYTE     ", /*             145 */
-       "INT2CHAR     ", /*             146 */
-       "INT2SHORT    ", /*             147 */
-       "LCMP         ", /*             148 */
-       "FCMPL        ", /*             149 */
-       "FCMPG        ", /*             150 */
-       "DCMPL        ", /*             151 */
-       "DCMPG        ", /*             152 */
-       "IFEQ         ", /*             153 */
-       "IFNE         ", /*             154 */
-       "IFLT         ", /*             155 */
-       "IFGE         ", /*             156 */
-       "IFGT         ", /*             157 */
-       "IFLE         ", /*             158 */
-       "IF_ICMPEQ    ", /*             159 */
-       "IF_ICMPNE    ", /*             160 */
-       "IF_ICMPLT    ", /*             161 */
-       "IF_ICMPGE    ", /*             162 */
-       "IF_ICMPGT    ", /*             163 */
-       "IF_ICMPLE    ", /*             164 */
-       "IF_ACMPEQ    ", /*             165 */
-       "IF_ACMPNE    ", /*             166 */
-       "GOTO         ", /*             167 */
-       "JSR          ", /*             168 */
-       "RET          ", /*             169 */
-       "TABLESWITCH  ", /*             170 */
-       "LOOKUPSWITCH ", /*             171 */
-       "IRETURN      ", /*             172 */
-       "LRETURN      ", /*             173 */
-       "FRETURN      ", /*             174 */
-       "DRETURN      ", /*             175 */
-       "ARETURN      ", /*             176 */
-       "RETURN       ", /*             177 */
-       "GETSTATIC    ", /*             178 */
-       "PUTSTATIC    ", /*             179 */
-       "GETFIELD     ", /*             180 */
-       "PUTFIELD     ", /*             181 */
-       "INVOKEVIRTUAL", /*             182 */
-       "INVOKESPECIAL", /*             183 */
-       "INVOKESTATIC ", /*             184 */
-       "INVOKEINTERFACE",/*            185 */
-       "CHECKASIZE   ", /* UNDEF186    186 */
-       "NEW          ", /*             187 */
-       "NEWARRAY     ", /*             188 */
-       "ANEWARRAY    ", /*             189 */
-       "ARRAYLENGTH  ", /*             190 */
-       "ATHROW       ", /*             191 */
-       "CHECKCAST    ", /*             192 */
-       "INSTANCEOF   ", /*             193 */
-       "MONITORENTER ", /*             194 */
-       "MONITOREXIT  ", /*             195 */
-       "WIDE         ", /* WIDE        196 */
-       "MULTIANEWARRAY",/*             197 */
-       "IFNULL       ", /*             198 */
-       "IFNONNULL    ", /*             199 */
-       "GOTO_W       ", /* GOTO_W      200 */
-       "JSR_W        ", /* JSR_W       201 */
-       "BREAKPOINT   ", /* BREAKPOINT  202 */
-
-                             "UNDEF203","UNDEF204","UNDEF205",
-       "UNDEF206","UNDEF207","UNDEF208","UNDEF209","UNDEF210",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF216","UNDEF217","UNDEF218","UNDEF219","UNDEF220",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF226","UNDEF227","UNDEF228","UNDEF229","UNDEF230",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF236","UNDEF237","UNDEF238","UNDEF239","UNDEF240",
-       "UNDEF","UNDEF","UNDEF","UNDEF","UNDEF",
-       "UNDEF246","UNDEF247","UNDEF248","UNDEF249","UNDEF250",
-       "UNDEF251","UNDEF252",
-
-       "BUILTIN3     ", /*             253 */
-       "BUILTIN2     ", /*             254 */
-       "BUILTIN1     "  /*             255 */
+       "NOP            ", /*               0 */
+       "ACONST         ", /*               1 */
+       "ICONST_M1      ", /* ICONST_M1     2 */
+       "ICONST_0       ", /* ICONST_0      3 */
+       "ICONST_1       ", /* ICONST_1      4 */
+       "ICONST_2       ", /* ICONST_2      5 */
+       "ICONST_3       ", /* ICONST_3      6 */
+       "ICONST_4       ", /* ICONST_4      7 */
+       "ICONST_5       ", /* ICONST_5      8 */
+       "LCONST_0       ", /* LCONST_0      9 */
+       "LCONST_1       ", /* LCONST_1     10 */
+       "FCONST_0       ", /* FCONST_0     11 */
+       "FCONST_1       ", /* FCONST_1     12 */
+       "FCONST_2       ", /* FCONST_2     13 */
+       "DCONST_0       ", /* DCONST_0     14 */
+       "DCONST_1       ", /* DCONST_1     15 */
+       "BIPUSH         ", /* BIPUSH       16 */
+       "SIPUSH         ", /* SIPUSH       17 */
+       "LDC            ", /* LDC          18 */
+       "LDC_W          ", /* LDC_W        19 */
+       "LDC2_W         ", /* LDC2_W       20 */
+       "ILOAD          ", /*              21 */
+       "LLOAD          ", /*              22 */
+       "FLOAD          ", /*              23 */
+       "DLOAD          ", /*              24 */
+       "ALOAD          ", /*              25 */
+       "ILOAD_0        ", /* ILOAD_0      26 */
+       "ILOAD_1        ", /* ILOAD_1      27 */
+       "ILOAD_2        ", /* ILOAD_2      28 */
+       "ILOAD_3        ", /* ILOAD_3      29 */
+       "LLOAD_0        ", /* LLOAD_0      30 */
+       "LLOAD_1        ", /* LLOAD_1      31 */
+       "LLOAD_2        ", /* LLOAD_2      32 */
+       "LLOAD_3        ", /* LLOAD_3      33 */
+       "FLOAD_0        ", /* FLOAD_0      34 */
+       "FLOAD_1        ", /* FLOAD_1      35 */
+       "FLOAD_2        ", /* FLOAD_2      36 */
+       "FLOAD_3        ", /* FLOAD_3      37 */
+       "DLOAD_0        ", /* DLOAD_0      38 */
+       "DLOAD_1        ", /* DLOAD_1      39 */
+       "DLOAD_2        ", /* DLOAD_2      40 */ 
+       "DLOAD_3        ", /* DLOAD_3      41 */
+       "ALOAD_0        ", /* ALOAD_0      42 */
+       "ALOAD_1        ", /* ALOAD_1      43 */
+       "ALOAD_2        ", /* ALOAD_2      44 */
+       "ALOAD_3        ", /* ALOAD_3      45 */
+       "IALOAD         ", /*              46 */
+       "LALOAD         ", /*              47 */
+       "FALOAD         ", /*              48 */
+       "DALOAD         ", /*              49 */
+       "AALOAD         ", /*              50 */
+       "BALOAD         ", /*              51 */
+       "CALOAD         ", /*              52 */
+       "SALOAD         ", /*              53 */
+       "ISTORE         ", /*              54 */
+       "LSTORE         ", /*              55 */
+       "FSTORE         ", /*              56 */
+       "DSTORE         ", /*              57 */
+       "ASTORE         ", /*              58 */
+       "ISTORE_0       ", /* ISTORE_0     59 */
+       "ISTORE_1       ", /* ISTORE_1     60 */
+       "ISTORE_2       ", /* ISTORE_2     61 */
+       "ISTORE_3       ", /* ISTORE_3     62 */
+       "LSTORE_0       ", /* LSTORE_0     63 */
+       "LSTORE_1       ", /* LSTORE_1     64 */
+       "LSTORE_2       ", /* LSTORE_2     65 */
+       "LSTORE_3       ", /* LSTORE_3     66 */
+       "FSTORE_0       ", /* FSTORE_0     67 */
+       "FSTORE_1       ", /* FSTORE_1     68 */
+       "FSTORE_2       ", /* FSTORE_2     69 */
+       "FSTORE_3       ", /* FSTORE_3     70 */
+       "DSTORE_0       ", /* DSTORE_0     71 */
+       "DSTORE_1       ", /* DSTORE_1     72 */
+       "DSTORE_2       ", /* DSTORE_2     73 */
+       "DSTORE_3       ", /* DSTORE_3     74 */
+       "ASTORE_0       ", /* ASTORE_0     75 */
+       "ASTORE_1       ", /* ASTORE_1     76 */
+       "ASTORE_2       ", /* ASTORE_2     77 */
+       "ASTORE_3       ", /* ASTORE_3     78 */
+       "IASTORE        ", /*              79 */
+       "LASTORE        ", /*              80 */
+       "FASTORE        ", /*              81 */
+       "DASTORE        ", /*              82 */
+       "AASTORE        ", /*              83 */
+       "BASTORE        ", /*              84 */
+       "CASTORE        ", /*              85 */
+       "SASTORE        ", /*              86 */
+       "POP            ", /*              87 */
+       "POP2           ", /*              88 */
+       "DUP            ", /*              89 */
+       "DUP_X1         ", /*              90 */
+       "DUP_X2         ", /*              91 */
+       "DUP2           ", /*              92 */
+       "DUP2_X1        ", /*              93 */
+       "DUP2_X2        ", /*              94 */
+       "SWAP           ", /*              95 */
+       "IADD           ", /*              96 */
+       "LADD           ", /*              97 */
+       "FADD           ", /*              98 */
+       "DADD           ", /*              99 */
+       "ISUB           ", /*             100 */
+       "LSUB           ", /*             101 */
+       "FSUB           ", /*             102 */
+       "DSUB           ", /*             103 */
+       "IMUL           ", /*             104 */
+       "LMUL           ", /*             105 */
+       "FMUL           ", /*             106 */
+       "DMUL           ", /*             107 */
+       "IDIV           ", /*             108 */
+       "LDIV           ", /*             109 */
+       "FDIV           ", /*             110 */
+       "DDIV           ", /*             111 */
+       "IREM           ", /*             112 */
+       "LREM           ", /*             113 */
+       "FREM           ", /*             114 */
+       "DREM           ", /*             115 */
+       "INEG           ", /*             116 */
+       "LNEG           ", /*             117 */
+       "FNEG           ", /*             118 */
+       "DNEG           ", /*             119 */
+       "ISHL           ", /*             120 */
+       "LSHL           ", /*             121 */
+       "ISHR           ", /*             122 */
+       "LSHR           ", /*             123 */
+       "IUSHR          ", /*             124 */
+       "LUSHR          ", /*             125 */
+       "IAND           ", /*             126 */
+       "LAND           ", /*             127 */
+       "IOR            ", /*             128 */
+       "LOR            ", /*             129 */
+       "IXOR           ", /*             130 */
+       "LXOR           ", /*             131 */
+       "IINC           ", /*             132 */
+       "I2L            ", /*             133 */
+       "I2F            ", /*             134 */
+       "I2D            ", /*             135 */
+       "L2I            ", /*             136 */
+       "L2F            ", /*             137 */
+       "L2D            ", /*             138 */
+       "F2I            ", /*             139 */
+       "F2L            ", /*             140 */
+       "F2D            ", /*             141 */
+       "D2I            ", /*             142 */
+       "D2L            ", /*             143 */
+       "D2F            ", /*             144 */
+       "INT2BYTE       ", /*             145 */
+       "INT2CHAR       ", /*             146 */
+       "INT2SHORT      ", /*             147 */
+       "LCMP           ", /*             148 */
+       "FCMPL          ", /*             149 */
+       "FCMPG          ", /*             150 */
+       "DCMPL          ", /*             151 */
+       "DCMPG          ", /*             152 */
+       "IFEQ           ", /*             153 */
+       "IFNE           ", /*             154 */
+       "IFLT           ", /*             155 */
+       "IFGE           ", /*             156 */
+       "IFGT           ", /*             157 */
+       "IFLE           ", /*             158 */
+       "IF_ICMPEQ      ", /*             159 */
+       "IF_ICMPNE      ", /*             160 */
+       "IF_ICMPLT      ", /*             161 */
+       "IF_ICMPGE      ", /*             162 */
+       "IF_ICMPGT      ", /*             163 */
+       "IF_ICMPLE      ", /*             164 */
+       "IF_ACMPEQ      ", /*             165 */
+       "IF_ACMPNE      ", /*             166 */
+       "GOTO           ", /*             167 */
+       "JSR            ", /*             168 */
+       "RET            ", /*             169 */
+       "TABLESWITCH    ", /*             170 */
+       "LOOKUPSWITCH   ", /*             171 */
+       "IRETURN        ", /*             172 */
+       "LRETURN        ", /*             173 */
+       "FRETURN        ", /*             174 */
+       "DRETURN        ", /*             175 */
+       "ARETURN        ", /*             176 */
+       "RETURN         ", /*             177 */
+       "GETSTATIC      ", /*             178 */
+       "PUTSTATIC      ", /*             179 */
+       "GETFIELD       ", /*             180 */
+       "PUTFIELD       ", /*             181 */
+       "INVOKEVIRTUAL  ", /*             182 */
+       "INVOKESPECIAL  ", /*             183 */
+       "INVOKESTATIC   ", /*             184 */
+       "INVOKEINTERFACE", /*             185 */
+       "UNDEF186       ", /*             186 */
+       "NEW            ", /*             187 */
+       "NEWARRAY       ", /*             188 */
+       "ANEWARRAY      ", /*             189 */
+       "ARRAYLENGTH    ", /*             190 */
+       "ATHROW         ", /*             191 */
+       "CHECKCAST      ", /*             192 */
+       "INSTANCEOF     ", /*             193 */
+       "MONITORENTER   ", /*             194 */
+       "MONITOREXIT    ", /*             195 */
+       "WIDE           ", /* WIDE        196 */
+       "MULTIANEWARRAY ", /*             197 */
+       "IFNULL         ", /*             198 */
+       "IFNONNULL      ", /*             199 */
+       "GOTO_W         ", /* GOTO_W      200 */
+       "JSR_W          ", /* JSR_W       201 */
+       "BREAKPOINT     ", /* BREAKPOINT  202 */
+
+                               "UNDEF203", "UNDEF204", "UNDEF205",
+       "UNDEF206", "UNDEF207", "UNDEF208", "UNDEF209", "UNDEF210",
+       "UNDEF211", "UNDEF212", "UNDEF213", "UNDEF214", "UNDEF215",
+       "UNDEF216", "UNDEF217", "UNDEF218", "UNDEF219", "UNDEF220",
+       "UNDEF221", "UNDEF222", "UNDEF223", "UNDEF224", "UNDEF225",
+       "UNDEF226", "UNDEF227", "UNDEF228", "UNDEF229", "UNDEF230",
+       "UNDEF231", "UNDEF232", "UNDEF233", "UNDEF234", "UNDEF235",
+       "UNDEF236", "UNDEF237", "UNDEF238", "UNDEF239", "UNDEF240",
+       "UNDEF241", "UNDEF242", "UNDEF243", "UNDEF244", "UNDEF245",
+       "UNDEF246", "UNDEF247", "UNDEF248", "UNDEF249", "UNDEF250",
+       "UNDEF251", "UNDEF252", "UNDEF253", "UNDEF254", "UNDEF255"
 };
 
 
@@ -1297,6 +1220,19 @@ static int builtintablelen;
 #endif /* USEBUILTINTABLE */
 
 
+
+#define EXTABLEN
+/*     \
+        { \
+                printf("PARSE method name ="); \
+                utf_display(m->class->name); \
+                printf("."); \
+                method_display(m); \
+               printf("        exceptiontablelength %d\n",m->exceptiontablelength);    \
+                fflush(stdout); \
+        }
+*/
+
 /*****************************************************************************
                                                 TABLE OF BUILTIN FUNCTIONS
 
@@ -1355,6 +1291,25 @@ builtin_descriptor builtin_desc[] = {
                     SUPPORT_FLOAT && SUPPORT_FICVT,true ,"f2i"},
        {ICMD_D2I  , BUILTIN_d2i  ,ICMD_BUILTIN1,TYPE_DOUBLE,TYPE_VOID  ,TYPE_VOID ,TYPE_INT   ,
                     SUPPORT_DOUBLE && SUPPORT_FICVT,true ,"d2i"},
+
+       { ICMD_FADD , BUILTIN_fadd  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fadd"  },
+       { ICMD_FSUB , BUILTIN_fsub  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fsub"  },
+       { ICMD_FMUL , BUILTIN_fmul  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fmul"  },
+       { ICMD_FDIV , BUILTIN_fdiv  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fdiv"  },
+       { ICMD_FNEG , BUILTIN_fneg  , ICMD_BUILTIN1, TYPE_FLT, TYPE_VOID , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fneg"  },
+       { ICMD_FCMPL, BUILTIN_fcmpl , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_INT, SUPPORT_FLOAT, true, "fcmpl" },
+       { ICMD_FCMPG, BUILTIN_fcmpg , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_INT, SUPPORT_FLOAT, true, "fcmpg" },
+
+       { ICMD_DADD , BUILTIN_dadd  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dadd"  },
+       { ICMD_DSUB , BUILTIN_dsub  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dsub"  },
+       { ICMD_DMUL , BUILTIN_dmul  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dmul"  },
+       { ICMD_DDIV , BUILTIN_ddiv  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "ddiv"  },
+       { ICMD_DNEG , BUILTIN_dneg  , ICMD_BUILTIN1, TYPE_DBL, TYPE_VOID , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dneg"  },
+       { ICMD_DCMPL, BUILTIN_dcmpl , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_INT, SUPPORT_DOUBLE, true, "dcmpl" },
+       { ICMD_DCMPG, BUILTIN_dcmpg , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_INT, SUPPORT_DOUBLE, true, "dcmpg" },
+
+       { ICMD_F2D,  BUILTIN_f2d  , ICMD_BUILTIN1, TYPE_FLT, TYPE_VOID , TYPE_VOID , TYPE_DBL, SUPPORT_FLOAT && SUPPORT_DOUBLE, true, "f2d" },
+       { ICMD_D2F,  BUILTIN_d2f  , ICMD_BUILTIN1, TYPE_DBL, TYPE_VOID , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT && SUPPORT_DOUBLE, true, "d2f" },
 #endif
 
        /* this record marks the end of the automatically replaced opcodes */
@@ -1383,8 +1338,10 @@ builtin_descriptor builtin_desc[] = {
        {255,BUILTIN_newarray_short  ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_short"},
        {255,BUILTIN_newarray_int    ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_int"},
        {255,BUILTIN_newarray_long   ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_long"},
+#if defined(USE_THREADS)
        {255,BUILTIN_monitorenter    ,ICMD_BUILTIN1,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_VOID  ,0,0,"monitorenter"},
        {255,BUILTIN_monitorexit     ,ICMD_BUILTIN1,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_VOID  ,0,0,"monitorexit"},
+#endif
 #if !SUPPORT_DIVISION
        {255,BUILTIN_idiv            ,ICMD_BUILTIN2,TYPE_INT   ,TYPE_INT   ,TYPE_VOID  ,TYPE_INT   ,0,0,"idiv"},
        {255,BUILTIN_irem            ,ICMD_BUILTIN2,TYPE_INT   ,TYPE_INT   ,TYPE_VOID  ,TYPE_INT   ,0,0,"irem"},
@@ -1400,15 +1357,12 @@ builtin_descriptor builtin_desc[] = {
        {  0,NULL,0,0,0,0,0,0,0,"<END>"}
 };
 
-/* include compiler subsystems ************************************************/
-
-/* from codegen.inc */
-extern int dseglen;
 
+/* include compiler subsystems ************************************************/
 
 /* dummy function, used when there is no JavaVM code available                */
 
-static void* do_nothing_function()
+static functionptr do_nothing_function()
 {
        return NULL;
 }
@@ -1416,198 +1370,338 @@ static void* do_nothing_function()
 
 /* jit_compile *****************************************************************
 
-       jit_compile, new version of compiler, translates one method to machine code
+   jit_compile, new version of compiler, translates one method to machine code
 
 *******************************************************************************/
 
-#if 0
-#define LOG_STEP(step)                                                                                 \
-       if (compileverbose) {                                                                           \
-               char logtext[MAXLOGTEXT];                                                               \
-               sprintf(logtext, "%s: ",step);                                                  \
-               utf_sprint(logtext+strlen(logtext), m->class->name);    \
-               strcpy(logtext+strlen(logtext), ".");                                   \
-               utf_sprint(logtext+strlen(logtext), m->name);                   \
-               utf_sprint(logtext+strlen(logtext), m->descriptor);             \
-               log_text(logtext);                                                                              \
-       }
-#else
-#define LOG_STEP(step)
-#endif
+static functionptr jit_compile_intern(methodinfo *m, codegendata *cd,
+                                                                         registerdata *rd, loopdata *ld,
+                                                                         t_inlining_globals *id);
 
-methodptr jit_compile(methodinfo *m)
+functionptr jit_compile(methodinfo *m)
 {
-       int dumpsize;
-       long starttime = 0;
-       long stoptime  = 0;
+       functionptr         r;
+       codegendata        *cd;
+       registerdata       *rd;
+       loopdata           *ld;
+       t_inlining_globals *id;
+       s4                  dumpsize;
+
+#if defined(STATISTICS)
+       if (opt_stat)
+               count_jit_calls++;
+#endif
+
+       /* this is the case if a native function is called by jni */
+
+       if (m->flags & ACC_NATIVE)
+               return (functionptr) m->stubroutine;
 
-       count_jit_calls++;
+#if defined(USE_THREADS)
+       /* enter a monitor on the method */
+
+       builtin_monitorenter((java_objectheader *) m);
+#endif
 
        /* if method has been already compiled return immediately */
 
-       if (m->entrypoint)
-               return m->entrypoint;
+       if (m->entrypoint) {
+#if defined(USE_THREADS)
+               builtin_monitorexit((java_objectheader *) m);
+#endif
 
-       count_methods++;
+               return m->entrypoint;
+       }
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       pthread_mutex_lock(&compiler_mutex);
+#if defined(STATISTICS)
+       if (opt_stat)
+               count_methods++;
 #endif
 
-       intsDisable();      /* disable interrupts */
+       /* if there is no javacode, print error message and return empty method   */
+
+       if (!m->jcode) {
+               if (compileverbose)
+                       log_message_method("No code given for: ", m);
+
+               m->entrypoint = (functionptr) do_nothing_function;
+
+               return m->entrypoint;    /* return empty method     */
+       }
+
+#if defined(STATISTICS)
+       /* measure time */
 
-       regs_ok = false;
+       if (getcompilingtime)
+               compilingtime_start();
+#endif
 
        /* mark start of dump memory area */
 
        dumpsize = dump_size();
 
+       /* allocate memory */
+
+       cd = DNEW(codegendata);
+       rd = DNEW(registerdata);
+       ld = DNEW(loopdata);
+       id = DNEW(t_inlining_globals);
+
+       /* RTA static analysis must be called before inlining */
+       if (opt_rt)
+               RT_jit_parse(m); /* will be called just once */
+                            /* return value ignored for now */
+       /* XTA static analysis must be called before inlining */
+       if (opt_xta)
+               XTA_jit_parse(m); /* will be called just once */
+                             /* return value ignored for now */
+
+
+       /* must be called before reg_setup, because it can change maxlocals */
+       /* init reqd to initialize for parse even in no inlining */
+       inlining_setup(m, id);
+
+       /* initialize the register allocator */
+       reg_setup(m, rd, id);
+
+       /* setup the codegendata memory */
+       codegen_setup(m, cd, id);
+
+       /* now call internal compile function */
+
+       r = jit_compile_intern(m, cd, rd, ld, id);
+
+       /* free some memory */
+
+       reg_free(m, rd);
+       codegen_free(m, cd);
+
+       /* clear pointers to dump memory area */
+
+       m->basicblocks = NULL;
+       m->basicblockindex = NULL;
+       m->instructions = NULL;
+       m->stack = NULL;
+       /* NO !!! m->exceptiontable = NULL; */
+
+       /* release dump area */
+
+       dump_release(dumpsize);
+
+#if defined(STATISTICS)
        /* measure time */
 
        if (getcompilingtime)
-               starttime = getcputime();
+               compilingtime_stop();
+#endif
 
-       /* if there is no javacode print error message and return empty method    */
+       /* define in options.h; Used in main.c, jit.c & inline.c */
+#ifdef INAFTERMAIN
+       if ((utf_new_char("main") == m->name) && (useinliningm))
+               useinlining = false;
+#endif
 
-       if (!m->jcode) {
-               char logtext[MAXLOGTEXT];
-               sprintf(logtext, "No code given for: ");
-               utf_sprint(logtext+strlen(logtext), m->class->name);
-               strcpy(logtext+strlen(logtext), ".");
-               utf_sprint(logtext+strlen(logtext), m->name);
-               utf_sprint(logtext+strlen(logtext), m->descriptor);
-               log_text(logtext);
-               intsRestore();                             /* enable interrupts again */
-               return (methodptr) do_nothing_function;    /* return empty method     */
+#if defined(USE_THREADS)
+       /* leave the monitor */
+
+       builtin_monitorexit((java_objectheader *) m );
+#endif
+
+       if (r) {
+               if (compileverbose)
+                       log_message_method("Running: ", m);
        }
 
+       /* return pointer to the methods entry point */
+
+       return r;
+}
+
+
+/* jit_compile_intern **********************************************************
+
+   Static internal function which does the actual compilation.
+
+*******************************************************************************/
+
+static functionptr jit_compile_intern(methodinfo *m, codegendata *cd,
+                                                                         registerdata *rd, loopdata *ld,
+                                                                         t_inlining_globals *id)
+{
+#ifdef LSRA
+       bool old_opt_lsra;
+#endif
+
+
        /* print log message for compiled method */
 
-       if (compileverbose) {
-               char logtext[MAXLOGTEXT];
-               sprintf(logtext, "Compiling: ");
-               utf_sprint(logtext+strlen(logtext), m->class->name);
-               strcpy(logtext+strlen(logtext), ".");
-               utf_sprint(logtext+strlen(logtext), m->name);
-               utf_sprint(logtext+strlen(logtext), m->descriptor);
-               log_text(logtext);
-       }
+       if (compileverbose)
+               log_message_method("Compiling: ", m);
 
-       /* initialize the function's class */
-       if (!m->class->initialized) {
-               if (initverbose) {
-                       char logtext[MAXLOGTEXT];
-                       sprintf(logtext, "Initialize class ");
-                       utf_sprint(logtext + strlen(logtext), m->class->name);
-                       log_text(logtext);
-               }
-               class_init(m->class);
+       /* initialize the static function's class */
+
+       if (m->flags & ACC_STATIC && !m->class->initialized) {
+               if (initverbose)
+                       log_message_class("Initialize class ", m->class);
+
+               if (!class_init(m->class))
+                       return NULL;
        }
 
        /* initialisation of variables and subsystems */
 
-       isleafmethod = true;
+       m->isleafmethod = true;
 
-       method = m;
-       class = m->class;
-       descriptor = m->descriptor;
-       maxstack = m->maxstack;
-       maxlocals = m->maxlocals;
-       jcodelength = m->jcodelength;
-       jcode = m->jcode;
-       exceptiontablelength = m->exceptiontablelength;
-       raw_extable = m->exceptiontable;
-
-#ifdef STATISTICS
-       count_tryblocks += exceptiontablelength;
-       count_javacodesize += jcodelength + 18;
-       count_javaexcsize += exceptiontablelength * POINTERSIZE;
+#if defined(STATISTICS)
+       if (opt_stat) {
+               count_tryblocks += m->exceptiontablelength;
+               count_javacodesize += m->jcodelength + 18;
+               count_javaexcsize += m->exceptiontablelength * POINTERSIZE;
+       }
 #endif
 
        /* initialise parameter type descriptor */
 
        descriptor2types(m);
-       mreturntype = m->returntype;
-       mparamcount = m->paramcount;
-       mparamtypes = m->paramtypes;
-
-#if defined(__I386__)
-       method_uses_ecx = true;
-       method_uses_edx = false;
-#endif
 
        /* call the compiler passes ***********************************************/
 
-       /* must be called before reg_init, because it can change maxlocals */
-       if (useinlining)
-               inlining_init(m);
+       if (compileverbose)
+               log_message_method("Parsing: ", m);
 
-       reg_setup();
+       /* call parse pass */
+       if (!parse(m, cd, id)) {
+               if (compileverbose)
+                       log_message_method("Exception while parsing: ", m);
 
-       codegen_init();
+               return NULL;
+       }
+
+       if (compileverbose) {
+               log_message_method("Parsing done: ", m);
+               log_message_method("Analysing: ", m);
+       }
+
+       /* call stack analysis pass */
+       if (!analyse_stack(m, cd, rd)) {
+               if (compileverbose)
+                       log_message_method("Exception while analysing: ", m);
+
+               return NULL;
+       }
+
+       if (compileverbose)
+               log_message_method("Analysing done: ", m);
 
-       parse();
-       analyse_stack();
-   
 #ifdef CACAO_TYPECHECK
        if (opt_verify) {
-               LOG_STEP("Typechecking");
-               typecheck();
-               LOG_STEP("Done typechecking");
+               if (compileverbose)
+                       log_message_method("Typechecking: ", m);
+
+               /* call typecheck pass */
+               if (!typecheck(m, cd, rd)) {
+                       if (compileverbose)
+                               log_message_method("Exception while typechecking: ", m);
+
+                       return NULL;
+               }
+
+               if (compileverbose)
+                       log_message_method("Typechecking done: ", m);
        }
 #endif
-       
+
        if (opt_loops) {
-               depthFirst();
-               analyseGraph();
-               optimize_loops();
+               depthFirst(m, ld);
+               analyseGraph(m, ld);
+               optimize_loops(m, cd, ld);
        }
    
 #ifdef SPECIALMEMUSE
-       preregpass();
+       preregpass(m, rd);
 #endif
 
-       LOG_STEP("Regalloc");
-       regalloc();
-       regs_ok = true;
-
-       LOG_STEP("Codegen");
-       codegen();
+       if (compileverbose)
+               log_message_method("Allocating registers: ", m);
+
+       /* allocate registers */
+#ifdef LSRA
+       old_opt_lsra=opt_lsra;
+       if (opt_lsra) {
+               if (!lsra(m, cd, rd, id)) {
+                       opt_lsra = false;
+/*                     log_message_method("Regalloc Fallback: ", m); */
+                       regalloc( m, cd, rd );
+               } else {
+#ifdef STATISTICS
+                       if (opt_stat) count_methods_allocated_by_lsra++;
+#endif
+/*                     log_message_method("Regalloc LSRA: ", m); */
+               }
+       }
+       else
+#endif
+       {
+#ifdef STATISTICS
+               if (opt_stat)
+#ifdef LSRA
+                       if (!opt_lsra)
+#endif         
+                               count_locals_conflicts += (cd->maxlocals-1)*(cd->maxlocals);
+#endif         
+               regalloc(m, cd, rd);
+       }
 
-       /* intermediate and assembly code listings ********************************/
-               
-       if (showintermediate)
-               show_icmd_method();
-       else if (showdisassemble)
-               disassemble((void*) (m->mcode + dseglen), m->mcodelength - dseglen);
+#ifdef STATISTICS
+       if (opt_stat)
+               reg_make_statistics(m, cd, rd);
+#endif
 
-       if (showddatasegment)
-               dseg_display((void*) (m->mcode));
+       if (compileverbose) {
+               log_message_method("Allocating registers done: ", m);
+               log_message_method("Generating code: ", m);
+       }
 
-       /* release dump area */
+       /* now generate the machine code */
+       codegen(m, cd, rd);
 
-       dump_release(dumpsize);
+       if (compileverbose)
+               log_message_method("Generating code done: ", m);
 
-       /* measure time */
+       /* intermediate and assembly code listings */
+               
+       if (showintermediate) {
+               show_icmd_method(m, cd, rd);
 
-       if (getcompilingtime) {
-               stoptime = getcputime();
-               compilingtime += (stoptime - starttime);
+       } else if (showdisassemble) {
+               disassemble((void *) ((long) m->mcode + cd->dseglen), 
+                                       m->mcodelength - cd->dseglen);
        }
 
-       intsRestore();    /* enable interrupts again */
+       if (showddatasegment)
+               dseg_display(m, cd);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       pthread_mutex_unlock(&compiler_mutex);
-#endif
+       if (compileverbose)
+               log_message_method("Compiling done: ", m);
 
+#ifdef LSRA
+       opt_lsra=old_opt_lsra;
+#endif
        /* return pointer to the methods entry point */
-       
-       LOG_STEP("Done compiling");
+
        return m->entrypoint;
 } 
 
 
+void compile_all_class_methods(classinfo *c)
+{
+       s4 i;
+
+       for (i = 0; i < c->methodscount; i++) {
+               (void) jit_compile(&(c->methods[i]));
+       }
+}
+
 
 /* functions for compiler initialisation and finalisation *********************/
 
@@ -1663,7 +1757,7 @@ builtin_descriptor *find_builtin(int icmd)
 
 void jit_init()
 {
-       int i;
+       s4 i;
 
 #ifdef USEBUILTINTABLE
        sort_builtintable();
@@ -1754,16 +1848,13 @@ void jit_init()
        stackreq[JAVA_DUP2_X1] = 3;
        stackreq[JAVA_DUP2_X2] = 4;
 
-       reg_init();
-       init_exceptions();
+       /* initialize the codegen stuff */
+       codegen_init();
 }
 
 
-
 void jit_close()
 {
-       codegen_close();
-       reg_close();
 }