Skip to content

Add Webcil support to R2RDump #127885

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

Open
davidwrighton wants to merge 6 commits into
base: main
Choose a base branch
from
+1,703 −14
Open

Add Webcil support to R2RDump #127885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b124293
Add Webcil support to R2RDump
davidwrighton May 5, 2026
5ed602b
Add GetSectionData to IAssemblyMetadata and implement in all types
davidwrighton May 5, 2026
1fcf0cf
Add WASM bytecode disassembler for R2RDump
davidwrighton May 5, 2026
0189c5b
Fix GC collection of pinned metadata array in WebcilAssemblyMetadata
davidwrighton May 5, 2026
ee40342
Implement full SIMD instruction decoding in WasmDisassembler
davidwrighton May 6, 2026
7bc3d28
Add try_table instruction decoding to WasmDisassembler
davidwrighton May 6, 2026
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
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ public SimpleAssemblyMetadata(string path)
_peReader = new PEReader(new MemoryStream(imageBytes));
}

public PEReader ImageReader => _peReader;
public BlobReader GetSectionData(int relativeVirtualAddress) => _peReader.GetSectionData(relativeVirtualAddress).GetReader();

public MetadataReader MetadataReader => _peReader.GetMetadataReader();
}
3 changes: 1 addition & 2 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/IAssemblyMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ namespace ILCompiler.Reflection.ReadyToRun
/// </summary>
public interface IAssemblyMetadata
{
PEReader ImageReader { get; }

BlobReader GetSectionData(int relativeVirtualAddress);
MetadataReader MetadataReader { get; }
}
}
1 change: 1 addition & 0 deletions ...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<Compile Include="..\..\Common\Internal\Runtime\ReadyToRunInstructionSet.cs" Link="Common\ReadyToRunInstructionSet.cs" />
<Compile Include="..\..\Common\MachO\**\*.cs" Link="MachO\%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\..\Common\Pgo\PgoFormat.cs" Link="Common\PgoFormat.cs" />
<Compile Include="..\..\Common\Wasm\Webcil.cs" Link="Webcil\Webcil.cs" />
</ItemGroup>

</Project>
7 changes: 6 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ManifestAssemblyMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ public ManifestAssemblyMetadata(PEReader peReader, MetadataReader metadataReader
_peReader = peReader;
}

public PEReader ImageReader => _peReader;
public BlobReader GetSectionData(int relativeVirtualAddress)
{
if (_peReader is null)
return default;
return _peReader.GetSectionData(relativeVirtualAddress).GetReader();
}

public MetadataReader MetadataReader => _metadataReader;

Expand Down
13 changes: 8 additions & 5 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,15 @@ public ReadyToRunMethod(
MethodDefinition methodDef = ComponentReader.MetadataReader.GetMethodDefinition((MethodDefinitionHandle)MethodHandle);
if (methodDef.RelativeVirtualAddress != 0)
{
System.Diagnostics.Debug.Assert(ComponentReader.ImageReader != null, "Component should be a PE and have an associated PEReader");
MethodBodyBlock mbb = ComponentReader.ImageReader.GetMethodBody(methodDef.RelativeVirtualAddress);
if (!mbb.LocalSignature.IsNil)
BlobReader sectionData = ComponentReader.GetSectionData(methodDef.RelativeVirtualAddress);
if (sectionData.Length > 0)
{
StandaloneSignature ss = ComponentReader.MetadataReader.GetStandaloneSignature(mbb.LocalSignature);
LocalSignature = ss.DecodeLocalSignature(typeProvider, genericContext);
MethodBodyBlock mbb = MethodBodyBlock.Create(sectionData);
if (!mbb.LocalSignature.IsNil)
{
StandaloneSignature ss = ComponentReader.MetadataReader.GetStandaloneSignature(mbb.LocalSignature);
LocalSignature = ss.DecodeLocalSignature(typeProvider, genericContext);
}
}
}
Name = ComponentReader.MetadataReader.GetString(methodDef.Name);
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,10 @@ private unsafe void Initialize(IAssemblyMetadata metadata)
{
CompositeReader = new MachO.MachOImageReader(image);
}
else if (WebcilImageReader.IsWebcilImage(image))
{
CompositeReader = new WebcilImageReader(image);
}
Comment on lines +504 to +507
Copy link
Copy Markdown
Member Author

@davidwrighton davidwrighton May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a future problem.

else
{
CompositeReader = new PEImageReader(new PEReader(Unsafe.As<byte[], ImmutableArray<byte>>(ref image)));
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/StandaloneAssemblyMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public StandaloneAssemblyMetadata(PEReader peReader)
_metadataReader = _peReader.GetMetadataReader();
}

public PEReader ImageReader => _peReader;
public BlobReader GetSectionData(int relativeVirtualAddress) => _peReader.GetSectionData(relativeVirtualAddress).GetReader();

public MetadataReader MetadataReader => _metadataReader;
}
Expand Down
Loading
Loading