Lib: Minor performance improvements, add offset to fieldreflectiondata

Author: Sam Byass

Cpp2IL/ConsoleLogger.cs

@@ -39,7 +39,7 @@ internal static void Write(string level, string source, string message, Color co
             if (!LastNoNewline)
                 WritePrelude(level, source, color);
 
-            LastNoNewline = !message.EndsWith("\n");
+            LastNoNewline = message[^1] != '\n';
 
             if (!DisableColor)
                 message = message.Pastel(color);
@@ -74,6 +74,11 @@ public static void CheckColorSupport()
                 DisableColor = true; //Just manually set this, even though Pastel respects the environment variable
                 Logger.WarnNewline("NO_COLOR set, disabling ANSI color codes as you requested.");
             }
+            else
+            {
+                //Ensure we run the cctor for Pastel now.
+                ConsoleExtensions.Enable();
+            }
         }
     }
 }

LibCpp2IL/BinarySearcher.cs

@@ -28,9 +28,11 @@ private static int FindSequence(byte[] haystack, byte[] needle, int requiredAlig
         {
             //Convert needle to a span now, rather than in the loop (implicitly as call to SequenceEqual)
             var needleSpan = new ReadOnlySpan<byte>(needle);
+            var haystackSpan = haystack.AsSpan();
+            var firstByte = needleSpan[0];
 
             //Find the first occurrence of the first byte of the needle
-            var nextMatchIdx = Array.IndexOf(haystack, needle[0], startOffset);
+            var nextMatchIdx = Array.IndexOf(haystack, firstByte, startOffset);
 
             var needleLength = needleSpan.Length;
             var endIdx = haystack.Length - needleLength;
@@ -42,12 +44,12 @@ private static int FindSequence(byte[] haystack, byte[] needle, int requiredAlig
                 if (!checkAlignment || nextMatchIdx % requiredAlignment == 0)
                 {
                     //Take a slice of the array at this position and the length of the needle, and compare
-                    if (haystack.AsSpan(nextMatchIdx, needleLength).SequenceEqual(needleSpan))
+                    if (haystackSpan.Slice(nextMatchIdx, needleLength).SequenceEqual(needleSpan))
                         return nextMatchIdx;
                 }
 
                 //Find the next occurrence of the first byte of the needle
-                nextMatchIdx = Array.IndexOf(haystack, needle[0], nextMatchIdx + 1);
+                nextMatchIdx = Array.IndexOf(haystack, firstByte, nextMatchIdx + 1);
             }
 
             //No match found

LibCpp2IL/Metadata/Il2CppTypeDefinition.cs

@@ -252,8 +252,24 @@ public Il2CppFieldReflectionData[]? FieldInfos
                 var attributes = FieldAttributes;
                 var defaults = FieldDefaults;
 
+                if (fields == null || attributes == null || defaults == null)
+                    return null;
+
+                var ret = new Il2CppFieldReflectionData[FieldCount];
+                for (var i = 0; i < FieldCount; i++)
+                {
+                    ret[i] = new()
+                    {
+                        attributes = attributes![i],
+                        field = fields[i],
+                        defaultValue = defaults![i],
+                        indexInParent = i,
+                        fieldOffset = LibCpp2IlMain.Binary!.GetFieldOffsetFromIndex(TypeIndex, i, fields[i].FieldIndex, IsValueType, attributes[i].HasFlag(System.Reflection.FieldAttributes.Static))
+                    };
+                }
+
                 return fields?
-                    .Select((t, i) => new Il2CppFieldReflectionData {attributes = attributes![i], field = t, defaultValue = defaults![i], indexInParent = i})
+                    .Select((t, i) => new Il2CppFieldReflectionData {})
                     .ToArray();
             }
         }

LibCpp2IL/Reflection/Il2CppFieldReflectionData.cs

@@ -9,5 +9,6 @@ public class Il2CppFieldReflectionData
         public FieldAttributes attributes;
         public object? defaultValue;
         public int indexInParent;
+        public int fieldOffset;
     }
 }