Stub STables and objects at deserialization start.

src/org/perl6/nqp/sixmodel/REPR.java

@@ -78,8 +78,12 @@ public void change_type(ThreadContext tc, SixModelObject Object, SixModelObject
      * serialization writer. */
     // XXX void (*serialize) (ThreadContext, STable *st, void *data, SerializationWriter *writer);
 
-    /* Object deserialization. Reads the objects body in using the passed
-     * serialization reader. */
+    /* Object deserialization. Happens in two steps. The first stub step
+     * creates an object to be filled out later. Note that the STable may
+     * not be fully available yet if it's in the current compilation unit.
+     * The second step has the STable fully formed (though objects it
+     * references may not be) and should do the rest of the work. */
+    public abstract SixModelObject deserialize_stub(ThreadContext tc, STable st);
     // XXX void (*deserialize) (ThreadContext, STable *st, void *data, SerializationReader *reader);
 
     /**

src/org/perl6/nqp/sixmodel/SerializationReader.java

@@ -68,6 +68,15 @@ public void deserialize() {
 		// Split the input into the various segments.
 		checkAndDisectInput();
 		resolveDependencies();
+
+		// Handle any reposessions.
+		if (reposTableEntries > 0)
+			throw new RuntimeException("Reposession of SC objects NYI");
+
+		// Stub all of the STables and objects.
+		stubSTables();
+		stubObjects();
+
 		throw new RuntimeException("Deserialization NYI");
 	}
 
@@ -191,6 +200,61 @@ private void resolveDependencies() {
 	    }
 	}
 
+	private void stubSTables() {
+		for (int i = 0; i < stTableEntries; i++) {
+			// 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.root_stables.add(st);
+		}
+	}
+
+	private void stubObjects() {
+		for (int i = 0; i < objTableEntries; i++) {
+			// Look up STable.
+			orig.position(objTableOffset + i * OBJECTS_TABLE_ENTRY_SIZE);
+			STable st = lookupSTable(orig.getInt(), orig.getInt());
+
+			// Now go by object flags.
+			SixModelObject stubObj;
+			orig.position(orig.position() + 4);
+			int flags = orig.getInt();
+			if (flags == 0) {
+				// Type object.
+				stubObj = new TypeObject();
+				stubObj.st = st;
+			}
+			else {
+				// Concrete object; defer to the REPR.
+				stubObj = st.REPR.deserialize_stub(tc, st);
+			}
+
+			// Place object in SC root set.
+			stubObj.sc = sc;
+			sc.root_objects.add(stubObj);
+		}
+	}
+
+
+	private STable lookupSTable(int scIdx, int idx) {
+	    SerializationContext sc = locateSC(scIdx);
+	    if (idx < 0 || idx >= sc.root_stables.size())
+	    	throw new RuntimeException("Invalid STable index (scIdx=" + scIdx + ",idx=" + idx + ")");
+		return sc.root_stables.get(idx);
+	}
+
+	private SerializationContext locateSC(int scIdx) {
+	    if (scIdx == 0)
+	        return sc;
+	    if (scIdx < 1 || scIdx > dependentSCs.length)
+	        throw new RuntimeException("Invalid dependencies table index encountered (index " + scIdx + ")");
+	    return dependentSCs[scIdx - 1];
+	}
+
 	private String lookupString(int idx) {
 		if (idx >= sh.length)
 	        throw new RuntimeException("Attempt to read past end of string heap (index " + idx + ")");

src/org/perl6/nqp/sixmodel/reprs/KnowHOWAttribute.java

@@ -20,4 +20,10 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
         obj.st = st;
         return obj;
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		KnowHOWAttributeInstance obj = new KnowHOWAttributeInstance();
+        obj.st = st;
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/KnowHOWREPR.java

@@ -1,5 +1,8 @@
 package org.perl6.nqp.sixmodel.reprs;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.*;
 
@@ -17,4 +20,12 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
         obj.st = st;
         return obj;
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		KnowHOWREPRInstance obj = new KnowHOWREPRInstance();
+        obj.st = st;
+        obj.attributes = new ArrayList<SixModelObject>();
+        obj.methods = new HashMap<String, SixModelObject>();
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/P6Opaque.java

@@ -340,4 +340,8 @@ public Class<?> findClass(String name) {
             return defineClass(name, this.bytes, 0, this.bytes.length);
         }
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		throw new RuntimeException("P6opaque deserialization NYI");
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/P6int.java

@@ -102,4 +102,10 @@ public void generateBoxingMethods(ThreadContext tc, STable st, ClassGen c, Const
         c.addMethod(setMeth.getMethod());
         setIl.dispose();
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		P6intInstance obj = new P6intInstance();
+        obj.st = st;
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/P6num.java

@@ -103,4 +103,10 @@ public void generateBoxingMethods(ThreadContext tc, STable st, ClassGen c, Const
         c.addMethod(setMeth.getMethod());
         setIl.dispose();
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		P6numInstance obj = new P6numInstance();
+        obj.st = st;
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/P6str.java

@@ -102,4 +102,10 @@ public void generateBoxingMethods(ThreadContext tc, STable st, ClassGen c, Const
         c.addMethod(setMeth.getMethod());
         setIl.dispose();
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		P6strInstance obj = new P6strInstance();
+        obj.st = st;
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/SCRef.java

@@ -20,4 +20,8 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
         obj.st = st;
         return obj;
 	}
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		throw new RuntimeException("SCRef does not participate in serialization");
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/Uninstantiable.java

@@ -18,4 +18,8 @@ public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
 	public SixModelObject allocate(ThreadContext tc, STable st) {
 		throw new RuntimeException("You cannot create an instance of this type");
 	}
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		throw new RuntimeException("Cannot stub an Uninstantiable instance");
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/VMArray.java

@@ -17,4 +17,10 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
         obj.st = st;
         return obj;
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		SixModelObject obj = new VMArrayInstance();
+        obj.st = st;
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/VMHash.java

@@ -1,5 +1,7 @@
 package org.perl6.nqp.sixmodel.reprs;
 
+import java.util.HashMap;
+
 import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.*;
 
@@ -21,4 +23,11 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
     public StorageSpec get_value_storage_spec(ThreadContext tc, STable st) {
         return new StorageSpec();
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		VMHashInstance obj = new VMHashInstance();
+        obj.st = st;
+        obj.storage = new HashMap<String, SixModelObject>();
+        return obj;
+	}
 }

src/org/perl6/nqp/sixmodel/reprs/VMIter.java

@@ -25,4 +25,8 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
     public StorageSpec get_value_storage_spec(ThreadContext tc, STable st) {
         return new StorageSpec();
     }
+
+	public SixModelObject deserialize_stub(ThreadContext tc, STable st) {
+		throw new RuntimeException("VMIter does not participate in serialization");
+	}
 }