diff options
Diffstat (limited to 'src/vm/i386/asmconstants.h')
| -rw-r--r-- | src/vm/i386/asmconstants.h | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/src/vm/i386/asmconstants.h b/src/vm/i386/asmconstants.h index ce648518f9..0a581cffe0 100644 --- a/src/vm/i386/asmconstants.h +++ b/src/vm/i386/asmconstants.h @@ -33,30 +33,12 @@ #define DBG_FRE(dbg,fre) fre #endif -//*************************************************************************** -#if defined(_DEBUG) && defined(_TARGET_X86_) && !defined(FEATURE_CORECLR) - #define HAS_TRACK_CXX_EXCEPTION_CODE_HACK 1 - #define TRACK_CXX_EXCEPTION_CODE_HACK -#else - #define HAS_TRACK_CXX_EXCEPTION_CODE_HACK 0 -#endif - #define INITIAL_SUCCESS_COUNT 0x100 #define DynamicHelperFrameFlags_Default 0 #define DynamicHelperFrameFlags_ObjectArg 1 #define DynamicHelperFrameFlags_ObjectArg2 2 -#ifdef FEATURE_REMOTING -#define TransparentProxyObject___stubData 0x8 -ASMCONSTANTS_C_ASSERT(TransparentProxyObject___stubData == offsetof(TransparentProxyObject, _stubData)) - -#define TransparentProxyObject___stub 0x14 -ASMCONSTANTS_C_ASSERT(TransparentProxyObject___stub == offsetof(TransparentProxyObject, _stub)) - -#define TransparentProxyObject___pMT 0xc -ASMCONSTANTS_C_ASSERT(TransparentProxyObject___pMT == offsetof(TransparentProxyObject, _pMT)) -#endif // FEATURE_REMOTING // CONTEXT from rotor_pal.h #define CONTEXT_Edi 0x9c @@ -210,14 +192,7 @@ ASMCONSTANTS_C_ASSERT(CORINFO_ArgumentException_ASM == CORINFO_ArgumentException #ifndef CROSSGEN_COMPILE // from clr/src/vm/threads.h -#if defined(TRACK_CXX_EXCEPTION_CODE_HACK) // Is C++ exception code tracking turned on? - #define Thread_m_LastCxxSEHExceptionCode 0x20 - ASMCONSTANTS_C_ASSERT(Thread_m_LastCxxSEHExceptionCode == offsetof(Thread, m_LastCxxSEHExceptionCode)) - - #define Thread_m_Context 0x3C -#else - #define Thread_m_Context 0x38 -#endif // TRACK_CXX_EXCEPTION_CODE_HACK +#define Thread_m_Context 0x38 ASMCONSTANTS_C_ASSERT(Thread_m_Context == offsetof(Thread, m_Context)) #define Thread_m_State 0x04 @@ -258,16 +233,6 @@ ASMCONSTANTS_C_ASSERT(Thread::TS_Hijacked == TS_Hijacked_ASM) ASMCONSTANTS_C_ASSERT(AppDomain__m_dwId == offsetof(AppDomain, m_dwId)); // from clr/src/vm/ceeload.cpp -#ifdef FEATURE_MIXEDMODE -#define IJWNOADThunk__m_cache 0x1C -ASMCONSTANTS_C_ASSERT(IJWNOADThunk__m_cache == offsetof(IJWNOADThunk, m_cache)) - -#define IJWNOADThunk__NextCacheOffset 0x8 -ASMCONSTANTS_C_ASSERT(IJWNOADThunk__NextCacheOffset == sizeof(IJWNOADThunkStubCache)) - -#define IJWNOADThunk__CodeAddrOffsetFromADID 0x4 -ASMCONSTANTS_C_ASSERT(IJWNOADThunk__CodeAddrOffsetFromADID == offsetof(IJWNOADThunkStubCache, m_CodeAddr)) -#endif //FEATURE_MIXEDMODE // from clr/src/vm/syncblk.h #define SizeOfSyncTableEntry_ASM 8 @@ -463,6 +428,11 @@ ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_pILStub == offsetof(UMThunkMarshInfo, #define UMThunkMarshInfo__m_cbActualArgSize 0x04 ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_cbActualArgSize == offsetof(UMThunkMarshInfo, m_cbActualArgSize)) +#ifdef FEATURE_STUBS_AS_IL +#define UMThunkMarshInfo__m_cbRetPop 0x08 +ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_cbRetPop == offsetof(UMThunkMarshInfo, m_cbRetPop)) +#endif //FEATURE_STUBS_AS_IL + #ifndef CROSSGEN_COMPILE #define Thread__m_pDomain 0x14 ASMCONSTANTS_C_ASSERT(Thread__m_pDomain == offsetof(Thread, m_pDomain)); |