Skip to content
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

Jump to bottom

Port generator to use AsmResolver #124

Merged
merged 36 commits into from
Sep 8, 2024
Merged

Port generator to use AsmResolver #124

merged 36 commits into from
Sep 8, 2024

Conversation

ds5678
Copy link
Collaborator

@ds5678 ds5678 commented May 13, 2024 •
edited
Loading

No description provided.

@ds5678 ds5678 marked this pull request as draft May 13, 2024 06:12
This was referenced May 13, 2024
Merged
Merged
@ds5678 ds5678 mentioned this pull request Jun 29, 2024
Merged
@ds5678 ds5678 marked this pull request as ready for review July 1, 2024 05:46
ds5678 added 18 commits July 7, 2024 13:41
@ds5678
Port generator to use AsmResolver
b86d87e
@ds5678
Improve method unstripping
c3bfab4 
* Reuse primitive operands
* Support Parameter operands
* Map local variables
* Map instruction labels
@ds5678
Rewrite mscorlib 2 to mscorlib 4
c8107f1
@ds5678
Formatting
8107c35
@ds5678
Use full name for importing a corlib reference
102c431
@ds5678
Handle some nullable warnings
4e5a2a7
@ds5678
StartsWith extension method for Utf8String
f6228ad
@ds5678
Switch opcode unstripping
98aa95c
@ds5678
Don't unstrip methods that use array opcodes
332d5ff
@ds5678
Improve unstripping support for newarr:
837e532 
* Fail for struct target types
* Use Il2CppStringArray for System.String
@ds5678
Address format workflow errors
1757f0c
@ds5678
AsmResolver 6
19b2295
@ds5678
Replace SetSemanticMethods with new set accessors from AsmResolver 6
06b123b
@ds5678
Implement HasOverrides
00b7302
@ds5678
Nullable annotations
5b30890
@ds5678
Copy generic parameter constraints when creating params methods
4c1e51e
@ds5678
Remove CecilAdapter
15eaeab
@ds5678
Unstrip ldlen
5e58d9e
@ds5678
Copy link
Collaborator Author

ds5678 commented Jul 13, 2024

After doing some more validation, I discovered that the Cecil HasOverrides property was always returning false. In light of that, I have removed the HasOverrides check entirely. The output is now almost exactly consistent.

@ds5678
Copy link
Collaborator Author

ds5678 commented Jul 13, 2024

The validator is available here: https://github.com/AssetRipper/AssetRipper.CIL/tree/ecdd481b87f5f4872897d7408eae6eedaab5834e/AssetRipper.CIL.Validator

This was referenced Jul 14, 2024
Closed
Open
@ds5678 ds5678 added the generation Related to assembly generation label Jul 15, 2024
@ds5678 ds5678 mentioned this pull request Jul 15, 2024
Closed
@ds5678 ds5678 added this to the 1.4.6 milestone Jul 15, 2024
SamboyCoding
SamboyCoding suggested changes Jul 15, 2024
View reviewed changes
Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/MetadataAccess/CecilMetadataAccess.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Passes/Pass60AddImplicitConversions.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs Outdated Show resolved Hide resolved
Il2CppInterop.Generator/Passes/Pass90WriteToDisk.cs Outdated Show resolved Hide resolved
@ds5678
Copy link
Collaborator Author

ds5678 commented Jul 15, 2024

@SamboyCoding Thank you for the review! I'll address these tonight.

@ds5678
Copy link
Collaborator Author

ds5678 commented Jul 16, 2024

Thanks again for the review. I made some changes based on your feedback.

@ds5678
Assembly reference improvements
0f91436 
* Declare System.Runtime as our corlib
* Add TargetFrameworkAttribute to generated assemblies
@ds5678
Copy link
Collaborator Author

ds5678 commented Jul 17, 2024

Note: my latest commit "broke" consistency due to changing the corlib, which caused a ton of imported references to become inequal, but otherwise it's still consistent.

ds5678 added a commit to ds5678/Il2CppInterop that referenced this pull request Jul 29, 2024
@ds5678
Port generator to use AsmResolver
e58db47 
* Resolves BepInEx#124
@ManlyMarco ManlyMarco merged commit 06cd048 into BepInEx:master Sep 8, 2024
2 checks passed
@ds5678 ds5678 deleted the asmresolver-port branch September 8, 2024 15:51
@limoka limoka mentioned this pull request Sep 9, 2024
Open
This was referenced Sep 28, 2024
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@js6pak js6pak js6pak left review comments

@SamboyCoding SamboyCoding SamboyCoding approved these changes

@ManlyMarco ManlyMarco ManlyMarco approved these changes

Assignees
No one assigned
Labels
generation Related to assembly generation
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.
4 participants
@ds5678 @SamboyCoding @js6pak @ManlyMarco