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

[x86/Linux] Extract ARRAYSTUBS_AS_IL code from STUBS_AS_IL region #8443

Merged
merged 1 commit into from
Dec 6, 2016
Merged

[x86/Linux] Extract ARRAYSTUBS_AS_IL code from STUBS_AS_IL region #8443

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
10 changes: 6 additions & 4 deletions src/vm/i386/stublinkerx86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4824,8 +4824,9 @@ VOID StubLinkerCPU::EmitSecureDelegateInvoke(UINT_PTR hash)
// Epilog
EmitMethodStubEpilog(numStackBytes, SecureDelegateFrame::GetOffsetOfTransitionBlock());
}
#endif // !CROSSGEN_COMPILE && !FEATURE_STUBS_AS_IL

#ifndef FEATURE_ARRAYSTUB_AS_IL
#if !defined(CROSSGEN_COMPILE) && !defined(FEATURE_ARRAYSTUB_AS_IL)

// Little helper to generate code to move nbytes bytes of non Ref memory

Expand Down Expand Up @@ -5768,8 +5769,9 @@ VOID StubLinkerCPU::EmitArrayOpStub(const ArrayOpScript* pArrayOpScript)
#pragma warning(pop)
#endif

#endif // FEATURE_ARRAYSTUB_AS_IL
#endif // !CROSSGEN_COMPILE && !FEATURE_ARRAYSTUB_AS_IL

#if !defined(CROSSGEN_COMPILE) && !defined(FEATURE_STUBS_AS_IL)
//===========================================================================
// Emits code to break into debugger
VOID StubLinkerCPU::EmitDebugBreak()
Expand Down Expand Up @@ -5841,9 +5843,9 @@ Thread* __stdcall CreateThreadBlockReturnHr(ComMethodFrame *pFrame)
#pragma warning(pop)
#endif

#endif // defined(FEATURE_COMINTEROP) && defined(_TARGET_X86_)
#endif // FEATURE_COMINTEROP && _TARGET_X86_

#endif // !defined(CROSSGEN_COMPILE) && !defined(FEATURE_STUBS_AS_IL)
#endif // !CROSSGEN_COMPILE && !FEATURE_STUBS_AS_IL

#endif // !DACCESS_COMPILE

Expand Down
2 changes: 2 additions & 0 deletions src/vm/i386/stublinkerx86.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,14 @@ class StubLinkerCPU : public StubLinker
VOID EmitShuffleThunk(struct ShuffleEntry *pShuffleEntryArray);


#ifndef FEATURE_ARRAYSTUB_AS_IL
//===========================================================================
// Emits code to do an array operation.
VOID EmitArrayOpStub(const ArrayOpScript*);

//Worker function to emit throw helpers for array ops.
VOID EmitArrayOpStubThrow(unsigned exConst, unsigned cbRetArg);
#endif

//===========================================================================
// Emits code to break into debugger
Expand Down