* src/vm/jit/dseg.c (dseg_addlinenumber_inline_start): Read inline

[cacao.git] / src / vm / jit / dseg.c

diff --git a/src/vm/jit/dseg.c b/src/vm/jit/dseg.c
index 386d057f1a64ac355f965643aa04b29c0e90ac55..2c08e8b66d621ad215dfccb3b5fbaece7860d10d 100644 (file)
--- a/src/vm/jit/dseg.c
+++ b/src/vm/jit/dseg.c
@@ -31,7 +31,7 @@
             Joseph Wenninger
                        Edwin Steiner
 
-   $Id: dseg.c 5258 2006-08-22 09:02:25Z tbfg $
+   $Id: dseg.c 5834 2006-10-26 11:23:00Z edwin $
 
 */
 
@@ -655,7 +655,7 @@ void dseg_addlinenumber_inline_start(codegendata *cd, instruction *iptr)
 
        cd->linenumberreferences = lr;
 
-       insinfo = (insinfo_inline *) iptr->target;
+       insinfo = iptr->sx.s23.s3.inlineinfo;
 
        insinfo->startmpc = mpc; /* store for corresponding INLINE_END */
 }
@@ -681,7 +681,7 @@ void dseg_addlinenumber_inline_end(codegendata *cd, instruction *iptr)
        linenumberref *prev;
        insinfo_inline *insinfo;
 
-       insinfo = (insinfo_inline *) iptr->target;
+       insinfo = iptr->sx.s23.s3.inlineinfo;
 
        assert(insinfo);
 
@@ -791,32 +791,85 @@ void dseg_display(jitdata *jd)
 {
        codeinfo    *code;
        codegendata *cd;
-       s4          *s4ptr;
-       s4           i;
-       
+       dsegentry   *de;
+       imm_union   val;
+
        /* get required compiler data */
 
        code = jd->code;
        cd   = jd->cd;
 
-       s4ptr = (s4 *) (ptrint) code->mcode;
+       if (opt_debugcolor)
+               printf("\033[34m");     /* blue */
 
-       if (opt_debugcolor) printf("\033[34m"); /* blue */
        printf("  --- dump of datasegment\n");
 
-       for (i = cd->dseglen; i > 0 ; i -= 4) {
+       /* process all data segment entries */
+
+       for (de = cd->dseg; de != NULL; de = de->next) {
+#if SIZEOF_VOID_P == 8
+               printf("0x%016lx:", (ptrint) (code->entrypoint + de->disp));
+#else
+               printf("0x%08x:", (ptrint) (code->entrypoint + de->disp));
+#endif
+
+               printf("    %6x (%6d): ", de->disp, de->disp);
+
+               /* We read the values from the data segment as some values,
+                  like the line number table, have been written directly to
+                  the data segment. */
+
+               switch (de->type) {
+               case TYPE_INT:
+                       val.i = *((s4 *) (code->entrypoint + de->disp));
+                       printf("(INT) %d (0x%08x)", val.i, val.i);
+                       break;
+
+               case TYPE_LNG:
+                       val.l = *((s8 *) (code->entrypoint + de->disp));
+#if SIZEOF_VOID_P == 8
+                       printf("(LNG) %ld (0x%016lx)", val.l, val.l);
+#else
+                       printf("(LNG) %lld (0x%016llx)", val.l, val.l);
+#endif
+                       break;
+
+               case TYPE_FLT:
+                       val.f = *((float *) (code->entrypoint + de->disp));
+                       printf("(FLT) %g (0x%08x)", val.f, val.i);
+                       break;
+
+               case TYPE_DBL:
+                       val.d = *((double *) (code->entrypoint + de->disp));
 #if SIZEOF_VOID_P == 8
-               printf("0x%016lx:   -%6x (%6d): %8x\n",
-                          (ptrint) s4ptr, i, i, (s4) *s4ptr);
+                       printf("(DBL) %g (0x%016lx)", val.d, val.l);
 #else
-               printf("0x%08x:   -%6x (%6d): %8x\n",
-                          (ptrint) s4ptr, i, i, (s4) *s4ptr);
+                       printf("(DBL) %g (0x%016llx)", val.d, val.l);
 #endif
-               s4ptr++;
+                       break;
+
+               case TYPE_ADR:
+                       val.a = *((void **) (code->entrypoint + de->disp));
+#if SIZEOF_VOID_P == 8
+                       printf("(ADR) %016lx", (ptrint) val.a);
+#else
+                       printf("(ADR) %08x", (ptrint) val.a);
+#endif
+                       break;
+               }
+
+               printf("\n");
        }
 
-       printf("  --- begin of data segment: %p\n", (void *) s4ptr);
-       if (opt_debugcolor) printf("\033[m");
+       printf("  --- begin of data segment: ");
+#if SIZEOF_VOID_P == 8
+       printf("0x%016lx\n", (ptrint) code->entrypoint);
+#else
+       printf("0x%08x\n", (ptrint) code->entrypoint);
+#endif
+
+       if (opt_debugcolor)
+               printf("\033[m");
 }
 #endif /* !defined(NDEBUG) */