diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2018-10-04 10:18:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 10:18:23 +0200 |
commit | 11832401739148f1f1e9419cb51180ba5263a41b (patch) | |
tree | 91e81791918d307b0bc9f8255d022fd2fbfbd970 /src/vm/i386 | |
parent | 0068168531e849cbad8388f00f3f23e58d3a01b4 (diff) | |
download | coreclr-11832401739148f1f1e9419cb51180ba5263a41b.tar.gz coreclr-11832401739148f1f1e9419cb51180ba5263a41b.tar.bz2 coreclr-11832401739148f1f1e9419cb51180ba5263a41b.zip |
Remove AppDomain unload (#20250)
* Remove AppDomain unload
This change removes all code in AppDomain that's related to AppDomain
unloading which is obsolete in CoreCLR. It also removes all calls to the
removed methods.
In few places, I have made the change simpler by taking into account the
fact that there is always just one AppDomain.
Diffstat (limited to 'src/vm/i386')
-rw-r--r-- | src/vm/i386/asmconstants.h | 8 | ||||
-rw-r--r-- | src/vm/i386/asmhelpers.S | 22 | ||||
-rw-r--r-- | src/vm/i386/asmhelpers.asm | 25 |
3 files changed, 4 insertions, 51 deletions
diff --git a/src/vm/i386/asmconstants.h b/src/vm/i386/asmconstants.h index 70f6e30c4a..e17cec7227 100644 --- a/src/vm/i386/asmconstants.h +++ b/src/vm/i386/asmconstants.h @@ -175,7 +175,7 @@ ASMCONSTANTS_C_ASSERT(CORINFO_ArgumentException_ASM == CORINFO_ArgumentException #ifndef CROSSGEN_COMPILE // from clr/src/vm/threads.h -#define Thread_m_Context 0x38 +#define Thread_m_Context 0x34 ASMCONSTANTS_C_ASSERT(Thread_m_Context == offsetof(Thread, m_Context)) #define Thread_m_State 0x04 @@ -193,10 +193,10 @@ ASMCONSTANTS_C_ASSERT(Thread_m_pFrame == offsetof(Thread, m_pFrame)) #endif // CROSSGEN_COMPILE #ifndef CROSSGEN_COMPILE -#define Thread_m_dwLockCount 0x18 +#define Thread_m_dwLockCount 0x14 ASMCONSTANTS_C_ASSERT(Thread_m_dwLockCount == offsetof(Thread, m_dwLockCount)) -#define Thread_m_ThreadId 0x1C +#define Thread_m_ThreadId 0x18 ASMCONSTANTS_C_ASSERT(Thread_m_ThreadId == offsetof(Thread, m_ThreadId)) #ifdef FEATURE_HIJACK @@ -338,7 +338,7 @@ ASMCONSTANTS_C_ASSERT(UMThunkMarshInfo__m_cbRetPop == offsetof(UMThunkMarshInfo, #endif //FEATURE_STUBS_AS_IL #ifndef CROSSGEN_COMPILE -#define Thread__m_pDomain 0x14 +#define Thread__m_pDomain 0x10 ASMCONSTANTS_C_ASSERT(Thread__m_pDomain == offsetof(Thread, m_pDomain)); #endif diff --git a/src/vm/i386/asmhelpers.S b/src/vm/i386/asmhelpers.S index 2052088f51..09fb50266f 100644 --- a/src/vm/i386/asmhelpers.S +++ b/src/vm/i386/asmhelpers.S @@ -555,28 +555,6 @@ LEAF_ENTRY PrecodeFixupThunk, _TEXT jmp C_FUNC(ThePreStub) LEAF_END PrecodeFixupThunk, _TEXT -// void __stdcall UM2MThunk_WrapperHelper(void *pThunkArgs, -// int argLen, -// void *pAddr, -// UMEntryThunk *pEntryThunk, -// Thread *pThread) -NESTED_ENTRY UM2MThunk_WrapperHelper, _TEXT, NoHandler - push ebx - - mov eax, [esp + 20] // pEntryThunk - mov ecx, [esp + 24] // pThread - mov ebx, [esp + 8] // pThunkArgs - - sub esp, 8 - CHECK_STACK_ALIGNMENT - call [esp + 16 + 8] // pAddr - add esp, 8 - - pop ebx - - ret 20 -NESTED_END UM2MThunk_WrapperHelper, _TEXT - NESTED_ENTRY UMThunkStubRareDisable, _TEXT, NoHandler push eax push ecx diff --git a/src/vm/i386/asmhelpers.asm b/src/vm/i386/asmhelpers.asm index 17d521fb92..18b5c6eb98 100644 --- a/src/vm/i386/asmhelpers.asm +++ b/src/vm/i386/asmhelpers.asm @@ -926,31 +926,6 @@ getFPReturn4: retn 8 _getFPReturn@8 endp -; void __stdcall UM2MThunk_WrapperHelper(void *pThunkArgs, -; int argLen, -; void *pAddr, -; UMEntryThunk *pEntryThunk, -; Thread *pThread) -UM2MThunk_WrapperHelper proc stdcall public, - pThunkArgs : DWORD, - argLen : DWORD, - pAddr : DWORD, - pEntryThunk : DWORD, - pThread : DWORD - UNREFERENCED argLen - - push ebx - - mov eax, pEntryThunk - mov ecx, pThread - mov ebx, pThunkArgs - call pAddr - - pop ebx - - ret -UM2MThunk_WrapperHelper endp - ; VOID __cdecl UMThunkStubRareDisable() ;<TODO> ; @todo: this is very similar to StubRareDisable |