[truffle] Stub STables while deserializing

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/REPR.java

@@ -0,0 +1,8 @@
+package org.perl6.nqp.truffle.sixmodel;
+
+/**
+ * Base of all 6model representations. Has default implementations of functions that
+ * are not mandatory.
+ */
+public abstract class REPR {
+}

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/REPRRegistry.java

@@ -0,0 +1,15 @@
+package org.perl6.nqp.truffle.sixmodel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.perl6.nqp.truffle.sixmodel.reprs.P6opaque;
+
+public class REPRRegistry {
+    public static REPR getByName(String name) {
+        switch (name) {
+            case "P6opaque": return new P6opaque();
+            default: throw new RuntimeException("No REPR " + name);
+        }
+    }
+}

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/STable.java

@@ -0,0 +1,30 @@
+package org.perl6.nqp.truffle.sixmodel;
+
+public class STable {
+    /** Initializes a new STable.
+     */
+    public STable(REPR repr, Object how) {
+        this.repr = repr;
+        this.how = how;
+    }
+
+    /**
+     * The representation operation table.
+     */
+    public REPR repr;
+
+    /**
+     * The meta-object.
+     */
+    public Object how;
+
+    /**
+     * The type-object.
+     */
+    public Object what;
+
+    /**
+     * Serialization context that this s-table belongs to.
+     */
+    public SerializationContext sc;
+}

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/SerializationContext.java

@@ -1,14 +1,59 @@
 package org.perl6.nqp.truffle.sixmodel;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 public final class SerializationContext {
     /* The handle of this SC. */
     public String handle;
 
     /* Description (probably the file name) if any. */
     public String description;
 
+    /* The root set of objects that live in this SC. */
+    private ArrayList<Object> rootObjects;
+
+    /* The root set of STables that live in this SC. */
+    private ArrayList<STable> rootSTables;
+
     public SerializationContext(String handle) {
         this.handle = handle;
+        this.rootObjects = new ArrayList<Object>();
+        this.rootSTables = new ArrayList<STable>();
+    }
+
+    public void initSTableList(int entries) {
+        rootSTables.ensureCapacity(entries);
+        for (int i = 0; i < entries; i++)
+            rootSTables.add(null);
+    }
+
+    private HashMap<STable, Integer> stableIndexCache = new HashMap<STable, Integer>();
+    public void addSTable(STable stable) {
+        int newIndex = rootSTables.size();
+        rootSTables.add(stable);
+        stableIndexCache.put(stable, new Integer(newIndex));
     }
 
+    public void setSTable(int index, STable stable) {
+        rootSTables.set(index, stable);
+        stableIndexCache.put(stable,  new Integer(index));
+    }
+
+    public int getSTableIndex(STable stable) {
+        Integer cachedIndex = stableIndexCache.get(stable);
+        if (cachedIndex != null) {
+            return cachedIndex.intValue();
+        } else {
+            return -1;
+        }
+    }
+
+    public STable getSTable(int index) {
+        return rootSTables.get(index);
+    }
+
+    public int stableCount() {
+        return rootSTables.size();
+    }
 }

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/SerializationReader.java

@@ -110,11 +110,11 @@ public void deserialize() {
 //            sc.addCodeRef(cr[i]);
 //        }
 //
-//        // Handle any STable repossessions, then stub STables.
-//        sc.initSTableList(stTableEntries);
+        // Handle any STable repossessions, then stub STables.
+        sc.initSTableList(stTableEntries);
 //        if (reposTableEntries > 0)
 //            repossess(1);
-//        stubSTables();
+        stubSTables();
 //
 //        // Handle any object repossessions, then stub objects.
 //        sc.initObjectList(objTableEntries);
@@ -335,23 +335,23 @@ private void resolveDependencies() {
 //        }
 //    }
 //
-//    private void stubSTables() {
-//        for (int i = 0; i < stTableEntries; i++) {
-//            // May already have it, due to repossession.
-//            if (sc.getSTable(i) != null)
-//                continue;
-//
-//            // Look up representation.
-//            orig.position(stTableOffset + i * STABLES_TABLE_ENTRY_SIZE);
-//            REPR repr = REPRRegistry.getByName(lookupString(orig.getInt()));
-//
-//            // Create STable stub and add it to the root STable set.
-//            STable st = new STable(repr, null);
-//            st.sc = sc;
-//            sc.setSTable(i, st);
-//        }
-//    }
-//
+    private void stubSTables() {
+        for (int i = 0; i < stTableEntries; i++) {
+            // May already have it, due to repossession.
+            if (sc.getSTable(i) != null)
+                continue;
+
+            // Look up representation.
+            orig.position(stTableOffset + i * STABLES_TABLE_ENTRY_SIZE);
+            REPR repr = REPRRegistry.getByName(lookupString(orig.getInt()));
+
+            // Create STable stub and add it to the root STable set.
+            STable st = new STable(repr, null);
+            st.sc = sc;
+            sc.setSTable(i, st);
+        }
+    }
+
 //    private void stubObjects() {
 //        for (int i = 0; i < objTableEntries; i++) {
 //            // May already have it, due to repossession.

src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/reprs/P6opaque.java

@@ -0,0 +1,6 @@
+package org.perl6.nqp.truffle.sixmodel.reprs;
+
+import org.perl6.nqp.truffle.sixmodel.REPR;
+
+public class P6opaque extends REPR {
+}

tools/build/Makefile-JVM.in

@@ -13,6 +13,7 @@ TRUFFLE_JAVAS = \
   src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/*.java \
   src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/*/*.java \
   src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/*.java \
+  src/vm/jvm/runtime/org/perl6/nqp/truffle/sixmodel/reprs/*.java \
   src/vm/jvm/runtime/org/perl6/nqp/truffle/*.java \
 
 RUNTIME_JAVAS = \