Unified bitness check.

Author: KN4CK3R

ReClass.NET/AddressParser/DynamicCompiler.cs

@@ -84,13 +84,9 @@ private static Expression GenerateMethodBody(IExpression operation, ParameterExp
 					}
 				case ConstantExpression constantExpression:
 					{
-#if RECLASSNET64
-						// long -> IntPtr
-						return Expression.Convert(Expression.Constant(constantExpression.Value), typeof(IntPtr));
-#else
-						// long -> int -> IntPtr
-						return Expression.Convert(Expression.Convert(Expression.Constant(constantExpression.Value), typeof(int)), typeof(IntPtr));
-#endif
+						var convertFn = typeof(IntPtrExtension).GetRuntimeMethod(nameof(IntPtrExtension.From), new[] { typeof(long) });
+
+						return Expression.Call(null, convertFn, Expression.Constant(constantExpression.Value));
 					}
 				case ReadMemoryExpression readMemoryExpression:
 					{
@@ -101,11 +97,10 @@ private static Expression GenerateMethodBody(IExpression operation, ParameterExp
 
 						var callExpression = Expression.Call(processParameter, readRemoteIntFn, argument);
 
-#if RECLASSNET64
-						return Expression.Convert(callExpression, typeof(IntPtr));
-#else
-						return Expression.Convert(Expression.Convert(callExpression, typeof(int)), typeof(IntPtr));
-#endif
+						var paramType = readMemoryExpression.ByteCount == 4 ? typeof(int) : typeof(long);
+						var convertFn = typeof(IntPtrExtension).GetRuntimeMethod(nameof(IntPtrExtension.From), new[] { paramType });
+
+						return Expression.Call(null, convertFn, callExpression);
 					}
 			}
 

ReClass.NET/AddressParser/Interpreter.cs

@@ -15,11 +15,7 @@ public IntPtr Execute(IExpression expression, RemoteProcess process)
 			switch (expression)
 			{
 				case ConstantExpression constantExpression:
-#if RECLASSNET64
-					return (IntPtr)constantExpression.Value;
-#else
-					return (IntPtr)unchecked((int)constantExpression.Value);
-#endif
+					return IntPtrExtension.From(constantExpression.Value);
 				case ModuleExpression moduleExpression:
 				{
 					var module = process.GetModuleByName(moduleExpression.Name);
@@ -42,15 +38,11 @@ public IntPtr Execute(IExpression expression, RemoteProcess process)
 					var readFromAddress = Execute(readMemoryExpression.Expression, process);
 					if (readMemoryExpression.ByteCount == 4)
 					{
-						return (IntPtr)process.ReadRemoteInt32(readFromAddress);
+						return IntPtrExtension.From(process.ReadRemoteInt32(readFromAddress));
 					}
 					else
 					{
-#if RECLASSNET64
-						return (IntPtr)process.ReadRemoteInt64(readFromAddress);
-#else
-						return (IntPtr)unchecked((int)process.ReadRemoteUInt64(readFromAddress));
-#endif
+						return IntPtrExtension.From(process.ReadRemoteInt64(readFromAddress));
 					}
 				default:
 					throw new ArgumentException($"Unsupported operation '{expression.GetType().FullName}'.");

ReClass.NET/Extensions/IntPtrExtensions.cs

@@ -142,6 +142,20 @@ public static long ToInt64Bits(this IntPtr ptr)
 			}
 
 			return value;
+#endif
+		}
+
+		public static IntPtr From(int value)
+		{
+			return (IntPtr)value;
+		}
+
+		public static IntPtr From(long value)
+		{
+#if RECLASSNET64
+			return (IntPtr)value;
+#else
+			return (IntPtr)unchecked((int)value);
 #endif
 		}
 	}