Include SC identifiers in bytecode dump.

MoarVM · May 13, 2014 · 2360aaa · 2360aaa
1 parent 1f22a12
commit 2360aaa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/6model/reprs/MVMCompUnit.h b/src/6model/reprs/MVMCompUnit.h
@@ -67,6 +67,9 @@ struct MVMCompUnitBody {
      * all are resolved, this pointer itself becomes NULL. */
     MVMSerializationContextBody **scs_to_resolve;
 
+    /* List of SC handle string indexes. */
+    MVMint32 *sc_handle_idxs;
+
     /* HLL configuration for this compilation unit. */
     MVMHLLConfig *hll_config;
     MVMString    *hll_name;

diff --git a/src/6model/sc.c b/src/6model/sc.c
@@ -90,9 +90,9 @@ void MVM_sc_set_description(MVMThreadContext *tc, MVMSerializationContext *sc, M
 MVMint64 MVM_sc_find_object_idx(MVMThreadContext *tc, MVMSerializationContext *sc, MVMObject *obj) {
     MVMObject **roots;
     MVMint64    i, count;
-    MVMint32    cached = obj->header.sc_forward_u.sc.idx;
+    /*MVMint32    cached = obj->header.sc_forward_u.sc.idx;
     if (cached >= 0)
-        return cached;
+        return cached;*/
     roots = sc->body->root_objects;
     count = sc->body->num_objects;
     for (i = 0; i < count; i++)
@@ -105,9 +105,9 @@ MVMint64 MVM_sc_find_object_idx(MVMThreadContext *tc, MVMSerializationContext *s
 /* Given an SC, looks up the index of an STable that is in its root set. */
 MVMint64 MVM_sc_find_stable_idx(MVMThreadContext *tc, MVMSerializationContext *sc, MVMSTable *st) {
     MVMuint64 i;
-    MVMint32  cached = st->header.sc_forward_u.sc.idx;
+    /*MVMint32  cached = st->header.sc_forward_u.sc.idx;
     if (cached >= 0)
-        return cached;
+        return cached;*/
     for (i = 0; i < sc->body->num_stables; i++)
         if (sc->body->root_stables[i] == st)
             return i;

diff --git a/src/core/bytecode.c b/src/core/bytecode.c
@@ -300,6 +300,7 @@ static void deserialize_sc_deps(MVMThreadContext *tc, MVMCompUnit *cu, ReaderSta
     /* Allocate SC lists in compilation unit. */
     cu_body->scs = malloc(rs->expected_scs * sizeof(MVMSerializationContext *));
     cu_body->scs_to_resolve = malloc(rs->expected_scs * sizeof(MVMSerializationContextBody *));
+    cu_body->sc_handle_idxs = malloc(rs->expected_scs * sizeof(MVMint32));
     cu_body->num_scs = rs->expected_scs;
 
     /* Resolve all the things. */
@@ -318,6 +319,7 @@ static void deserialize_sc_deps(MVMThreadContext *tc, MVMCompUnit *cu, ReaderSta
             cleanup_all(tc, rs);
             MVM_exception_throw_adhoc(tc, "String heap index beyond end of string heap");
         }
+        cu_body->sc_handle_idxs[i] = sh_idx;
         handle = cu_body->strings[sh_idx];
 
         /* See if we can resolve it. */

diff --git a/src/core/bytecodedump.c b/src/core/bytecodedump.c
@@ -62,6 +62,13 @@ char * MVM_bytecode_dump(MVMThreadContext *tc, MVMCompUnit *cu) {
 
     a("\nMoarVM dump of binary compilation unit:\n\n");
 
+    for (k = 0; k < cu->body.num_scs; k++) {
+        char *tmpstr = MVM_string_utf8_encode_C_string(
+            tc, cu->body.strings[cu->body.sc_handle_idxs[k]]);
+        a("  SC_%u : %s\n", k, tmpstr);
+        free(tmpstr);
+    }
+
     for (k = 0; k < cu->body.num_callsites; k++) {
         MVMCallsite *callsite = cu->body.callsites[k];
         MVMuint16 arg_count = callsite->arg_count;