Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

X86 GcEncode: Support V1 and V2 encodings #7237

Merged
merged 1 commit into from
Sep 19, 2016

Conversation

swaroop-sridhar
Copy link

The RYU+LegacyBackend Desktop JIT for X86 is still on V1.
So, permit both V1 and V2 encodings in gcencode.cpp.

@@ -92,12 +92,11 @@ PTR_CBYTE FASTCALL decodeHeader(PTR_CBYTE table, UINT32 version, InfoHdr* header

BYTE nextByte = *table++;
BYTE encoding = nextByte & 0x7f;
const BYTE maskHaveMoreBytesBit = MORE_BYTES_TO_FOLLOW - 1;
Copy link
Author

Choose a reason for hiding this comment

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

This change is independent of allowing V1 for desktop.
It implements a change @briansull asked in this review: #6974 (comment)

@swaroop-sridhar
Copy link
Author

@BruceForstall please review
CC: @dotnet/jit-contrib

@@ -685,7 +684,7 @@ BYTE FASTCALL encodeHeaderNext(const InfoHdr& header, InfoHdr* state, BYTE &code
}
}

if (state->revPInvokeOffset != header.revPInvokeOffset)
if (GCInfoEncodesRevPInvokeFrame() && (state->revPInvokeOffset != header.revPInvokeOffset))
{
_ASSERTE(GCInfoEncodesRevPInvokeFrame());
Copy link
Member

Choose a reason for hiding this comment

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

You don't need this assert now.

The RYU+LegacyBackend Desktop JIT for X86 is still on V1.
So, permit both V1 and V2 encodings in gcencode.cpp.
@swaroop-sridhar swaroop-sridhar merged commit 217ba4d into dotnet:master Sep 19, 2016
@swaroop-sridhar swaroop-sridhar deleted the gc86legacy branch September 19, 2016 16:02
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
X86 GcEncode: Support V1 and V2 encodings

Commit migrated from dotnet/coreclr@217ba4d
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants