Skip to content

X86 GCDecoder RevPInvoke nits #116264

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
jkotas merged 4 commits into from
Jun 4, 2025
Merged

X86 GCDecoder RevPInvoke nits #116264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e11b942
fix ternary operator in runtime gcdecoder
Jun 3, 2025
dec0d95
handle revpinvoke count correctly in r2r dump gcdecoder
Jun 3, 2025
97e09b5
use XOR instead of ternary
max-charlamb Jun 3, 2025
5b23ccf
Update src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/x86/Inf…
jkotas Jun 3, 2025
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/inc/gcdecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ PTR_CBYTE FASTCALL decodeHeader(PTR_CBYTE table, UINT32 version, InfoHdr* header
header->syncStartOffset ^= HAS_SYNC_OFFSET;
break;
case FLIP_REV_PINVOKE_FRAME:
header->revPInvokeOffset = INVALID_REV_PINVOKE_OFFSET ? HAS_REV_PINVOKE_FRAME_OFFSET : INVALID_REV_PINVOKE_OFFSET;
header->revPInvokeOffset ^= (INVALID_REV_PINVOKE_OFFSET ^ HAS_REV_PINVOKE_FRAME_OFFSET);
break;

case NEXT_OPCODE:
Expand Down
8 changes: 5 additions & 3 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/x86/InfoHdr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public struct InfoHdrSmall
{
private const uint INVALID_GS_COOKIE_OFFSET = 0;
private const uint INVALID_SYNC_OFFSET = 0;
private const uint INVALID_REV_PINVOKE_OFFSET = 0xFFFFFFFF;

public uint PrologSize { get; set; }
public uint EpilogSize { get; set; }
Expand Down Expand Up @@ -82,7 +83,7 @@ public InfoHdrSmall(uint prologSize, uint epilogSize, byte epilogCount, byte epi
GsCookieOffset = 0;
SyncStartOffset = 0;
SyncEndOffset = 0;
RevPInvokeOffset = 0;
RevPInvokeOffset = INVALID_REV_PINVOKE_OFFSET;
NoGCRegionCnt = 0;

HasArgTabOffset = false;
Expand Down Expand Up @@ -163,7 +164,8 @@ public class InfoHdrDecoder {
private const uint HAS_UNTRACKED = 0xFFFFFFFF;
private const uint HAS_GS_COOKIE_OFFSET = 0xFFFFFFFF;
private const uint HAS_SYNC_OFFSET = 0xFFFFFFFF;
private const uint HAS_REV_PINVOKE_FRAME_OFFSET = 0xFFFFFFFF;
private const uint INVALID_REV_PINVOKE_OFFSET = 0xFFFFFFFF;
private const uint HAS_REV_PINVOKE_FRAME_OFFSET = 0xFFFFFFFE;
private const uint HAS_NOGCREGIONS = 0xFFFFFFFF;
private const uint YES = HAS_VARPTR;

Expand Down Expand Up @@ -278,7 +280,7 @@ public static InfoHdrSmall DecodeHeader(byte[] image, ref int offset, int codeLe
header.SyncStartOffset ^= HAS_SYNC_OFFSET;
break;
case (byte)InfoHdrAdjust.FLIP_REV_PINVOKE_FRAME:
header.RevPInvokeOffset ^= HAS_REV_PINVOKE_FRAME_OFFSET;
header.RevPInvokeOffset ^= (INVALID_REV_PINVOKE_OFFSET ^ HAS_REV_PINVOKE_FRAME_OFFSET);
break;

case (byte)InfoHdrAdjust.NEXT_OPCODE:
Expand Down
Loading