Get P6int/P6num to take/keep bit size.

Author: jnthn

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

@@ -18,8 +18,25 @@ public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
         SixModelObject obj = new TypeObject();
         obj.st = st;
         st.WHAT = obj;
+        
+        StorageSpec ss = new StorageSpec();
+        ss.inlineable = StorageSpec.INLINED;
+        ss.boxed_primitive = StorageSpec.BP_INT;
+        ss.bits = 64;
+        ss.can_box = StorageSpec.CAN_BOX_INT;
+        st.REPRData = ss;
+        
         return st.WHAT;
     }
+    
+    public void compose(ThreadContext tc, STable st, SixModelObject repr_info) {
+        SixModelObject integerInfo = repr_info.at_key_boxed(tc, "integer");
+        if (integerInfo != null) {
+            SixModelObject bits = integerInfo.at_key_boxed(tc, "bits");
+            if (bits != null)
+                ((StorageSpec)st.REPRData).bits = (short)bits.get_int(tc);
+        }
+    }
 
     public SixModelObject allocate(ThreadContext tc, STable st) {
         P6intInstance obj = new P6intInstance();
@@ -28,12 +45,7 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
     }
 
     public StorageSpec get_storage_spec(ThreadContext tc, STable st) {
-        StorageSpec ss = new StorageSpec();
-        ss.inlineable = StorageSpec.INLINED;
-        ss.boxed_primitive = StorageSpec.BP_INT;
-        ss.bits = 64;
-        ss.can_box = StorageSpec.CAN_BOX_INT;
-        return ss;
+        return (StorageSpec)st.REPRData;
     }
 
     public void inlineStorage(ThreadContext tc, STable st, ClassWriter cw, String prefix) {
@@ -117,4 +129,30 @@ public void serialize_inlined(ThreadContext tc, STable st, SerializationWriter w
             throw new RuntimeException(e);
         }
     }
+    
+    /**
+     * REPR data serialization. Serializes the per-type representation data that
+     * is attached to the supplied STable.
+     */
+    public void serialize_repr_data(ThreadContext tc, STable st, SerializationWriter writer)
+    {
+        writer.writeInt(((StorageSpec)st.REPRData).bits);
+    }
+    
+    /**
+     * REPR data deserialization. Deserializes the per-type representation data and
+     * attaches it to the supplied STable.
+     */
+    public void deserialize_repr_data(ThreadContext tc, STable st, SerializationReader reader)
+    {
+        StorageSpec ss = new StorageSpec();
+        ss.inlineable = StorageSpec.INLINED;
+        ss.boxed_primitive = StorageSpec.BP_INT;
+        if (reader.version >= 7)
+            ss.bits = (short)reader.readLong();
+        else
+            ss.bits = 64;
+        ss.can_box = StorageSpec.CAN_BOX_INT;
+        st.REPRData = ss;
+    }
 }

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

@@ -18,8 +18,25 @@ public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
         SixModelObject obj = new TypeObject();
         obj.st = st;
         st.WHAT = obj;
+        
+        StorageSpec ss = new StorageSpec();
+        ss.inlineable = StorageSpec.INLINED;
+        ss.boxed_primitive = StorageSpec.BP_NUM;
+        ss.bits = 64;
+        ss.can_box = StorageSpec.CAN_BOX_NUM;
+        st.REPRData = ss;
+        
         return st.WHAT;
     }
+    
+    public void compose(ThreadContext tc, STable st, SixModelObject repr_info) {
+        SixModelObject floatInfo = repr_info.at_key_boxed(tc, "float");
+        if (floatInfo != null) {
+            SixModelObject bits = floatInfo.at_key_boxed(tc, "bits");
+            if (bits != null)
+                ((StorageSpec)st.REPRData).bits = (short)bits.get_int(tc);
+        }
+    }
 
     public SixModelObject allocate(ThreadContext tc, STable st) {
         P6numInstance obj = new P6numInstance();
@@ -29,12 +46,7 @@ public SixModelObject allocate(ThreadContext tc, STable st) {
     }
 
     public StorageSpec get_storage_spec(ThreadContext tc, STable st) {
-        StorageSpec ss = new StorageSpec();
-        ss.inlineable = StorageSpec.INLINED;
-        ss.boxed_primitive = StorageSpec.BP_NUM;
-        ss.bits = 64;
-        ss.can_box = StorageSpec.CAN_BOX_NUM;
-        return ss;
+        return (StorageSpec)st.REPRData;
     }
 
     public void inlineStorage(ThreadContext tc, STable st, ClassWriter cw, String prefix) {
@@ -118,4 +130,30 @@ public void serialize_inlined(ThreadContext tc, STable st, SerializationWriter w
             throw new RuntimeException(e);
         }
     }
+    
+    /**
+     * REPR data serialization. Serializes the per-type representation data that
+     * is attached to the supplied STable.
+     */
+    public void serialize_repr_data(ThreadContext tc, STable st, SerializationWriter writer)
+    {
+        writer.writeInt(((StorageSpec)st.REPRData).bits);
+    }
+    
+    /**
+     * REPR data deserialization. Deserializes the per-type representation data and
+     * attaches it to the supplied STable.
+     */
+    public void deserialize_repr_data(ThreadContext tc, STable st, SerializationReader reader)
+    {
+        StorageSpec ss = new StorageSpec();
+        ss.inlineable = StorageSpec.INLINED;
+        ss.boxed_primitive = StorageSpec.BP_NUM;
+        if (reader.version >= 7)
+            ss.bits = (short)reader.readLong();
+        else
+            ss.bits = 64;
+        ss.can_box = StorageSpec.CAN_BOX_NUM;
+        st.REPRData = ss;
+    }
 }