diff options
| author | Evgeny Pavlov <lucenticus@gmail.com> | 2017-03-02 03:10:17 +0300 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-02 01:10:17 +0100 |
| commit | b0213b97838c4e1efe0eb2c3c60b78fec0d0da0c (patch) | |
| tree | ffd124c058b2106aea891cd0a981e6567e073afa /src/vm/dllimportcallback.h | |
| parent | 6af7b26738149d46eaccbce631d670c949527ada (diff) | |
| download | coreclr-b0213b97838c4e1efe0eb2c3c60b78fec0d0da0c.tar.gz coreclr-b0213b97838c4e1efe0eb2c3c60b78fec0d0da0c.tar.bz2 coreclr-b0213b97838c4e1efe0eb2c3c60b78fec0d0da0c.zip | |
[x86/Linux] Initial fix of arguments passing in FunctionPtrTest (WIP) (#9855)
* [x86/Linux] Initial fix of incorrect arguments passing in FunctionPtrTest
Diffstat (limited to 'src/vm/dllimportcallback.h')
| -rw-r--r-- | src/vm/dllimportcallback.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/vm/dllimportcallback.h b/src/vm/dllimportcallback.h index c2ed6d0039..c6f5788739 100644 --- a/src/vm/dllimportcallback.h +++ b/src/vm/dllimportcallback.h @@ -210,11 +210,17 @@ private: // On x86, NULL for no-marshal signatures // On non-x86, the managed entrypoint for no-delegate no-marshal signatures UINT32 m_cbActualArgSize; // caches m_pSig.SizeOfFrameArgumentArray() -#if defined(_TARGET_X86_) && !defined(FEATURE_STUBS_AS_IL) - Stub* m_pExecStub; // UMEntryThunk jumps directly here +#if defined(_TARGET_X86_) UINT16 m_cbRetPop; // stack bytes popped by callee (for UpdateRegDisplay) +#if defined(FEATURE_STUBS_AS_IL) + UINT32 m_ecxArgOffset; + UINT32 m_edxArgOffset; +#else + Stub* m_pExecStub; // UMEntryThunk jumps directly here UINT16 m_callConv; // unmanaged calling convention and flags (CorPinvokeMap) -#endif +#endif // FEATURE_STUBS_AS_IL +#endif // _TARGET_X86_ + MethodDesc * m_pMD; // maybe null Module * m_pModule; Signature m_sig; |