dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

string.IndexOf(char) works now

Browse source
This commit is contained in:
mterwoord_cp 2008-01-02 08:52:59 +00:00
parent 8e5e6a027a
commit a3734ff054
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/Indy.IL2CPU.IL/OpCodeMap.cs
View file

@ -107,6 +107,27 @@ namespace Indy.IL2CPU.IL {
return sb.ToString().TrimEnd(',') + ")"; return sb.ToString().TrimEnd(',') + ")";
} }
/// <summary>
/// Gets the full name of a method, without the defining type included
/// </summary>
/// <param name="aSelf"></param>
/// <returns></returns>
private static string GetStrippedMethodDefinitionFullName(MethodReference aSelf) {
StringBuilder sb = new StringBuilder(aSelf.ReturnType.ReturnType.FullName + " " + aSelf.Name);
sb.Append("(");
if (aSelf.HasThis) {
sb.Append(aSelf.DeclaringType.FullName);
sb.Append(",");
}
if (aSelf.Parameters.Count > 0) {
foreach (ParameterDefinition xParam in aSelf.Parameters) {
sb.Append(xParam.ParameterType.FullName);
sb.Append(",");
}
}
return sb.ToString().TrimEnd(',') + ")";
}
private void InitializePlugMethodsList(Assembler.Assembler aAssembler, IEnumerable<AssemblyDefinition> aPlugs, Func<TypeReference, TypeDefinition> aTypeResolver, Func<string, AssemblyDefinition> aAssemblyResolver) { private void InitializePlugMethodsList(Assembler.Assembler aAssembler, IEnumerable<AssemblyDefinition> aPlugs, Func<TypeReference, TypeDefinition> aTypeResolver, Func<string, AssemblyDefinition> aAssemblyResolver) {
if (mPlugMethods != null) { if (mPlugMethods != null) {
throw new Exception("PlugMethods list already initialized!"); throw new Exception("PlugMethods list already initialized!");
@ -145,7 +166,6 @@ namespace Indy.IL2CPU.IL {
CustomAttribute xPlugMethodAttrib = (from item in xMethod.CustomAttributes.Cast<CustomAttribute>() CustomAttribute xPlugMethodAttrib = (from item in xMethod.CustomAttributes.Cast<CustomAttribute>()
where item.Constructor.DeclaringType.FullName == typeof(PlugMethodAttribute).FullName where item.Constructor.DeclaringType.FullName == typeof(PlugMethodAttribute).FullName
select item).FirstOrDefault(); select item).FirstOrDefault();
//System.Diagnostics.Debugger.Break();
string xSignature = String.Empty; string xSignature = String.Empty;
if (xPlugMethodAttrib != null) { if (xPlugMethodAttrib != null) {
if (!xPlugMethodAttrib.Resolved) { if (!xPlugMethodAttrib.Resolved) {
@ -172,15 +192,15 @@ namespace Indy.IL2CPU.IL {
continue; continue;
} }
} }
string xStrippedSignature = GetMethodDefinitionFullName(xMethod).Replace(xType.FullName, ""); string xStrippedSignature = GetStrippedMethodDefinitionFullName(xMethod);
foreach (MethodDefinition xOrigMethodDef in xReplaceTypeDef.Methods) { foreach (MethodDefinition xOrigMethodDef in xReplaceTypeDef.Methods) {
string xOrigStrippedSignature = GetMethodDefinitionFullName(xOrigMethodDef).Replace(xReplaceTypeDef.FullName, ""); string xOrigStrippedSignature = GetStrippedMethodDefinitionFullName(xOrigMethodDef);
if (xOrigStrippedSignature == xStrippedSignature) { if (xOrigStrippedSignature == xStrippedSignature) {
mPlugMethods.Add(Label.GenerateLabelName(xOrigMethodDef), xMethod); mPlugMethods.Add(Label.GenerateLabelName(xOrigMethodDef), xMethod);
} }
} }
foreach (MethodDefinition xOrigMethodDef in xReplaceTypeDef.Constructors) { foreach (MethodDefinition xOrigMethodDef in xReplaceTypeDef.Constructors) {
string xOrigStrippedSignature = GetMethodDefinitionFullName(xOrigMethodDef).Replace(xReplaceTypeDef.FullName, ""); string xOrigStrippedSignature = GetStrippedMethodDefinitionFullName(xOrigMethodDef);
if (xOrigStrippedSignature == xStrippedSignature) { if (xOrigStrippedSignature == xStrippedSignature) {
mPlugMethods.Add(Label.GenerateLabelName(xOrigMethodDef), xMethod); mPlugMethods.Add(Label.GenerateLabelName(xOrigMethodDef), xMethod);
} }

15
source/Indy.IL2CPU/CustomImplementation/System/StringImpl.cs
View file

@ -3,16 +3,20 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Indy.IL2CPU.Plugs;
namespace Indy.IL2CPU.CustomImplementation.System { namespace Indy.IL2CPU.CustomImplementation.System {
[Plug(Target = typeof(String))]
public static class StringImpl { public static class StringImpl {
[MethodAlias(Name = "System.String System.String.FastAllocateString(System.Int32)")] [MethodAlias(Name = "System.String System.String.FastAllocateString(System.Int32)")]
[PlugMethod(Enabled = false)]
public static String FastAllocateString(int aLength) { public static String FastAllocateString(int aLength) {
Char[] xItems = new Char[aLength]; Char[] xItems = new Char[aLength];
return new String(xItems); return new String(xItems);
} }
[MethodAlias(Name = "System.Void System.String..ctor(System.Char[],System.Int32,System.Int32)")] [MethodAlias(Name = "System.Void System.String..ctor(System.Char[],System.Int32,System.Int32)")]
[PlugMethod(Enabled = false)]
public static void Ctor(String aThis, [FieldAccess(Name = "$$Storage$$")]ref Char[] aStorage, Char[] aChars, int aStartIndex, int aLength) { public static void Ctor(String aThis, [FieldAccess(Name = "$$Storage$$")]ref Char[] aStorage, Char[] aChars, int aStartIndex, int aLength) {
Char[] newChars = new Char[aLength]; Char[] newChars = new Char[aLength];
Array.Copy(aChars, aStartIndex, newChars, 0, aLength); Array.Copy(aChars, aStartIndex, newChars, 0, aLength);
@ -20,10 +24,21 @@ namespace Indy.IL2CPU.CustomImplementation.System {
} }
[MethodAlias(Name = "System.Void System.String..ctor(System.Char[])")] [MethodAlias(Name = "System.Void System.String..ctor(System.Char[])")]
[PlugMethod(Enabled = false)]
public static void Ctor(String aThis, [FieldAccess(Name = "$$Storage$$")] ref Char[] aStorage, Char[] aChars) { public static void Ctor(String aThis, [FieldAccess(Name = "$$Storage$$")] ref Char[] aStorage, Char[] aChars) {
aStorage = aChars; aStorage = aChars;
} }
public static int IndexOf(string aThis, char c) {
for (int i = 0; i < aThis.Length; i++) {
if (aThis[i] == c) {
return i;
}
}
return -1;
}
[PlugMethod(Enabled = false)]
public static uint GetStorage(string aString) { public static uint GetStorage(string aString) {
return 0; return 0;
} }