summaryrefslogtreecommitdiff
path: root/src/vm/i386
diff options
context:
space:
mode:
authorDavid Wrighton <davidwr@microsoft.com>2019-04-03 15:54:05 -0700
committerGitHub <noreply@github.com>2019-04-03 15:54:05 -0700
commitd3e39bc2f81e3dbf9e4b96347f62b49d8700336c (patch)
tree78b72499a0f38e9dbf6ae4d6d24c77779ac543dc /src/vm/i386
parenta7dd6192530dec1d424c359233a1b92f559fa92a (diff)
downloadcoreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.tar.gz
coreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.tar.bz2
coreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.zip
Remove ADID and ADIndex from CoreCLR (#23588)
- Remove concept of AppDomain from object api in VM - Various infrastructure around entering/leaving appdomains is removed - Add small implementation of GetAppDomain for use by DAC (to match existing behavior) - Simplify finalizer thread operations - Eliminate AppDomain::Terminate - Remove use of ADID from stresslog - Remove thread enter/leave tracking from AppDomain - Remove unused asm constants across all architectures - Re-order header inclusion order to put gcenv.h before handletable - Remove retail only sync block code involving appdomain index
Diffstat (limited to 'src/vm/i386')
-rw-r--r--src/vm/i386/asmconstants.h15
-rw-r--r--src/vm/i386/jitinterfacex86.cpp3
-rw-r--r--src/vm/i386/umthunkstub.S17
3 files changed, 2 insertions, 33 deletions
diff --git a/src/vm/i386/asmconstants.h b/src/vm/i386/asmconstants.h
index 136a31e7b1..5a3e08a2bd 100644
--- a/src/vm/i386/asmconstants.h
+++ b/src/vm/i386/asmconstants.h
@@ -205,9 +205,6 @@ ASMCONSTANTS_C_ASSERT(Thread::TS_Hijacked == TS_Hijacked_ASM)
// from clr/src/vm/appdomain.hpp
-#define AppDomain__m_dwId 0x4
-ASMCONSTANTS_C_ASSERT(AppDomain__m_dwId == offsetof(AppDomain, m_dwId));
-
// This is the offset from EBP at which the original CONTEXT is stored in one of the
// RedirectedHandledJITCase*_Stub functions.
#define REDIRECTSTUB_EBP_OFFSET_CONTEXT (-4)
@@ -319,9 +316,6 @@ ASMCONSTANTS_C_ASSERT(CallDescrData__returnValue == offsetof(CallDescrD
#define UMEntryThunk__m_pUMThunkMarshInfo 0x0C
ASMCONSTANTS_C_ASSERT(UMEntryThunk__m_pUMThunkMarshInfo == offsetof(UMEntryThunk, m_pUMThunkMarshInfo))
-#define UMEntryThunk__m_dwDomainId 0x10
-ASMCONSTANTS_C_ASSERT(UMEntryThunk__m_dwDomainId == offsetof(UMEntryThunk, m_dwDomainId))
-
#define UMThunkMarshInfo__m_pILStub 0x00
ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_pILStub == offsetof(UMThunkMarshInfo, m_pILStub))
@@ -333,12 +327,6 @@ ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_cbActualArgSize == offsetof(UMThunkMar
ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_cbRetPop == offsetof(UMThunkMarshInfo, m_cbRetPop))
#endif //FEATURE_STUBS_AS_IL
-#ifndef CROSSGEN_COMPILE
-#define Thread__m_pDomain 0x10
-ASMCONSTANTS_C_ASSERT(Thread__m_pDomain == offsetof(Thread, m_pDomain));
-
-#endif
-
// For JIT_PInvokeBegin and JIT_PInvokeEnd helpers
#define Frame__m_Next 0x04
ASMCONSTANTS_C_ASSERT(Frame__m_Next == offsetof(Frame, m_Next));
@@ -355,7 +343,6 @@ ASMCONSTANTS_C_ASSERT(InlinedCallFrame__m_pCallerReturnAddress == offsetof(Inlin
#define InlinedCallFrame__m_pCalleeSavedFP 0x14
ASMCONSTANTS_C_ASSERT(InlinedCallFrame__m_pCalleeSavedFP == offsetof(InlinedCallFrame, m_pCalleeSavedFP));
-
#ifdef FEATURE_STUBS_AS_IL
// DelegateObject from src/vm/object.h
#define DelegateObject___target 0x04 // offset 0 is m_pMethTab of base class Object
@@ -419,6 +406,6 @@ private:
void BogusFunction()
{
// Sample usage to generate the error
- FindCompileTimeConstant<offsetof(AppDomain, m_dwId)> bogus_variable;
+ FindCompileTimeConstant<offsetof(Thread, m_ExceptionState)> bogus_variable;
}
#endif // defined(__cplusplus) && defined(USE_COMPILE_TIME_CONSTANT_FINDER)
diff --git a/src/vm/i386/jitinterfacex86.cpp b/src/vm/i386/jitinterfacex86.cpp
index 78401d85e0..68cf72d8d8 100644
--- a/src/vm/i386/jitinterfacex86.cpp
+++ b/src/vm/i386/jitinterfacex86.cpp
@@ -782,8 +782,7 @@ HCIMPL2_RAW(Object*, UnframedAllocateObjectArray, MethodTable *pArrayMT, DWORD c
return OBJECTREFToObject(AllocateArrayEx(pArrayMT,
(INT32 *)(&cElements),
1,
- FALSE
- DEBUG_ARG(FALSE)));
+ FALSE));
}
HCIMPLEND_RAW
diff --git a/src/vm/i386/umthunkstub.S b/src/vm/i386/umthunkstub.S
index 98f96ef6ec..e40b1917f8 100644
--- a/src/vm/i386/umthunkstub.S
+++ b/src/vm/i386/umthunkstub.S
@@ -75,18 +75,6 @@ LOCAL_LABEL(HaveThread):
LOCAL_LABEL(InCooperativeMode):
-#if _DEBUG
- mov eax, dword ptr [ebp - UMThunkStub_THREAD_OFFSET]
- mov eax, dword ptr [eax + Thread__m_pDomain]
- mov esi, dword ptr [eax + AppDomain__m_dwId]
-
- mov eax, dword ptr [ebp - UMThunkStub_UMENTRYTHUNK_OFFSET]
- mov edi, dword ptr [eax + UMEntryThunk__m_dwDomainId]
-
- cmp esi, edi
- jne LOCAL_LABEL(WrongAppDomain)
-#endif
-
mov eax, dword ptr [ebp - UMThunkStub_UMENTRYTHUNK_OFFSET]
mov ebx, dword ptr [eax + UMEntryThunk__m_pUMThunkMarshInfo]
mov eax, dword ptr [ebx + UMThunkMarshInfo__m_cbActualArgSize]
@@ -178,9 +166,4 @@ LOCAL_LABEL(UMThunkStub_CopyStackArgs):
pop edx
jmp LOCAL_LABEL(UMThunkStub_ArgumentsSetup)
-#if _DEBUG
-LOCAL_LABEL(WrongAppDomain):
- int3
-#endif
-
NESTED_END UMThunkStub, _TEXT