Unified variables changes for common/i386.
[cacao.git] / src / vm / jit / show.c
index a66c6de3d71d09e1b46f9f941136553ae7a0e6ca..937bf46132fd47d4f0324ea43fe1d880ff7521a4 100644 (file)
@@ -55,6 +55,7 @@
 #include "vm/jit/jit.h"
 #include "vm/jit/show.h"
 #include "vm/jit/disass.h"
+#include "vm/jit/stack.h"
 
 
 /* global variables ***********************************************************/
@@ -64,6 +65,13 @@ static java_objectheader *show_global_lock;
 #endif
 
 
+/* forward declarations *******************************************************/
+
+#if !defined(NDEBUG)
+static void new_show_variable_array(jitdata *jd, s4 *vars, int n, int stage);
+#endif
+
+
 /* show_init *******************************************************************
 
    Initialized the show subsystem (called by jit_init).
@@ -88,214 +96,6 @@ bool show_init(void)
 #endif
 
 
-/* show_print_stack ************************************************************
-
-   Print the stack representation starting with the given top stackptr.
-
-   NOTE: Currently this function may only be called after register allocation!
-
-*******************************************************************************/
-
-#if !defined(NDEBUG)
-static void show_print_stack(codegendata *cd, stackptr s)
-{
-       int i, j;
-       stackptr t;
-
-       i = cd->maxstack;
-       t = s;
-       
-       while (t) {
-               i--;
-               t = t->prev;
-       }
-       j = cd->maxstack - i;
-       while (--i >= 0)
-               printf("    ");
-
-       while (s) {
-               j--;
-               if (s->flags & SAVEDVAR)
-                       switch (s->varkind) {
-                       case TEMPVAR:
-                               if (s->flags & INMEMORY)
-                                       printf(" M%02d", s->regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                               else if (s->type == TYPE_ADR)
-                                       printf(" R%02d", s->regoff);
-#endif
-                               else if (IS_FLT_DBL_TYPE(s->type))
-                                       printf(" F%02d", s->regoff);
-                               else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                       if (IS_2_WORD_TYPE(s->type)) {
-# if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-#  if defined(ENABLE_INTRP)
-                                               if (opt_intrp)
-                                                       printf(" %3d/%3d", GET_LOW_REG(s->regoff),
-                                                                  GET_HIGH_REG(s->regoff));
-                                               else
-#  endif
-                                                       printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
-                                                                  regs[GET_HIGH_REG(s->regoff)]);
-# else
-                                               printf(" %3d/%3d", GET_LOW_REG(s->regoff),
-                                                          GET_HIGH_REG(s->regoff));
-# endif
-                                       } 
-                                       else 
-#endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
-                                               {
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-# if defined(ENABLE_INTRP)
-                                                       if (opt_intrp)
-                                                               printf(" %3d", s->regoff);
-                                                       else
-# endif
-                                                               printf(" %3s", regs[s->regoff]);
-#else
-                                                       printf(" %3d", s->regoff);
-#endif
-                                               }
-                               }
-                               break;
-                       case STACKVAR:
-                               printf(" I%02d", s->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf(" L%02d", s->varnum);
-                               break;
-                       case ARGVAR:
-                               if (s->varnum == -1) {
-                                       /* Return Value                                  */
-                                       /* varkind ARGVAR "misused for this special case */
-                                       printf("  V0");
-                               } 
-                               else /* "normal" Argvar */
-                                       printf(" A%02d", s->varnum);
-                               break;
-                       default:
-                               printf(" !%02d", j);
-                       }
-               else
-                       switch (s->varkind) {
-                       case TEMPVAR:
-                               if (s->flags & INMEMORY)
-                                       printf(" m%02d", s->regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                               else if (s->type == TYPE_ADR)
-                                       printf(" r%02d", s->regoff);
-#endif
-                               else if (IS_FLT_DBL_TYPE(s->type))
-                                       printf(" f%02d", s->regoff);
-                               else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                       if (IS_2_WORD_TYPE(s->type)) {
-# if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-#  if defined(ENABLE_INTRP)
-                                               if (opt_intrp)
-                                                       printf(" %3d/%3d", GET_LOW_REG(s->regoff),
-                                                                  GET_HIGH_REG(s->regoff));
-                                               else
-#  endif
-                                                       printf(" %3s/%3s", regs[GET_LOW_REG(s->regoff)],
-                                                                  regs[GET_HIGH_REG(s->regoff)]);
-# else
-                                               printf(" %3d/%3d", GET_LOW_REG(s->regoff),
-                                                          GET_HIGH_REG(s->regoff));
-# endif
-                                       } 
-                                       else
-#endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
-                                               {
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-# if defined(ENABLE_INTRP)
-                                                       if (opt_intrp)
-                                                               printf(" %3d", s->regoff);
-                                                       else
-# endif
-                                                               printf(" %3s", regs[s->regoff]);
-#else
-                                                       printf(" %3d", s->regoff);
-#endif
-                                               }
-                               }
-                               break;
-                       case STACKVAR:
-                               printf(" i%02d", s->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf(" l%02d", s->varnum);
-                               break;
-                       case ARGVAR:
-                               if (s->varnum == -1) {
-                                       /* Return Value                                  */
-                                       /* varkind ARGVAR "misused for this special case */
-                                       printf("  v0");
-                               } 
-                               else /* "normal" Argvar */
-                               printf(" a%02d", s->varnum);
-                               break;
-                       default:
-                               printf(" ?%02d", j);
-                       }
-               s = s->prev;
-       }
-}
-#endif /* !defined(NDEBUG) */
-
-
-#if 0
-static void print_reg(stackptr s) {
-       if (s) {
-               if (s->flags & SAVEDVAR)
-                       switch (s->varkind) {
-                       case TEMPVAR:
-                               if (s->flags & INMEMORY)
-                                       printf(" tm%02d", s->regoff);
-                               else
-                                       printf(" tr%02d", s->regoff);
-                               break;
-                       case STACKVAR:
-                               printf(" s %02d", s->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf(" l %02d", s->varnum);
-                               break;
-                       case ARGVAR:
-                               printf(" a %02d", s->varnum);
-                               break;
-                       default:
-                               printf(" ! %02d", s->varnum);
-                       }
-               else
-                       switch (s->varkind) {
-                       case TEMPVAR:
-                               if (s->flags & INMEMORY)
-                                       printf(" Tm%02d", s->regoff);
-                               else
-                                       printf(" Tr%02d", s->regoff);
-                               break;
-                       case STACKVAR:
-                               printf(" S %02d", s->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf(" L %02d", s->varnum);
-                               break;
-                       case ARGVAR:
-                               printf(" A %02d", s->varnum);
-                               break;
-                       default:
-                               printf(" ? %02d", s->varnum);
-                       }
-       }
-       else
-               printf("     ");
-               
-}
-#endif
-
-
 #if !defined(NDEBUG)
 static char *jit_type[] = {
        "int",
@@ -333,7 +133,7 @@ void new_show_method(jitdata *jd, int stage)
        m    = jd->m;
        code = jd->code;
        cd   = jd->cd;
-       rd   = jd->new_rd;
+       rd   = jd->rd;
 
        /* We need to enter a lock here, since the binutils disassembler
           is not reentrant-able and we could not read functions printed
@@ -343,7 +143,7 @@ void new_show_method(jitdata *jd, int stage)
 
        /* get the last basic block */
 
-       for (lastbptr = jd->new_basicblocks; lastbptr != NULL; lastbptr = lastbptr->next);
+       for (lastbptr = jd->new_basicblocks; lastbptr->next != NULL; lastbptr = lastbptr->next);
 
        printf("\n");
 
@@ -351,10 +151,12 @@ void new_show_method(jitdata *jd, int stage)
 
        printf("\n(NEW INSTRUCTION FORMAT)\n");
        printf("\nBasic blocks: %d\n", jd->new_basicblockcount);
-       printf("Code length:  %d\n", (lastbptr->mpc - jd->new_basicblocks[0].mpc));
-       printf("Data length:  %d\n", cd->dseglen);
-       printf("Stub length:  %d\n", (s4) (code->mcodelength -
-                                                                          ((ptrint) cd->dseglen + lastbptr->mpc)));
+       if (stage >= SHOW_CODE) {
+               printf("Code length:  %d\n", (lastbptr->mpc - jd->new_basicblocks[0].mpc));
+               printf("Data length:  %d\n", cd->dseglen);
+               printf("Stub length:  %d\n", (s4) (code->mcodelength -
+                                                                                  ((ptrint) cd->dseglen + lastbptr->mpc)));
+       }
        printf("Max locals:   %d\n", cd->maxlocals);
        printf("Max stack:    %d\n", cd->maxstack);
        printf("Line number table length: %d\n", m->linenumbercount);
@@ -383,37 +185,38 @@ void new_show_method(jitdata *jd, int stage)
                printf("   %3d: ", i);
 
 #if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-               for (j = TYPE_INT; j <= TYPE_ADR; j++) {
+/*             for (j = TYPE_INT; j <= TYPE_ADR; j++) { */
 # if defined(ENABLE_INTRP)
                        if (!opt_intrp) {
 # endif
-                               if (rd->locals[i][j].type >= 0) {
-                                       printf("   (%s) ", jit_type[j]);
+/*                             if (rd->locals[i][j].type >= 0) { */
+                                       printf("   (%s) ", jit_type[jd->var[i].type]);
                                        if (stage >= SHOW_REGS) {
-                                               if (rd->locals[i][j].flags & INMEMORY)
-                                                       printf("m%2d", rd->locals[i][j].regoff);
+                                               if (jd->var[i].flags & INMEMORY)
+                                                       printf("m%2d", jd->var[i].regoff);
 # ifdef HAS_ADDRESS_REGISTER_FILE
-                                               else if (j == TYPE_ADR)
-                                                       printf("r%02d", rd->locals[i][j].regoff);
+                                               else if (jd->var[i].type == TYPE_ADR)
+                                                       printf("r%02d", jd->var[i].regoff);
 # endif
-                                               else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                                       printf("f%02d", rd->locals[i][j].regoff);
+                                               else if ((jd->var[i].type == TYPE_FLT) ||
+                                                                (jd->var[i].type == TYPE_DBL))
+                                                       printf("f%02d", jd->var[i].regoff);
                                                else {
 # if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
                                                        if (IS_2_WORD_TYPE(j))
                                                                printf(" %3s/%3s",
-                                                                          regs[GET_LOW_REG(rd->locals[i][j].regoff)],
-                                                                          regs[GET_HIGH_REG(rd->locals[i][j].regoff)]);
+                                                                          regs[GET_LOW_REG(jd->var[i].regoff)],
+                                                                          regs[GET_HIGH_REG(jd->var[i].regoff)]);
                                                        else
 # endif
-                                                               printf("%3s", regs[rd->locals[i][j].regoff]);
+                                                               printf("%3s", regs[jd->var[i].regoff]);
                                                }
                                        }
-                               }
+/*                             } */
 # if defined(ENABLE_INTRP)
                        }
 # endif
-               }
+/*             } */
 #endif /* defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER) */
 
                printf("\n");
@@ -421,90 +224,36 @@ void new_show_method(jitdata *jd, int stage)
        printf("\n");
        }
 
-       if (stage >= SHOW_STACK && rd) {
-#if defined(ENABLE_LSRA) || defined(ENABLE_SSA)
-       if (!opt_lsra) {
-#endif
-#if defined(ENABLE_INTRP)
-               if (!opt_intrp) {
-#endif
-       printf("Interface Table:\n");
-       for (i = 0; i < cd->maxstack; i++) {
-               if ((rd->interfaces[i][0].type >= 0) ||
-                       (rd->interfaces[i][1].type >= 0) ||
-                   (rd->interfaces[i][2].type >= 0) ||
-                       (rd->interfaces[i][3].type >= 0) ||
-                   (rd->interfaces[i][4].type >= 0)) {
-                       printf("   %3d: ", i);
-
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-# if defined(ENABLE_INTRP)
-                       if (!opt_intrp) {
-# endif
-                               for (j = TYPE_INT; j <= TYPE_ADR; j++) {
-                                       if (rd->interfaces[i][j].type >= 0) {
-                                               printf("   (%s) ", jit_type[j]);
-                                               if (stage >= SHOW_REGS) {
-                                                       if (rd->interfaces[i][j].flags & SAVEDVAR) {
-                                                               if (rd->interfaces[i][j].flags & INMEMORY)
-                                                                       printf("M%2d", rd->interfaces[i][j].regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                                                               else if (j == TYPE_ADR)
-                                                                       printf("R%02d", rd->interfaces[i][j].regoff);
-#endif
-                                                               else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                                                       printf("F%02d", rd->interfaces[i][j].regoff);
-                                                               else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                                                       if (IS_2_WORD_TYPE(j))
-                                                                               printf(" %3s/%3s",
-                                                                                          regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
-                                                                                          regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
-                                                                       else
-#endif
-                                                                               printf("%3s",regs[rd->interfaces[i][j].regoff]);
-                                                               }
-                                                       }
-                                                       else {
-                                                               if (rd->interfaces[i][j].flags & INMEMORY)
-                                                                       printf("m%2d", rd->interfaces[i][j].regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                                                               else if (j == TYPE_ADR)
-                                                                       printf("r%02d", rd->interfaces[i][j].regoff);
-#endif
-                                                               else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                                                       printf("f%02d", rd->interfaces[i][j].regoff);
-                                                               else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                                                       if (IS_2_WORD_TYPE(j))
-                                                                               printf(" %3s/%3s",
-                                                                                          regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
-                                                                                          regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
-                                                                       else
-#endif
-                                                                               printf("%3s",regs[rd->interfaces[i][j].regoff]);
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               printf("\n");
-# if defined(ENABLE_INTRP)
-                       }
-# endif
-#endif /* defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER) */
-
+       if (cd->maxlocals > 0) {
+               for (i = 0; i < 5; i++) {
+                       printf("%5s ",jit_type[i]);
+                       for (j = 0; j < cd->maxlocals; j++)
+                               printf("%3i ",jd->local_map[j*5+i]);
+                       printf("\n");
                }
+               printf("\n");
        }
-       printf("\n");
 
-#if defined(ENABLE_INTRP)
+       printf("Interface Table:(In/Outvars)\n");
+       if (cd->maxstack > 0) {
+               bool exist = false;
+               s4 *mapptr = jd->interface_map;
+               
+               /* look if there exist IN/OUTVARS */
+               if (mapptr != NULL) {
+                       for (i = 0; (i < (5 * cd->maxstack)) && !exist; i++, mapptr++)
+                               exist = (*mapptr != UNUSED);
+               
+                       if (exist)
+                               for (i = 0; i < 5; i++) {
+                                       printf("%5s ",jit_type[i]);
+                                       for (j = 0; j < cd->maxstack; j++)
+                                               printf("%3i ",jd->interface_map[j*5+i]);
+                                       printf("\n");
+                               }
+                       printf("\n");
                }
-#endif
-#if defined(ENABLE_LSRA) || defined(ENABLE_SSA)
-       }
-#endif
-       } /* if >= SHOW_STACK */
+       }
 
        if (code->rplpoints) {
                printf("Replacement Points:\n");
@@ -555,239 +304,6 @@ void new_show_method(jitdata *jd, int stage)
 }
 #endif /* !defined(NDEBUG) */
 
-#if !defined(NDEBUG)
-void show_method(jitdata *jd)
-{
-       methodinfo     *m;
-       codeinfo       *code;
-       codegendata    *cd;
-       registerdata   *rd;
-       basicblock     *bptr;
-       basicblock     *lastbptr;
-       exceptiontable *ex;
-       s4              i, j;
-       u1             *u1ptr;
-
-       /* get required compiler data */
-
-       m    = jd->m;
-       code = jd->code;
-       cd   = jd->cd;
-       rd   = jd->rd;
-
-       /* We need to enter a lock here, since the binutils disassembler
-          is not reentrant-able and we could not read functions printed
-          at the same time. */
-
-       LOCK_MONITOR_ENTER(show_global_lock);
-
-       /* get the last basic block */
-
-       for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next)
-               lastbptr = bptr;
-
-       printf("\n");
-
-       method_println(m);
-
-       if (opt_debugcolor) printf("\033[30;m");        /* reset terminal color, this helps less -r, which gets confused else */
-       printf("\nBasic blocks: %d\n", m->basicblockcount);
-       printf("Code length:  %d\n", (lastbptr->mpc - m->basicblocks[0].mpc));
-       printf("Data length:  %d\n", cd->dseglen);
-       printf("Stub length:  %d\n", (s4) (code->mcodelength -
-                                                                          ((ptrint) cd->dseglen + lastbptr->mpc)));
-       printf("Max locals:   %d\n", cd->maxlocals);
-       printf("Max stack:    %d\n", cd->maxstack);
-       printf("Line number table length: %d\n", m->linenumbercount);
-
-       printf("Exceptions (Number: %d):\n", cd->exceptiontablelength);
-       for (ex = cd->exceptiontable; ex != NULL; ex = ex->down) {
-               printf("    L%03d ... ", ex->start->nr );
-               printf("L%03d  = ", ex->end->nr);
-               printf("L%03d", ex->handler->nr);
-               printf("  (catchtype: ");
-               if (ex->catchtype.any)
-                       if (IS_CLASSREF(ex->catchtype))
-                               utf_display_printable_ascii_classname(ex->catchtype.ref->name);
-                       else
-                               utf_display_printable_ascii_classname(ex->catchtype.cls->name);
-               else
-                       printf("ANY");
-               printf(")\n");
-       }
-       
-       printf("Local Table:\n");
-       for (i = 0; i < cd->maxlocals; i++) {
-               printf("   %3d: ", i);
-
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-               for (j = TYPE_INT; j <= TYPE_ADR; j++) {
-# if defined(ENABLE_INTRP)
-                       if (!opt_intrp) {
-# endif
-                               if (rd->locals[i][j].type >= 0) {
-                                       printf("   (%s) ", jit_type[j]);
-                                       if (rd->locals[i][j].flags & INMEMORY)
-                                               printf("m%2d", rd->locals[i][j].regoff);
-# ifdef HAS_ADDRESS_REGISTER_FILE
-                                       else if (j == TYPE_ADR)
-                                               printf("r%02d", rd->locals[i][j].regoff);
-# endif
-                                       else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                               printf("f%02d", rd->locals[i][j].regoff);
-                                       else {
-# if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                               if (IS_2_WORD_TYPE(j))
-                                                       printf(" %3s/%3s",
-                                                                  regs[GET_LOW_REG(rd->locals[i][j].regoff)],
-                                                                  regs[GET_HIGH_REG(rd->locals[i][j].regoff)]);
-                                               else
-# endif
-                                                       printf("%3s", regs[rd->locals[i][j].regoff]);
-                                       }
-                               }
-# if defined(ENABLE_INTRP)
-                       }
-# endif
-               }
-#endif /* defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER) */
-
-               printf("\n");
-       }
-       printf("\n");
-
-#if defined(ENABLE_LSRA) || defined(ENABLE_SSA)
-       if (!opt_lsra) {
-#endif
-#if defined(ENABLE_INTRP)
-               if (!opt_intrp) {
-#endif
-       printf("Interface Table:\n");
-       for (i = 0; i < cd->maxstack; i++) {
-               if ((rd->interfaces[i][0].type >= 0) ||
-                       (rd->interfaces[i][1].type >= 0) ||
-                   (rd->interfaces[i][2].type >= 0) ||
-                       (rd->interfaces[i][3].type >= 0) ||
-                   (rd->interfaces[i][4].type >= 0)) {
-                       printf("   %3d: ", i);
-
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-# if defined(ENABLE_INTRP)
-                       if (!opt_intrp) {
-# endif
-                               for (j = TYPE_INT; j <= TYPE_ADR; j++) {
-                                       if (rd->interfaces[i][j].type >= 0) {
-                                               printf("   (%s) ", jit_type[j]);
-                                               if (rd->interfaces[i][j].flags & SAVEDVAR) {
-                                                       if (rd->interfaces[i][j].flags & INMEMORY)
-                                                               printf("M%2d", rd->interfaces[i][j].regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                                                       else if (j == TYPE_ADR)
-                                                               printf("R%02d", rd->interfaces[i][j].regoff);
-#endif
-                                                       else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                                               printf("F%02d", rd->interfaces[i][j].regoff);
-                                                       else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                                               if (IS_2_WORD_TYPE(j))
-                                                                       printf(" %3s/%3s",
-                                                                                  regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
-                                                                                  regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
-                                                               else
-#endif
-                                                                       printf("%3s",regs[rd->interfaces[i][j].regoff]);
-                                                       }
-                                               }
-                                               else {
-                                                       if (rd->interfaces[i][j].flags & INMEMORY)
-                                                               printf("m%2d", rd->interfaces[i][j].regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                                                       else if (j == TYPE_ADR)
-                                                               printf("r%02d", rd->interfaces[i][j].regoff);
-#endif
-                                                       else if ((j == TYPE_FLT) || (j == TYPE_DBL))
-                                                               printf("f%02d", rd->interfaces[i][j].regoff);
-                                                       else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                                               if (IS_2_WORD_TYPE(j))
-                                                                       printf(" %3s/%3s",
-                                                                                  regs[GET_LOW_REG(rd->interfaces[i][j].regoff)],
-                                                                                  regs[GET_HIGH_REG(rd->interfaces[i][j].regoff)]);
-                                                               else
-#endif
-                                                                       printf("%3s",regs[rd->interfaces[i][j].regoff]);
-                                                       }
-                                               }
-                                       }
-                               }
-                               printf("\n");
-# if defined(ENABLE_INTRP)
-                       }
-# endif
-#endif /* defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER) */
-
-               }
-       }
-       printf("\n");
-
-#if defined(ENABLE_INTRP)
-               }
-#endif
-#if defined(ENABLE_LSRA) || defined(ENABLE_SSA)
-       }
-#endif
-
-       if (code->rplpoints) {
-               printf("Replacement Points:\n");
-               replace_show_replacement_points(code);
-               printf("\n");
-       }
-
-#if defined(ENABLE_DISASSEMBLER)
-       /* show code before first basic block */
-
-       if (JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd)) {
-               u1ptr = (u1 *) ((ptrint) code->mcode + cd->dseglen);
-
-               for (; u1ptr < (u1 *) ((ptrint) code->mcode + cd->dseglen + m->basicblocks[0].mpc);)
-                       DISASSINSTR(u1ptr);
-
-               printf("\n");
-       }
-#endif
-
-       /* show code of all basic blocks */
-
-       for (bptr = m->basicblocks; bptr != NULL; bptr = bptr->next)
-               show_basicblock(jd, bptr);
-
-#if defined(ENABLE_DISASSEMBLER)
-       /* show stubs code */
-
-       if (JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd) && opt_showexceptionstubs) {
-               if (opt_debugcolor) printf("\033[32m"); /* green */
-               printf("\nStubs code:\n");
-               printf("Length: %d\n\n", (s4) (code->mcodelength -
-                                                                          ((ptrint) cd->dseglen + lastbptr->mpc)));
-
-               u1ptr = (u1 *) ((ptrint) code->mcode + cd->dseglen + lastbptr->mpc);
-
-               for (; (ptrint) u1ptr < ((ptrint) code->mcode + code->mcodelength);)
-                       DISASSINSTR(u1ptr);
-
-               if (opt_debugcolor) printf("\033[m");
-               printf("\n");
-       }
-#endif
-
-       LOCK_MONITOR_EXIT(show_global_lock);
-
-       /* finally flush the output */
-
-       fflush(stdout);
-}
-#endif /* !defined(NDEBUG) */
-
 
 /* show_basicblock *************************************************************
 
@@ -805,7 +321,7 @@ void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
        codegendata *cd;
        s4           i;
        bool         deadcode;
-       new_instruction *iptr;
+       instruction *iptr;
        u1          *u1ptr;
 
        /* get required compiler data */
@@ -842,7 +358,13 @@ void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
 
                printf("]):\n");
 
-               iptr = /*XXX*/ (new_instruction *) bptr->iinstr;
+               if (stage >= SHOW_STACK) {
+                       printf("IN:  ");
+                       new_show_variable_array(jd, bptr->invars, bptr->indepth, stage);
+                       printf("\n");
+               }
+
+               iptr = bptr->iinstr;
 
                for (i = 0; i < bptr->icount; i++, iptr++) {
                        printf("%4d:  ", iptr->line);
@@ -851,100 +373,16 @@ void new_show_basicblock(jitdata *jd, basicblock *bptr, int stage)
                        printf("\n");
                }
 
-#if defined(ENABLE_DISASSEMBLER)
-               if ((stage >= SHOW_CODE) && JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd) &&
-                       (!deadcode)) {
-                       printf("\n");
-                       u1ptr = (u1 *) (code->mcode + cd->dseglen + bptr->mpc);
-
-                       if (bptr->next != NULL) {
-                               for (; u1ptr < (u1 *) (code->mcode + cd->dseglen + bptr->next->mpc);)
-                                       DISASSINSTR(u1ptr);
-
-                       } 
-                       else {
-                               for (; u1ptr < (u1 *) (code->mcode + code->mcodelength);)
-                                       DISASSINSTR(u1ptr); 
-                       }
-                       printf("\n");
-               }
-#endif
-       }
-}
-#endif /* !defined(NDEBUG) */
-
-#if !defined(NDEBUG)
-void show_basicblock(jitdata *jd, basicblock *bptr)
-{
-       methodinfo  *m;
-       codeinfo    *code;
-       codegendata *cd;
-       s4           i, j;
-       bool         deadcode;
-       instruction *iptr;
-       u1          *u1ptr;
-
-       /* get required compiler data */
-
-       m    = jd->m;
-       code = jd->code;
-       cd   = jd->cd;
-
-       if (bptr->flags != BBDELETED) {
-               deadcode = bptr->flags <= BBREACHED;
-
-               printf("[");
-
-               if (deadcode)
-                       for (j = cd->maxstack; j > 0; j--)
-                               printf(" ?  ");
-               else
-                       show_print_stack(cd, bptr->instack);
-
-               printf("] %sL%03d(flags: %d, bitflags: %01x, next: %d, type: ",
-                               (bptr->bitflags & BBFLAG_REPLACEMENT) ? "<REPLACE> " : "",
-                          bptr->nr, bptr->flags, bptr->bitflags, 
-                          (bptr->next) ? (bptr->next->nr) : -1);
-
-               switch (bptr->type) {
-               case BBTYPE_STD:
-                       printf("STD");
-                       break;
-               case BBTYPE_EXH:
-                       printf("EXH");
-                       break;
-               case BBTYPE_SBR:
-                       printf("SBR");
-                       break;
-               }
-
-               printf(", instruction count: %d, predecessors: %d [ ",
-                          bptr->icount, bptr->predecessorcount);
-
-               for (i = 0; i < bptr->predecessorcount; i++)
-                       printf("%d ", bptr->predecessors[i]->nr);
-
-               printf("]):\n");
-
-               iptr = bptr->iinstr;
-
-               for (i = 0; i < bptr->icount; i++, iptr++) {
-                       printf("[");
-
-                       if (deadcode)
-                               for (j = cd->maxstack; j > 0; j--)
-                                       printf(" ?  ");
-                       else
-                               show_print_stack(cd, iptr->dst);
-
-                       printf("] %5d (line: %5d)  ", i, iptr->line);
-
-                       show_icmd(iptr, deadcode);
+               if (stage >= SHOW_STACK) {
+                       printf("OUT: ");
+                       new_show_variable_array(jd, bptr->outvars, bptr->outdepth, stage);
                        printf("\n");
                }
 
 #if defined(ENABLE_DISASSEMBLER)
-               if (JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd) && (!deadcode)) {
+               if ((stage >= SHOW_CODE) && JITDATA_HAS_FLAG_SHOWDISASSEMBLE(jd) &&
+                       (!deadcode)) 
+               {
                        printf("\n");
                        u1ptr = (u1 *) (code->mcode + cd->dseglen + bptr->mpc);
 
@@ -1061,195 +499,144 @@ void show_basicblock(jitdata *jd, basicblock *bptr)
         }
 
 #define SHOW_STACKVAR(sp)                                            \
-        new_show_stackvar(jd, (sp), stage)
+       new_show_stackvar(jd, (sp), stage)
 
 #define SHOW_S1(iptr)                                                \
         if (stage >= SHOW_STACK) {                                   \
-            SHOW_STACKVAR(iptr->s1.var);                             \
+            SHOW_STACKVAR(iptr->s1.varindex);                   \
         }
 
 #define SHOW_S2(iptr)                                                \
         if (stage >= SHOW_STACK) {                                   \
-            SHOW_STACKVAR(iptr->sx.s23.s2.var);                      \
+            SHOW_STACKVAR(iptr->sx.s23.s2.varindex);                    \
         }
 
 #define SHOW_S3(iptr)                                                \
-        if (stage >= SHOW_STACK) {                                   \
-            SHOW_STACKVAR(iptr->sx.s23.s3.var);                      \
-        }
+       if (stage >= SHOW_STACK) {                                                                               \
+               SHOW_STACKVAR(iptr->sx.s23.s3.varindex);                                         \
+       }
 
 #define SHOW_DST(iptr)                                               \
-        if (stage >= SHOW_STACK) {                                   \
-            printf("=> ");                                           \
-            SHOW_STACKVAR(iptr->dst.var);                            \
-        }
+       if (stage >= SHOW_STACK) {                                                                               \
+               printf("=> ");                                                                                           \
+               SHOW_STACKVAR(iptr->dst.varindex);                                                       \
+       }
 
 #define SHOW_S1_LOCAL(iptr)                                          \
-        if (stage >= SHOW_STACK) {                                   \
-            printf("L%d ", iptr->s1.localindex);                     \
-        }
+       if (stage >= SHOW_STACK) {                                                                               \
+               printf("L%d ", iptr->s1.varindex);                                                       \
+       }
 
 #define SHOW_DST_LOCAL(iptr)                                         \
-        if (stage >= SHOW_STACK) {                                   \
-            printf("=> L%d ", iptr->dst.localindex);                 \
-        }
+       if (stage >= SHOW_STACK) {                                                                               \
+               printf("=> L%d ", iptr->dst.varindex);                                           \
+       }
 
-static void new_show_stackvar(jitdata *jd, stackptr sp, int stage)
+static void new_show_stackvar(jitdata *jd, s4 index, int stage)
 {
        char type;
+       varinfo *sp;
+
+       sp = &(jd->var[index]);
 
        switch (sp->type) {
-               case TYPE_INT: type = 'i'; break;
-               case TYPE_LNG: type = 'l'; break;
-               case TYPE_FLT: type = 'f'; break;
-               case TYPE_DBL: type = 'd'; break;
-               case TYPE_ADR: type = 'a'; break;
-               default:       type = '?';
+       case TYPE_INT: type = 'i'; break;
+       case TYPE_LNG: type = 'l'; break;
+       case TYPE_FLT: type = 'f'; break;
+       case TYPE_DBL: type = 'd'; break;
+       case TYPE_ADR: type = 'a'; break;
+       default:       type = '?';
        }
-       printf("S%c%d", type, (int) (sp - jd->new_stack));
+#if 0
+       switch (sp->varkind) {
+       case TEMPVAR: printf("T%c%d", type, (int) (sp - jd->new_stack)); break;
+       case LOCALVAR: printf("L%c%d(T%d)", type, sp->varnum, (int) (sp - jd->new_stack)); break;
+       case STACKVAR: printf("I%c%d(T%d)", type, sp->varnum, (int) (sp - jd->new_stack)); break;
+       case ARGVAR: printf("A%c%d(T%d)", type, sp->varnum, (int) (sp - jd->new_stack)); break;
+       default: printf("?%c%d", type, index); break;
+       }
+#endif
+
+       if (sp->flags & PREALLOC)
+               printf("A");
+       else if (sp->flags & OUTVAR)
+               printf("I");
+       else if (index < jd->localcount)
+               printf("L");
+       else printf("T");
+       printf("%c%d", type, index);
 
        if (stage >= SHOW_REGS) {
                putchar('(');
 
-               if (sp->flags & SAVEDVAR) {
-                       switch (sp->varkind) {
-                       case TEMPVAR:
-                               if (sp->flags & INMEMORY)
-                                       printf("M%02d", sp->regoff);
+               if (sp->flags & INMEMORY)
+                       printf("M%02d", sp->regoff);
 #ifdef HAS_ADDRESS_REGISTER_FILE
-                               else if (sp->type == TYPE_ADR)
-                                       printf("R%02d", sp->regoff);
+               else if (sp->type == TYPE_ADR)
+                       printf("R%02d", sp->regoff);
 #endif
-                               else if (IS_FLT_DBL_TYPE(sp->type))
-                                       printf("F%02d", sp->regoff);
-                               else {
+               else if (IS_FLT_DBL_TYPE(sp->type))
+                       printf("F%02d", sp->regoff);
+               else {
 #if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                       if (IS_2_WORD_TYPE(sp->type)) {
+                       if (IS_2_WORD_TYPE(sp->type)) {
 # if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
 #  if defined(ENABLE_INTRP)
-                                               if (opt_intrp)
-                                                       printf("%3d/%3d", GET_LOW_REG(sp->regoff),
-                                                                  GET_HIGH_REG(sp->regoff));
-                                               else
+                               if (opt_intrp)
+                                       printf("%3d/%3d", GET_LOW_REG(sp->regoff),
+                                                  GET_HIGH_REG(sp->regoff));
+                               else
 #  endif
-                                                       printf("%3s/%3s", regs[GET_LOW_REG(sp->regoff)],
-                                                                  regs[GET_HIGH_REG(sp->regoff)]);
+                                       printf("%3s/%3s", regs[GET_LOW_REG(sp->regoff)],
+                                                  regs[GET_HIGH_REG(sp->regoff)]);
 # else
-                                               printf("%3d/%3d", GET_LOW_REG(sp->regoff),
-                                                          GET_HIGH_REG(sp->regoff));
+                               printf("%3d/%3d", GET_LOW_REG(sp->regoff),
+                                          GET_HIGH_REG(sp->regoff));
 # endif
-                                       
-                                       else 
+                       } 
+                       else 
 #endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
-                                               {
+                               {
 #if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
 # if defined(ENABLE_INTRP)
-                                                       if (opt_intrp)
-                                                               printf("%3d", sp->regoff);
-                                                       else
-# endif
-                                                               printf("%3s", regs[sp->regoff]);
-#else
-                                                       printf("%3d", sp->regoff);
-#endif
-                                               }
-                               }
-                               break;
-                       case STACKVAR:
-                               printf("I%02d", sp->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf("L%02d", sp->varnum);
-                               break;
-                       case ARGVAR:
-                               if (sp->varnum == -1) {
-                                       /* Return Value                                  */
-                                       /* varkind ARGVAR "misused for this special case */
-                                       printf(" V0");
-                               } 
-                               else /* "normal" Argvar */
-                                       printf("A%02d", sp->varnum);
-                               break;
-                       default:
-                               printf("!xx {kind=%d, num=%d}", sp->varkind, sp->varnum);
-                       }
-               }
-               else { /* not SAVEDVAR */
-                       switch (sp->varkind) {
-                       case TEMPVAR:
-                               if (sp->flags & INMEMORY)
-                                       printf("m%02d", sp->regoff);
-#ifdef HAS_ADDRESS_REGISTER_FILE
-                               else if (sp->type == TYPE_ADR)
-                                       printf("r%02d", sp->regoff);
-#endif
-                               else if (IS_FLT_DBL_TYPE(sp->type))
-                                       printf("f%02d", sp->regoff);
-                               else {
-#if defined(SUPPORT_COMBINE_INTEGER_REGISTERS)
-                                       if (IS_2_WORD_TYPE(sp->type)) {
-# if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-#  if defined(ENABLE_INTRP)
-                                               if (opt_intrp)
-                                                       printf("%3d/%3d", GET_LOW_REG(sp->regoff),
-                                                                  GET_HIGH_REG(sp->regoff));
-                                               else
-#  endif
-                                                       printf("%3s/%3s", regs[GET_LOW_REG(sp->regoff)],
-                                                                  regs[GET_HIGH_REG(sp->regoff)]);
-# else
-                                               printf("%3d/%3d", GET_LOW_REG(sp->regoff),
-                                                          GET_HIGH_REG(sp->regoff));
-# endif
-                                       } 
+                                       if (opt_intrp)
+                                               printf("%3d", sp->regoff);
                                        else
-#endif /* defined(SUPPORT_COMBINE_INTEGER_REGISTERS) */
-                                               {
-#if defined(ENABLE_JIT) && defined(ENABLE_DISASSEMBLER)
-# if defined(ENABLE_INTRP)
-                                                       if (opt_intrp)
-                                                               printf("%3d", sp->regoff);
-                                                       else
 # endif
-                                                               printf("%3s", regs[sp->regoff]);
+                                               printf("%3s", regs[sp->regoff]);
 #else
-                                                       printf("%3d", sp->regoff);
+                                       printf("%3d", sp->regoff);
 #endif
-                                               }
                                }
-                               break;
-                       case STACKVAR:
-                               printf("i%02d", sp->varnum);
-                               break;
-                       case LOCALVAR:
-                               printf("l%02d", sp->varnum);
-                               break;
-                       case ARGVAR:
-                               if (sp->varnum == -1) {
-                                       /* Return Value                                  */
-                                       /* varkind ARGVAR "misused for this special case */
-                                       printf(" v0");
-                               } 
-                               else /* "normal" Argvar */
-                               printf("a%02d", sp->varnum);
-                               break;
-                       default:
-                               printf("?xx {kind=%d, num=%d}", sp->varkind, sp->varnum);
-                       }
                }
 
+
                putchar(')');
        }
        putchar(' ');
+       fflush(stdout);
 }
 
-void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
+static void new_show_variable_array(jitdata *jd, s4 *vars, int n, int stage)
+{
+       int i;
+
+       printf("[");
+       for (i=0; i<n; ++i) {
+               if (i)
+                       printf(" ");
+               new_show_stackvar(jd, vars[i], stage);
+       }
+       printf("]");
+}
+
+void new_show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage)
 {
        u2                 opcode;
        branch_target_t   *table;
        lookup_target_t   *lookup;
        constant_FMIref   *fmiref;
-       stackptr          *argp;
+       s4          *argp;
        s4                 i;
 
        /* get the opcode and the condition */
@@ -1456,7 +843,7 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
                                SHOW_S2(iptr);
                        }
                }
-               NEW_INSTRUCTION_GET_FIELDREF(iptr, fmiref);
+               INSTRUCTION_GET_FIELDREF(iptr, fmiref);
                SHOW_FIELD(fmiref);
 
                if (opcode == ICMD_GETSTATIC || opcode == ICMD_GETFIELD) {
@@ -1563,6 +950,8 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
                        argp = iptr->sx.s23.s2.args;
                        i = iptr->s1.argcount;
                        while (i--) {
+                               if ((iptr->s1.argcount - 1 - i) == iptr->sx.s23.s3.bte->md->paramcount)
+                                       printf(" pass-through: ");
                                SHOW_STACKVAR(*(argp++));
                        }
                }
@@ -1577,13 +966,17 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
        case ICMD_INVOKESTATIC:
        case ICMD_INVOKEINTERFACE:
                if (stage >= SHOW_STACK) {
+                       methoddesc *md;
+                       INSTRUCTION_GET_METHODDESC(iptr, md);
                        argp = iptr->sx.s23.s2.args;
                        i = iptr->s1.argcount;
                        while (i--) {
+                               if ((iptr->s1.argcount - 1 - i) == md->paramcount)
+                                       printf(" pass-through: ");
                                SHOW_STACKVAR(*(argp++));
                        }
                }
-               NEW_INSTRUCTION_GET_METHODREF(iptr, fmiref);
+               INSTRUCTION_GET_METHODREF(iptr, fmiref);
                method_methodref_print(fmiref);
                if (fmiref->parseddesc.md->returntype.type != TYPE_VOID) {
                        SHOW_DST(iptr);
@@ -1675,10 +1068,48 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
 
        case ICMD_TABLESWITCH:
                SHOW_S1(iptr);
+               table = iptr->dst.table;
+
+               i = iptr->sx.s23.s3.tablehigh
+                       - iptr->sx.s23.s2.tablelow + 1;
+
+               printf("high=%d low=%d count=%d\n", iptr->sx.s23.s3.tablehigh, iptr->sx.s23.s2.tablelow, i);
+               while (--i >= 0) {
+                       printf("\t\t%d --> ", table - iptr->dst.table);
+                       if (stage >= SHOW_STACK) {
+                               printf("L%03d\n", table->block->nr);
+                       }
+                       else {
+                               printf("insindex %d (L%03d)\n", table->insindex, BLOCK_OF(table->insindex)->nr);
+                       }
+                       table++;
+               }
+
                break;
 
        case ICMD_LOOKUPSWITCH:
                SHOW_S1(iptr);
+
+               printf("count=%d, default=", iptr->sx.s23.s2.lookupcount);
+               if (stage >= SHOW_STACK) {
+                       printf("L%03d\n", iptr->sx.s23.s3.lookupdefault.block->nr);
+               }
+               else {
+                       printf("insindex %d (L%03d)\n", iptr->sx.s23.s3.lookupdefault.insindex, BLOCK_OF(iptr->sx.s23.s3.lookupdefault.insindex)->nr);
+               }
+
+               lookup = iptr->dst.lookup;
+               i = iptr->sx.s23.s2.lookupcount;
+               while (--i >= 0) {
+                       printf("\t\t%d --> ", lookup->value);
+                       if (stage >= SHOW_STACK) {
+                               printf("L%03d\n", lookup->target.block->nr);
+                       }
+                       else {
+                               printf("insindex %d (L%03d)\n", lookup->target.insindex, BLOCK_OF(lookup->target.insindex)->nr);
+                       }
+                       lookup++;
+               }
                break;
 
        case ICMD_ARETURN:
@@ -1690,6 +1121,8 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
                break;
 
        case ICMD_DUP:
+/*     case ICMD_COPY: */
+/*     case ICMD_MOVE: */
                SHOW_S1(iptr);
                SHOW_DST(iptr);
                break;
@@ -1769,501 +1202,10 @@ void new_show_icmd(jitdata *jd, new_instruction *iptr, bool deadcode, int stage)
                break;
 
        }
+       fflush(stdout);
 }
 #endif /* !defined(NDEBUG) */
 
-#if !defined(NDEBUG)
-void show_icmd(instruction *iptr, bool deadcode)
-{
-#if 0
-       u2                 opcode;
-       u2                 condition;
-#endif
-       int j;
-       s4  *s4ptr;
-       void **tptr = NULL;
-       classinfo         *c;
-       fieldinfo         *f;
-       constant_classref *cr;
-       unresolved_field  *uf;
-
-#if 0
-       /* get the opcode and the condition */
-
-       opcode    =  iptr->opc & ICMD_OPCODE_MASK;
-       condition = (iptr->opc & ICMD_CONDITION_MASK) >> 8;
-
-       /* Print the condition for conditional instructions. */
-
-       if (condition != 0)
-               printf(" (condition: %s)", icmd_names[condition]);
-#endif
-
-       printf("%s", icmd_names[iptr->opc]);
-
-       switch (iptr->opc) {
-       case ICMD_IADDCONST:
-       case ICMD_ISUBCONST:
-       case ICMD_IMULCONST:
-       case ICMD_IMULPOW2:
-       case ICMD_IDIVPOW2:
-       case ICMD_IREMPOW2:
-       case ICMD_IANDCONST:
-       case ICMD_IORCONST:
-       case ICMD_IXORCONST:
-       case ICMD_ISHLCONST:
-       case ICMD_ISHRCONST:
-       case ICMD_IUSHRCONST:
-       case ICMD_LSHLCONST:
-       case ICMD_LSHRCONST:
-       case ICMD_LUSHRCONST:
-       case ICMD_ICONST:
-       case ICMD_IASTORECONST:
-       case ICMD_BASTORECONST:
-       case ICMD_CASTORECONST:
-       case ICMD_SASTORECONST:
-               printf(" %d (0x%08x)", iptr->val.i, iptr->val.i);
-               break;
-
-       case ICMD_LADDCONST:
-       case ICMD_LSUBCONST:
-       case ICMD_LMULCONST:
-       case ICMD_LMULPOW2:
-       case ICMD_LDIVPOW2:
-       case ICMD_LREMPOW2:
-       case ICMD_LANDCONST:
-       case ICMD_LORCONST:
-       case ICMD_LXORCONST:
-       case ICMD_LCONST:
-       case ICMD_LASTORECONST:
-#if SIZEOF_VOID_P == 4
-               printf(" %lld (0x%016llx)", iptr->val.l, iptr->val.l);
-#else
-               printf(" %ld (0x%016lx)", iptr->val.l, iptr->val.l);
-#endif
-               break;
-
-       case ICMD_FCONST:
-               printf(" %f (0x%08x)", iptr->val.f, iptr->val.i);
-               break;
-
-       case ICMD_DCONST:
-#if SIZEOF_VOID_P == 4
-               printf(" %g (0x%016llx)", iptr->val.d, iptr->val.l);
-#else
-               printf(" %g (0x%016lx)", iptr->val.d, iptr->val.l);
-#endif
-               break;
-
-       case ICMD_ACONST:
-       case ICMD_AASTORECONST:
-               /* check if this is a constant string or a class reference */
-
-               if (ICMD_ACONST_IS_CLASS(iptr)) {
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               printf(" (NOT RESOLVED) classref = ");
-                               class_classref_print(ICMD_ACONST_UNRESOLVED_CLASSREF(iptr));
-                       }
-                       else {
-                               printf(" class = ");
-                               class_print(ICMD_ACONST_RESOLVED_CLASSINFO(iptr));
-                       }
-               }
-               else {
-                       printf(" %p", iptr->val.a);
-
-                       if (iptr->val.a) {
-                               printf(", String = \"");
-                               utf_display_printable_ascii(javastring_toutf(iptr->val.a, false));
-                               printf("\"");
-                       }
-               }
-               break;
-
-       case ICMD_GETFIELD:
-       case ICMD_PUTFIELD:
-               if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                       uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
-                       printf(" (NOT RESOLVED) ");
-
-                       field_fieldref_print(uf->fieldref);
-               }
-               else {
-                       f = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
-                       printf(" %d, ", f->offset);
-
-                       field_print(f);
-               }
-               break;
-
-       case ICMD_PUTSTATIC:
-       case ICMD_GETSTATIC:
-               if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                       uf = INSTRUCTION_UNRESOLVED_FIELD(iptr);
-                       printf(" (NOT RESOLVED) ");
-
-                       field_fieldref_print(uf->fieldref);
-               }
-               else {
-                       f = INSTRUCTION_RESOLVED_FIELDINFO(iptr);
-                       if (!CLASS_IS_OR_ALMOST_INITIALIZED(f->class))
-                               printf(" (NOT INITIALIZED) ");
-                       else
-                               printf(" ");
-
-                       field_print(f);
-               }
-               break;
-
-       case ICMD_PUTSTATICCONST:
-       case ICMD_PUTFIELDCONST:
-               switch (iptr[1].op1) {
-               case TYPE_INT:
-                       printf(" %d (0x%08x),", iptr->val.i, iptr->val.i);
-                       break;
-               case TYPE_LNG:
-#if SIZEOF_VOID_P == 4
-                       printf(" %lld (0x%016llx),", iptr->val.l, iptr->val.l);
-#else
-                       printf(" %ld (0x%016lx),", iptr->val.l, iptr->val.l);
-#endif
-                       break;
-               case TYPE_ADR:
-                       printf(" %p,", iptr->val.a);
-                       break;
-               case TYPE_FLT:
-                       printf(" %g (0x%08x),", iptr->val.f, iptr->val.i);
-                       break;
-               case TYPE_DBL:
-#if SIZEOF_VOID_P == 4
-                       printf(" %g (0x%016llx),", iptr->val.d, iptr->val.l);
-#else
-                       printf(" %g (0x%016lx),", iptr->val.d, iptr->val.l);
-#endif
-                       break;
-               }
-
-               if (INSTRUCTION_IS_UNRESOLVED(iptr + 1)) {
-                       uf = INSTRUCTION_UNRESOLVED_FIELD(iptr + 1);
-                       printf(" (NOT RESOLVED) ");
-                       field_fieldref_print(uf->fieldref);
-               }
-               else {
-                       f = INSTRUCTION_RESOLVED_FIELDINFO(iptr + 1);
-                       if ((iptr->opc == ICMD_PUTSTATICCONST) &&
-                               !CLASS_IS_OR_ALMOST_INITIALIZED(f->class))
-                               printf(" (NOT INITIALIZED), ");
-                       else
-                               printf(" %d, ", f->offset);
-                       field_print(f);
-               }
-               break;
-
-       case ICMD_IINC:
-#if defined(ENABLE_SSA)
-               printf(" %d + %d -> %d", iptr->op1, iptr->val._i.i, iptr->val._i.op1_t);
-#else
-               printf(" %d + %d", iptr->op1, iptr->val.i);
-#endif
-               break;
-
-       case ICMD_IASTORE:
-       case ICMD_SASTORE:
-       case ICMD_BASTORE:
-       case ICMD_CASTORE:
-       case ICMD_LASTORE:
-       case ICMD_DASTORE:
-       case ICMD_FASTORE:
-       case ICMD_AASTORE:
-
-       case ICMD_IALOAD:
-       case ICMD_SALOAD:
-       case ICMD_BALOAD:
-       case ICMD_CALOAD:
-       case ICMD_LALOAD:
-       case ICMD_DALOAD:
-       case ICMD_FALOAD:
-       case ICMD_AALOAD:
-               if (iptr->op1 != 0)
-                       printf("(opt.)");
-               break;
-
-       case ICMD_RET:
-       case ICMD_ILOAD:
-       case ICMD_LLOAD:
-       case ICMD_FLOAD:
-       case ICMD_DLOAD:
-       case ICMD_ALOAD:
-       case ICMD_ISTORE:
-       case ICMD_LSTORE:
-       case ICMD_FSTORE:
-       case ICMD_DSTORE:
-       case ICMD_ASTORE:
-               printf(" %d", iptr->op1);
-               break;
-
-       case ICMD_NEW:
-               c = iptr->val.a;
-               printf(" ");
-               utf_display_printable_ascii_classname(c->name);
-               break;
-
-       case ICMD_NEWARRAY:
-               switch (iptr->op1) {
-               case 4:
-                       printf(" boolean");
-                       break;
-               case 5:
-                       printf(" char");
-                       break;
-               case 6:
-                       printf(" float");
-                       break;
-               case 7:
-                       printf(" double");
-                       break;
-               case 8:
-                       printf(" byte");
-                       break;
-               case 9:
-                       printf(" short");
-                       break;
-               case 10:
-                       printf(" int");
-                       break;
-               case 11:
-                       printf(" long");
-                       break;
-               }
-               break;
-
-       case ICMD_ANEWARRAY:
-               if (iptr->op1) {
-                       c = iptr->val.a;
-                       printf(" ");
-                       utf_display_printable_ascii_classname(c->name);
-               }
-               break;
-
-       case ICMD_MULTIANEWARRAY:
-               c  = iptr->val.a;
-               cr = iptr->target;
-
-               if (c == NULL) {
-                       printf(" (NOT RESOLVED) %d ", iptr->op1);
-                       utf_display_printable_ascii(cr->name);
-               } 
-               else {
-                       printf(" %d ", iptr->op1);
-                       utf_display_printable_ascii_classname(c->name);
-               }
-               break;
-
-       case ICMD_CHECKCAST:
-       case ICMD_INSTANCEOF:
-               c  = iptr->val.a;
-               cr = iptr->target;
-
-               if (c) {
-                       if (c->flags & ACC_INTERFACE)
-                               printf(" (INTERFACE) ");
-                       else
-                               printf(" (CLASS,%3d) ", c->vftbl->diffval);
-               } else
-                       printf(" (NOT RESOLVED) ");
-               utf_display_printable_ascii_classname(cr->name);
-               break;
-
-       case ICMD_INLINE_START:
-       case ICMD_INLINE_END:
-               {
-                       insinfo_inline *insinfo = (insinfo_inline *) iptr->target;
-                       printf(" ");
-                       method_print(insinfo->method);
-               }
-               break;
-
-       case ICMD_BUILTIN:
-               printf(" %s", ((builtintable_entry *) iptr->val.a)->cname);
-               break;
-
-       case ICMD_INVOKEVIRTUAL:
-       case ICMD_INVOKESPECIAL:
-       case ICMD_INVOKESTATIC:
-       case ICMD_INVOKEINTERFACE:
-               {
-                       constant_FMIref *mref;
-                       
-                       if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
-                               printf(" (NOT RESOLVED) ");
-                               mref = INSTRUCTION_UNRESOLVED_METHOD(iptr)->methodref;
-                       }
-                       else {
-                               printf(" ");
-                               mref = INSTRUCTION_RESOLVED_FMIREF(iptr);
-                       }
-                       method_methodref_print(mref);
-               }
-               break;
-
-       case ICMD_IFEQ:
-       case ICMD_IFNE:
-       case ICMD_IFLT:
-       case ICMD_IFGE:
-       case ICMD_IFGT:
-       case ICMD_IFLE:
-               printf(" %d (0x%08x)", iptr->val.i, iptr->val.i);
-
-/*             if ((iptr->opc & ICMD_CONDITION_MASK) == 0) { */
-                       if (deadcode || !iptr->target)
-                               printf(" op1=%d", iptr->op1);
-                       else
-                               printf(" L%03d (%p)", ((basicblock *) iptr->target)->nr, iptr->target);
-/*             } */
-               break;
-
-       case ICMD_IF_LEQ:
-       case ICMD_IF_LNE:
-       case ICMD_IF_LLT:
-       case ICMD_IF_LGE:
-       case ICMD_IF_LGT:
-       case ICMD_IF_LLE:
-#if SIZEOF_VOID_P == 4
-               printf(" %lld (%016llx)", iptr->val.l, iptr->val.l);
-#else
-               printf(" %ld (%016lx)", iptr->val.l, iptr->val.l);
-#endif
-
-/*             if ((iptr->opc & ICMD_CONDITION_MASK) == 0) { */
-                       if (deadcode || !iptr->target)
-                               printf(" op1=%d", iptr->op1);
-                       else
-                               printf(" L%03d", ((basicblock *) iptr->target)->nr);
-/*             } */
-               break;
-
-       case ICMD_JSR:
-       case ICMD_GOTO:
-       case ICMD_INLINE_GOTO:
-               if (deadcode || !iptr->target)
-                       printf(" op1=%d", iptr->op1);
-               else
-                       printf(" L%03d (%p)", ((basicblock *) iptr->target)->nr,iptr->target);
-               break;
-
-       case ICMD_IFNULL:
-       case ICMD_IFNONNULL:
-       case ICMD_IF_ICMPEQ:
-       case ICMD_IF_ICMPNE:
-       case ICMD_IF_ICMPLT:
-       case ICMD_IF_ICMPGE:
-       case ICMD_IF_ICMPGT:
-       case ICMD_IF_ICMPLE:
-
-       case ICMD_IF_LCMPEQ:
-       case ICMD_IF_LCMPNE:
-       case ICMD_IF_LCMPLT:
-       case ICMD_IF_LCMPGE:
-       case ICMD_IF_LCMPGT:
-       case ICMD_IF_LCMPLE:
-
-       case ICMD_IF_FCMPEQ:
-       case ICMD_IF_FCMPNE:
-
-       case ICMD_IF_FCMPL_LT:
-       case ICMD_IF_FCMPL_GE:
-       case ICMD_IF_FCMPL_GT:
-       case ICMD_IF_FCMPL_LE:
-
-       case ICMD_IF_FCMPG_LT:
-       case ICMD_IF_FCMPG_GE:
-       case ICMD_IF_FCMPG_GT:
-       case ICMD_IF_FCMPG_LE:
-
-       case ICMD_IF_DCMPEQ:
-       case ICMD_IF_DCMPNE:
-
-       case ICMD_IF_DCMPL_LT:
-       case ICMD_IF_DCMPL_GE:
-       case ICMD_IF_DCMPL_GT:
-       case ICMD_IF_DCMPL_LE:
-
-       case ICMD_IF_DCMPG_LT:
-       case ICMD_IF_DCMPG_GE:
-       case ICMD_IF_DCMPG_GT:
-       case ICMD_IF_DCMPG_LE:
-
-       case ICMD_IF_ACMPEQ:
-       case ICMD_IF_ACMPNE:
-/*             if (!(iptr->opc & ICMD_CONDITION_MASK)) { */
-                       if (deadcode || !iptr->target)
-                               printf(" op1=%d", iptr->op1);
-                       else
-                               printf(" L%03d (%p)", ((basicblock *) iptr->target)->nr,iptr->target);
-/*             } */
-               break;
-
-       case ICMD_TABLESWITCH:
-               s4ptr = (s4*)iptr->val.a;
-
-               if (deadcode || !iptr->target) {
-                       printf(" %d;", *s4ptr);
-               }
-               else {
-                       tptr = (void **) iptr->target;
-                       printf(" L%03d;", ((basicblock *) *tptr)->nr); 
-                       tptr++;
-               }
-
-               s4ptr++;         /* skip default */
-               j = *s4ptr++;                               /* low     */
-               j = *s4ptr++ - j;                           /* high    */
-               while (j >= 0) {
-                       if (deadcode || !*tptr)
-                               printf(" %d", *s4ptr++);
-                       else {
-                               printf(" L%03d", ((basicblock *) *tptr)->nr);
-                               tptr++;
-                       }
-                       j--;
-               }
-               break;
-
-       case ICMD_LOOKUPSWITCH:
-               s4ptr = (s4*)iptr->val.a;
-
-               if (deadcode || !iptr->target) {
-                       printf(" %d;", *s4ptr);
-               }
-               else {
-                       tptr = (void **) iptr->target;
-                       printf(" L%03d;", ((basicblock *) *tptr)->nr);
-                       tptr++;
-               }
-               s4ptr++;                                         /* default */
-               j = *s4ptr++;                                    /* count   */
-
-               while (--j >= 0) {
-                       if (deadcode || !*tptr) {
-                               s4ptr++; /* skip value */
-                               printf(" %d",*s4ptr++);
-                       }
-                       else {
-                               printf(" L%03d", ((basicblock *) *tptr)->nr);
-                               tptr++;
-                       }
-               }
-               break;
-
-       case ICMD_ARETURN:
-               if (iptr->val.a) {
-                       printf(" (NOT RESOLVED) Class = \"");
-                       utf_display_printable_ascii(((unresolved_class *) iptr->val.a)->classref->name);
-                       printf("\"");
-               }
-       }
-}
-#endif /* !defined(NDEBUG) */
 
 /*
  * These are local overrides for various environment variables in Emacs.