Skip to content

Very partial x86 Windows support in compiler #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichalStrehovsky merged 1 commit into from
Nov 1, 2023
Merged

Very partial x86 Windows support in compiler #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,39 @@ public static void GetEntryPoint(TypeSystemContext context, ReadyToRunHelper id,
case ReadyToRunHelper.WriteBarrier_EAX:
mangledName = "RhpAssignRefEAX";
break;
case ReadyToRunHelper.WriteBarrier_EBX:
mangledName = "RhpAssignRefEBX";
break;
case ReadyToRunHelper.WriteBarrier_ECX:
mangledName = "RhpAssignRefECX";
break;
case ReadyToRunHelper.WriteBarrier_ESI:
mangledName = "RhpAssignRefESI";
break;
case ReadyToRunHelper.WriteBarrier_EDI:
mangledName = "RhpAssignRefEDI";
break;
case ReadyToRunHelper.WriteBarrier_EBP:
mangledName = "RhpAssignRefEBP";
break;
case ReadyToRunHelper.CheckedWriteBarrier_EAX:
mangledName = "RhpCheckedAssignRefEAX";
break;
case ReadyToRunHelper.CheckedWriteBarrier_EBX:
mangledName = "RhpCheckedAssignRefEBX";
break;
case ReadyToRunHelper.CheckedWriteBarrier_ECX:
mangledName = "RhpCheckedAssignRefECX";
break;
case ReadyToRunHelper.CheckedWriteBarrier_ESI:
mangledName = "RhpCheckedAssignRefESI";
break;
case ReadyToRunHelper.CheckedWriteBarrier_EDI:
mangledName = "RhpCheckedAssignRefEDI";
break;
case ReadyToRunHelper.CheckedWriteBarrier_EBP:
mangledName = "RhpCheckedAssignRefEBP";
break;

case ReadyToRunHelper.Box:
case ReadyToRunHelper.Box_Nullable:
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/NodeMangler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,10 @@ public abstract class NodeMangler
public abstract string ThreadStaticsIndex(TypeDesc type);
public abstract string TypeGenericDictionary(TypeDesc type);
public abstract string MethodGenericDictionary(MethodDesc method);

public virtual string ExternMethod(string unmangledName, MethodDesc method)
{
return unmangledName;
}
}
}
3 changes: 3 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/RootingServiceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ public void AddCompilationRoot(MethodDesc method, string reason, string exportNa
_rootAdder(methodEntryPoint, reason);

if (exportName != null)
{
exportName = _factory.NameMangler.NodeMangler.ExternMethod(exportName, method);
_factory.NodeAliases.Add(methodEntryPoint, exportName);
}

if (canonMethod != method && method.HasInstantiation)
_rootAdder(_factory.MethodGenericDictionary(method), reason);
Expand Down
40 changes: 40 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/WindowsNodeMangler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,45 @@ public override string MethodGenericDictionary(MethodDesc method)
{
return GenericDictionaryNamePrefix + NameMangler.GetMangledMethodName(method);
}

public override string ExternMethod(string unmangledName, MethodDesc method)
{
TargetDetails target = method.Context.Target;
if (target.Architecture != TargetArchitecture.X86)
return unmangledName;

UnmanagedCallingConventions callConv;
if (method.IsPInvoke)
{
callConv = method.GetPInvokeMethodCallingConventions() & UnmanagedCallingConventions.CallingConventionMask;
}
else if (method.IsUnmanagedCallersOnly)
{
// HACK: Work around GetUnmanagedCallersOnlyMethodCallingConventions crashing on non-Ecma methoddesc
if (method is not Internal.TypeSystem.Ecma.EcmaMethod)
callConv = UnmanagedCallingConventions.Cdecl;
else
callConv = method.GetUnmanagedCallersOnlyMethodCallingConventions() & UnmanagedCallingConventions.CallingConventionMask;
}
else
{
Debug.Assert(method is Internal.TypeSystem.Ecma.EcmaMethod ecmaMethod && ecmaMethod.GetRuntimeExportName() != null);
callConv = UnmanagedCallingConventions.Cdecl;
}

int signatureBytes = 0;
foreach (var p in method.Signature)
{
signatureBytes += AlignmentHelper.AlignUp(p.GetElementSize().AsInt, target.PointerSize);
}

return callConv switch
{
UnmanagedCallingConventions.Stdcall => string.Concat("_", unmangledName, "@", signatureBytes.ToString()),
UnmanagedCallingConventions.Fastcall => string.Concat("@", unmangledName, "@", signatureBytes.ToString()),
UnmanagedCallingConventions.Cdecl => string.Concat("_", unmangledName),
_ => throw new System.NotImplementedException()
};
}
}
}
26 changes: 26 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,15 +506,40 @@ private ISymbolNode GetHelperFtnUncached(CorInfoHelpFunc ftnNum)
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_EAX:
id = ReadyToRunHelper.WriteBarrier_EAX;
break;
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_EBX:
id = ReadyToRunHelper.WriteBarrier_EBX;
break;
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_ECX:
id = ReadyToRunHelper.WriteBarrier_ECX;
break;
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_ESI:
id = ReadyToRunHelper.WriteBarrier_ESI;
break;
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_EDI:
id = ReadyToRunHelper.WriteBarrier_EDI;
break;
case CorInfoHelpFunc.CORINFO_HELP_ASSIGN_REF_EBP:
id = ReadyToRunHelper.WriteBarrier_EBP;
break;

case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_EAX:
id = ReadyToRunHelper.CheckedWriteBarrier_EAX;
break;
case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_EBX:
id = ReadyToRunHelper.CheckedWriteBarrier_EBX;
break;
case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_ECX:
id = ReadyToRunHelper.CheckedWriteBarrier_ECX;
break;
case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_ESI:
id = ReadyToRunHelper.CheckedWriteBarrier_ESI;
break;
case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_EDI:
id = ReadyToRunHelper.CheckedWriteBarrier_EDI;
break;
case CorInfoHelpFunc.CORINFO_HELP_CHECKED_ASSIGN_REF_EBP:
id = ReadyToRunHelper.CheckedWriteBarrier_EBP;
break;

case CorInfoHelpFunc.CORINFO_HELP_ARRADDR_ST:
id = ReadyToRunHelper.Stelem_Ref;
Expand Down Expand Up @@ -1879,6 +1904,7 @@ private void getAddressOfPInvokeTarget(CORINFO_METHOD_STRUCT_* method, ref CORIN
MethodDesc md = HandleToObject(method);

string externName = _compilation.PInvokeILProvider.GetDirectCallExternName(md);
externName = _compilation.NodeFactory.NameMangler.NodeMangler.ExternMethod(externName, md);

pLookup = CreateConstLookupToSymbol(_compilation.NodeFactory.ExternSymbol(externName));
}
Expand Down