First foray into a true constant pool

sorear · May 23, 2011 · ea4bffe · ea4bffe
1 parent f3e0436
commit ea4bffe
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/lib/CLRBackend.cs b/lib/CLRBackend.cs
@@ -180,6 +180,10 @@ class Unit {
         public List<byte> thaw_heap;
         public Dictionary<string,int> existing_strings;
 
+        FieldInfo cc_pool;
+        Dictionary<string,int> cc_constant_cache = new Dictionary<string,int>();
+        List<int[]> cc_constants = new List<int[]>();
+
         public Unit(object[] from, object[] code) {
             mainline_ref = Xref.from(from[0]);
             name = JScalar.S(from[1]);
@@ -315,6 +319,7 @@ class Unit {
 
         public void BindFields(Func<string,Type,FieldInfo> binder) {
             rtunit = binder("UNIT", Tokens.RuntimeUnit);
+            cc_pool = binder("CC", Tokens.CC.MakeArrayType());
             VisitSubsPostorder(delegate(int ix, StaticSub sub) {
                 sub.BindFields(ix, binder);
             });
@@ -419,7 +424,31 @@ class Unit {
             else throw new NotImplementedException("ProcessLAD " + head);
         }
 
+        public CpsOp CCConst(int[] cc) {
+            StringBuilder code = new StringBuilder();
+            foreach (int x in cc) {
+                code.Append((char)x);
+                code.Append((char)(x>>16));
+            }
+            string fcode = code.ToString();
+            int ix;
+            if (!cc_constant_cache.TryGetValue(fcode, out ix)) {
+                cc_constant_cache[fcode] = ix = cc_constants.Count;
+                cc_constants.Add(cc);
+            }
+            return CpsOp.Operator(Tokens.CC, OpCodes.Ldelem_Ref,
+                CpsOp.GetSField(cc_pool), CpsOp.IntLiteral(ix));
+        }
 
+        public CpsOp EmitCCConsts() {
+            int b = thaw_heap.Count;
+            EmitInt(cc_constants.Count);
+            foreach (int[] cc in cc_constants)
+                EmitIntArray(cc);
+            return CpsOp.SetSField(cc_pool,
+                    CpsOp.MethodCall(Tokens.RuntimeUnit.GetMethod("LoadCCPool"),
+                        CpsOp.GetSField(rtunit), CpsOp.IntLiteral(b)));
+        }
     }
 
     class Xref {
@@ -3247,12 +3276,7 @@ class NamProcessor {
                         Console.WriteLine("odd constant box {0}/{1}", typ, chchh);
                     }
                 } else if (chh == "newcc") {
-                    StringBuilder sb = new StringBuilder("C");
-                    for (int i = 1; i < ch.Length; i++) {
-                        sb.Append(' ');
-                        sb.Append(JScalar.I(ch[i]));
-                    }
-                    code = sb.ToString();
+                    return th.sub.unit.CCConst(JScalar.IA(1, ch));
                 } else if (chh == "fcclist_new") {
                     StringBuilder sb = new StringBuilder("F");
                     for (int i = 1; i < ch.Length; i++) {
@@ -4334,12 +4358,19 @@ public class CLRBackend {
             foreach (Unit td in unit.id_to_tdep)
                 tdep_rtu.Add(td == unit ? CpsOp.Null(Tokens.RuntimeUnit) :
                         CpsOp.GetSField(td.rtunit));
-            thaw[unit_slot] =CpsOp.SetSField(unit.rtunit, CpsOp.ConstructorCall(
+            List<CpsOp> unit_load = new List<CpsOp>();
+            unit_load.Add(null);
+            unit_load.Add(unit.EmitCCConsts());
+
+            unit_load[0] = CpsOp.SetSField(unit.rtunit, CpsOp.ConstructorCall(
                 Tokens.RuntimeUnit.GetConstructor(new Type[] { typeof(byte[]), typeof(RuntimeUnit[]), typeof(int) }),
                 CpsOp.NewByteArray(typeof(byte), unit.thaw_heap.ToArray()),
                 CpsOp.NewArray(Tokens.RuntimeUnit, tdep_rtu.ToArray()),
                 CpsOp.IntLiteral(unit.xref.Length)));
 
+
+            thaw[unit_slot] = CpsOp.Sequence(unit_load.ToArray());
+
             CpsBuilder boot = new CpsBuilder(this, "BOOT", true);
             boot.Build(CpsOp.Sequence(thaw.ToArray()));
 

diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -258,6 +258,13 @@ public sealed class RuntimeUnit {
             return r;
         }
 
+        public CC[] LoadCCPool(int from) {
+            CC[] pool = new CC[ReadInt(ref from)];
+            for (int i = 0; i < pool.Length; i++)
+                pool[i] = new CC(ReadIntArray(ref from));
+            return pool;
+        }
+
         public string ReadStr(ref int from) {
             int l = ReadShort(ref from);
             if ((l & 2) == 0) l |= (ReadShort(ref from) << 16);