Some cleanups

Core/CSPspEmu.Core.Cpu/Dynarec/Ast/GeneratorILPsp.cs

@@ -2,7 +2,7 @@
 
 namespace CSPspEmu.Core.Cpu.Dynarec.Ast
 {
-    public class GeneratorIlPsp : GeneratorIL
+    public class GeneratorIlPsp : GeneratorIl
     {
         protected void _Generate(AstNodeStmPspInstruction pspInstruction)
         {

Core/CSPspEmu.Core.Cpu/FastPspMemoryUtils.cs

@@ -55,7 +55,7 @@ public static MethodInfo GetFastMemoryReader(IntPtr fixedGlobalAddress)
                 )
             );
 
-            new GeneratorIL().Reset().Init(method, method.GetILGenerator()).GenerateRoot(astTree);
+            new GeneratorIl().Reset().Init(method, method.GetILGenerator()).GenerateRoot(astTree);
 
             var type = typeBuilder.CreateType();
             Cache[cacheKey] = type.GetMethod(methodName);

Core/CSPspEmu.Core.Cpu/InstructionCache/MethodCache.cs

@@ -18,7 +18,7 @@ public sealed class MethodCache : IInjectInitialize
         public static readonly MethodCache Methods = new MethodCache();
 
         private static readonly AstMipsGenerator Ast = AstMipsGenerator.Instance;
-        private static readonly GeneratorIL GeneratorIlInstance = new GeneratorIL();
+        private static readonly GeneratorIl GeneratorIlInstance = new GeneratorIl();
 
         private readonly Dictionary<uint, MethodCacheInfo> _methodMapping =
             new Dictionary<uint, MethodCacheInfo>(64 * 1024);

Core/CSPspEmu.Core.Cpu/InstructionCache/MethodCacheInfo.cs

@@ -48,7 +48,7 @@ public void SetDynarecFunction(DynarecFunction dynarecFunction)
         /// <summary>
         /// Static Field that will hold the Delegate
         /// </summary>
-        public ILInstanceHolderPoolItem<Action<CpuThreadState>> StaticField;
+        public IlInstanceHolderPoolItem<Action<CpuThreadState>> StaticField;
 
         /// <summary>
         /// 
@@ -63,7 +63,7 @@ public MethodCacheInfo(MethodCache methodCache, Action<CpuThreadState> delegateG
         {
             MethodCache = methodCache;
             _functionDelegate = delegateGeneratorForPc;
-            StaticField = IlInstanceHolder.TAlloc(delegateGeneratorForPc);
+            StaticField = IlInstanceHolder.TaAlloc(delegateGeneratorForPc);
             Pc = pc;
         }
 

Core/CSPspEmu.Core.Cpu/NativeSyscallInfo.cs

@@ -7,7 +7,7 @@ public class NativeSyscallInfo
     {
         public string Name => $"{ModuleImportName}.{FunctionEntryName} (0x{Nid:X8})";
 
-        public ILInstanceHolderPoolItem<Action<CpuThreadState>> PoolItem;
+        public IlInstanceHolderPoolItem<Action<CpuThreadState>> PoolItem;
         public uint Nid;
         public string FunctionEntryName;
         public string ModuleImportName;

Hle/CSPspEmu.Hle/Managers/HleModuleManager.cs

@@ -157,7 +157,7 @@ public uint AllocDelegateSlot(Action<CpuThreadState> Action, string ModuleImport
                 ModuleImportName = ModuleImportName,
                 FunctionEntryName = FunctionEntry.Name,
                 Nid = FunctionEntry.NID,
-                PoolItem = IlInstanceHolder.TAlloc<Action<CpuThreadState>>(FunctionEntry.Delegate),
+                PoolItem = IlInstanceHolder.TaAlloc<Action<CpuThreadState>>(FunctionEntry.Delegate),
             };
             DelegateTable[DelegateId] = new DelegateInfo()
             {

Libraries/CSharpUtils/CSharpUtils/CSharpUtils.Drawing/BitmapUtils.cs

@@ -191,7 +191,6 @@ public static unsafe void TransferChannelsDataLinear(Rectangle rectangle, Bitmap
         public static unsafe void TransferChannelsDataLinear(Rectangle rectangle, Bitmap bitmap, byte* newDataPtr,
             Direction direction, params BitmapChannel[] channels)
         {
-            var widthHeight = bitmap.Width * bitmap.Height;
             var fullRectangle = bitmap.GetFullRectangle();
             if (!fullRectangle.Contains(rectangle.Location))
                 throw (new InvalidOperationException("TransferChannelsDataLinear"));
@@ -213,7 +212,6 @@ public static unsafe void TransferChannelsDataLinear(Rectangle rectangle, Bitmap
                 {
                     var bitmapDataScan0 = (byte*) bitmapData.Scan0.ToPointer();
                     var width = bitmap.Width;
-                    var height = bitmap.Height;
                     var stride = bitmapData.Stride;
                     if (numberOfChannels == 1)
                     {

Libraries/CSharpUtils/CSharpUtils/CSharpUtils.Ext/SpaceAssigner/SpaceAssigner1DUniqueAllocator.cs

@@ -50,8 +50,8 @@ public SpaceAssigner1D.Space AllocateUnique(byte[] data)
         /// <returns></returns>
         public SpaceAssigner1D.Space[] AllocateUnique(byte[][] data)
         {
-            /// @TODO Has to use data.Distinct() and the Allocate[] function in order
-            ///       to be able to avoid a greedy behaviour.
+            // @TODO Has to use data.Distinct() and the Allocate[] function in order
+            //       to be able to avoid a greedy behaviour.
 
             var spaces = new SpaceAssigner1D.Space[data.Length];
             for (var n = 0; n < data.Length; n++)
@@ -74,7 +74,7 @@ public SpaceAssigner1D.Space[] AllocateUnique(byte[][] data)
         /// <returns></returns>
         public SpaceAssigner1D.Space AllocateUnique(string String, Encoding encoding = null)
         {
-            if (encoding == null) encoding = this.Encoding;
+            if (encoding == null) encoding = Encoding;
             return AllocateUnique(String.GetStringzBytes(encoding));
         }
     }

Libraries/SafeILGenerator/SafeILGenerator.Tests/Ast/Generators/GeneratorILTest.cs

@@ -12,7 +12,7 @@ namespace SafeILGenerator.Tests.Ast.Generators
     public unsafe class GeneratorILTest
     {
         private static AstGenerator ast = AstGenerator.Instance;
-        private GeneratorIL GeneratorIL = new GeneratorIL();
+        private GeneratorIl GeneratorIL = new GeneratorIl();
 
         public static void TestAstSetGetLValue_Set(int Index, int Value)
         {
@@ -198,11 +198,11 @@ public void TestWriteLineLoadString()
                 ast.Return()
             );
 
-            var GeneratorIL = new GeneratorIL();
+            var GeneratorIL = new GeneratorIl();
             var Method = GeneratorIL.GenerateDelegate<Action<string>>("TestWriteLine", Ast);
 
             Console.WriteLine(new GeneratorCSharp().GenerateRoot(Ast).ToString());
-            Console.WriteLine("{0}", new GeneratorIL().GenerateToString(Method.Method, Ast));
+            Console.WriteLine("{0}", new GeneratorIl().GenerateToString(Method.Method, Ast));
 
             var Output = AstStringUtils.CaptureOutput(() => { Method("Hello World!"); });
 
@@ -222,7 +222,7 @@ public void TestAstSwitch()
                 ),
                 ast.Return("Invalid!")
             );
-            var GeneratorIL = new GeneratorIL();
+            var GeneratorIL = new GeneratorIl();
             var Method = GeneratorIL.GenerateDelegate<Func<int, string>>("TestSwitch", Ast);
             Assert.Equal("-", Method(0));
             Assert.Equal("One", Method(1));

Libraries/SafeILGenerator/SafeILGenerator.Tests/Util/ILInstanceHolderPoolTest.cs

@@ -34,7 +34,7 @@ public void TestMethod2()
                 ast.Return()
             );
             Console.WriteLine(GeneratorCSharp.GenerateString<GeneratorCSharp>(astNode));
-            var generatorIl = new GeneratorIL();
+            var generatorIl = new GeneratorIl();
             var itemSet = generatorIl.GenerateDelegate<Action<int>>("ItemSet", astNode);
             itemSet(10);
             Assert.Equal(10, item.Value);
@@ -59,7 +59,7 @@ public void TestGlobalAlloc()
             Assert.Equal(0, IlInstanceHolder.CapacityCount);
             Assert.Equal(0, IlInstanceHolder.FreeCount);
 
-            var globalKey = IlInstanceHolder.TAlloc<int>();
+            var globalKey = IlInstanceHolder.TaAlloc<int>();
 
             Assert.Equal(4, IlInstanceHolder.CapacityCount);
             Assert.Equal(3, IlInstanceHolder.FreeCount);

Libraries/SafeILGenerator/SafeILGenerator/Ast/AstArgument.cs

@@ -16,15 +16,10 @@ public AstArgument(int index, Type type, string name = null)
             Name = name ?? ("@ARG(" + index + ")");
         }
 
-        public static AstArgument Create(Type type, int index, string name = null)
-        {
-            return new AstArgument(index, type, name);
-        }
+        public static AstArgument Create(Type type, int index, string name = null) =>
+            new AstArgument(index, type, name);
 
-        public static AstArgument Create<TType>(int index, string name = null)
-        {
-            return Create(typeof(TType), index, name);
-        }
+        public static AstArgument Create<TType>(int index, string name = null) => Create(typeof(TType), index, name);
 
         public static AstArgument Create(MethodInfo methodInfo, int index, string name = null)
         {

Libraries/SafeILGenerator/SafeILGenerator/Ast/AstGenerator.cs

@@ -50,8 +50,8 @@ public AstNodeExprLValue FieldPropertyAccess(AstNodeExpr instance, string fieldP
             if (instance.Type.GetField(fieldPropertyName) != null) return FieldAccess(instance, fieldPropertyName);
             if (instance.Type.GetProperty(fieldPropertyName) != null)
                 return PropertyAccess(instance, fieldPropertyName);
-            throw (new InvalidOperationException(string.Format("Can't find Field/Property '{0}' for type '{1}'",
-                fieldPropertyName, instance.Type)));
+            throw (new InvalidOperationException(
+                $"Can't find Field/Property '{fieldPropertyName}' for type '{instance.Type}'"));
         }
 
         public AstNodeExprPropertyAccess PropertyAccess(AstNodeExpr instance, PropertyInfo propertyInfo) =>

Libraries/SafeILGenerator/SafeILGenerator/Ast/AstUtils.cs

@@ -73,7 +73,7 @@ public static object CastType(object value, Type castType)
             if (castType == typeof(sbyte)) return (sbyte) Convert.ToInt64(value);
             if (castType == typeof(short)) return (short) Convert.ToInt64(value);
             if (castType == typeof(int)) return (int) Convert.ToInt64(value);
-            if (castType == typeof(long)) return (long) Convert.ToInt64(value);
+            if (castType == typeof(long)) return Convert.ToInt64(value);
 
             if (castType == typeof(byte)) return (byte) Convert.ToInt64(value);
             if (castType == typeof(ushort)) return (ushort) Convert.ToInt64(value);

Libraries/SafeILGenerator/SafeILGenerator/Ast/Generators/Generator.cs

@@ -69,7 +69,7 @@ public abstract class Generator<TGenerator>
 
         protected Generator()
         {
-            foreach (var method in this.GetType()
+            foreach (var method in GetType()
                 .GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)
                 .Where(method => method.ReturnType == typeof(void))
                 .Where(method => method.GetParameters().Count() == 1)
@@ -119,8 +119,7 @@ protected virtual void Generate(AstNode astNode)
                 {
                     Console.WriteLine(generateMapping);
                 }
-                throw (new NotImplementedException(string.Format("Don't know how to generate {0} for {1}", astNodeType,
-                    GetType())));
+                throw (new NotImplementedException($"Don't know how to generate {astNodeType} for {GetType()}"));
             }
 
             GenerateMappings[astNodeType].Call(this, astNode);

Libraries/SafeILGenerator/SafeILGenerator/Ast/Generators/GeneratorCSharp.cs

@@ -45,7 +45,7 @@ private static string ValueAsString(object value, Type type = null)
             if (value is IntPtr) return $"0x{((IntPtr) value).ToInt64():X}";
             if (value is string) return $"{AstStringUtils.ToLiteral(value as string)}";
             if (AstUtils.IsTypeSigned(type)) return value.ToString();
-            if (Convert.ToInt64(value) > 9) return string.Format("0x{0:X}", value);
+            if (Convert.ToInt64(value) > 9) return $"0x{value:X}";
             return value.ToString();
         }