[Bind] Sort core functions before extensions

Core functions are used more often than extensions. By grouping all
core functions to the front of the address table, and all extensions by
their extension category, we improve the chances of a cache hit.

Source/Bind/CSharpSpecWriter.cs

@@ -197,11 +197,9 @@ void WriteClasses(BindStreamWriter sw, ClassCollection classes, EnumCollection e
         {
             Trace.WriteLine(String.Format("Writing wrappers to:\t{0}.{1}", Settings.OutputNamespace, Settings.OutputClass));
 
-            // Sort delegates by extension and by name
             var delegates_sorted = delegates.Values
                 .Select(d => d.First())
-                .OrderBy(d => d.Extension)
-                .ThenBy(d => d.Name);
+                .OrderBy(d => d);
 
             sw.WriteLine("#pragma warning disable 3019"); // CLSCompliant attribute
             sw.WriteLine("#pragma warning disable 1591"); // Missing doc comments
@@ -225,7 +223,7 @@ void WriteClasses(BindStreamWriter sw, ClassCollection classes, EnumCollection e
             sw.WriteLine("EntryPointNames = new byte[]", delegates.Count);
             sw.WriteLine("{");
             sw.Indent();
-            foreach (var d in delegates.Values.Select(d => d.First()).OrderBy(d => d.Name))
+            foreach (var d in delegates_sorted)
             {
                 if (d.RequiresSlot(Settings))
                 {
@@ -243,7 +241,7 @@ void WriteClasses(BindStreamWriter sw, ClassCollection classes, EnumCollection e
             sw.WriteLine("{");
             sw.Indent();
             int offset = 0;
-            foreach (var d in delegates.Values.Select(d => d.First()).OrderBy(d => d.Name))
+            foreach (var d in delegates_sorted)
             {
                 if (d.RequiresSlot(Settings))
                 {
@@ -295,7 +293,6 @@ void WriteClasses(BindStreamWriter sw, ClassCollection classes, EnumCollection e
             // Emit native signatures.
             // These are required by the patcher.
             int current_signature = 0;
-            //foreach (var d in wrappers.OrderBy(w => w.Key).Select(w => w.Value).SelectMany(e => e).Select(w => w.WrappedDelegate).Distinct().OrderBy(d => d))
             foreach (var d in delegates_sorted)
             {
                 sw.WriteLine("[Slot({0})]", d.Slot);

Source/Bind/FuncProcessor.cs

@@ -199,8 +199,7 @@ void GenerateAddressTable(DelegateCollection delegates)
             // Todo: it would be best to allocate slots for core functions first
 
             int slot = -1;
-            foreach (var list in delegates.Values
-                .OrderBy(d => d.First().Name))
+            foreach (var list in delegates.Values.OrderBy(d => d.First()))
             {
                 var func = list.First();
                 if (func.RequiresSlot(Settings))

Source/Bind/Structures/Delegate.cs

@@ -277,7 +277,11 @@ override public string ToString()
 
         public int CompareTo(Delegate other)
         {
-            int ret = Name.CompareTo(other.Name);
+            int ret = (Extension != "Core").CompareTo(other.Extension != "Core");
+            if (ret == 0)
+                ret = Extension.CompareTo(other.Extension);
+            if (ret == 0)
+                ret = Name.CompareTo(other.Name);
             if (ret == 0)
                 ret = Parameters.CompareTo(other.Parameters);
             if (ret == 0)