Cleanup

Author: filipnavara

src/coreclr/vm/excep.cpp

@@ -11547,6 +11547,40 @@ void SoftwareExceptionFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool u
 }
 
 #ifndef DACCESS_COMPILE
+#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
+
+void SoftwareExceptionFrame::Init(TransitionBlock *pTransitionBlock)
+{
+    WRAPPER_NO_CONTRACT;
+
+    m_Context.Ecx = pTransitionBlock->m_argumentRegisters.ECX;
+    m_Context.Edx = pTransitionBlock->m_argumentRegisters.EDX;
+    m_ContextPointers.Ecx = &m_Context.Ecx;
+    m_ContextPointers.Edx = &m_Context.Edx;
+
+#define CALLEE_SAVED_REGISTER(reg) \
+    m_Context.reg = pTransitionBlock->m_calleeSavedRegisters.reg; \
+    m_ContextPointers.reg = &m_Context.reg;
+    ENUM_CALLEE_SAVED_REGISTERS();
+#undef CALLEE_SAVED_REGISTER
+
+    m_Context.Esp = (UINT_PTR)(pTransitionBlock + 1);
+    m_Context.Eip = pTransitionBlock->m_ReturnAddress;
+    m_ReturnAddress = pTransitionBlock->m_ReturnAddress;
+
+    _ASSERTE(ExecutionManager::IsManagedCode(pTransitionBlock->m_ReturnAddress));
+}
+
+void SoftwareExceptionFrame::InitAndLink(TransitionBlock *pTransitionBlock, Thread *pThread)
+{
+    WRAPPER_NO_CONTRACT;
+
+    Init(pTransitionBlock);
+    Push(pThread);
+}
+
+#else
+
 //
 // Init a new frame
 //
@@ -11559,11 +11593,7 @@ void SoftwareExceptionFrame::Init()
 #undef CALLEE_SAVED_REGISTER
 
 #ifdef TARGET_WINDOWS
-    // On Windows/x86 we don't have unwinding available for native code
-    // so we capture the context differently in IL_Throw and IL_Rethrow.
-#ifndef TARGET_X86
     Thread::VirtualUnwindCallFrame(&m_Context, &m_ContextPointers);
-#endif // !TARGET_X86
 #else // !TARGET_WINDOWS
     BOOL success = PAL_VirtualUnwind(&m_Context, &m_ContextPointers);
     if (!success)
@@ -11590,9 +11620,9 @@ void SoftwareExceptionFrame::InitAndLink(Thread *pThread)
     WRAPPER_NO_CONTRACT;
 
     Init();
-
     Push(pThread);
 }
 
+#endif // TARGET_X86 && TARGET_WINDOWS
 #endif // DACCESS_COMPILE
 #endif // FEATURE_EH_FUNCLETS

src/coreclr/vm/exceptionhandling.cpp

@@ -463,11 +463,15 @@ void ExceptionTracker::UpdateNonvolatileRegisters(CONTEXT *pContextRecord, REGDI
         pAbortContext = GetThread()->GetAbortContext();
     }
 
-#ifndef TARGET_UNIX
-#define HANDLE_NULL_CONTEXT_POINTER _ASSERTE(false)
-#else // TARGET_UNIX
+    // Windows/x86 doesn't have unwinding mechanism for native code. RtlUnwind in
+    // ProcessCLRException leaves us with the original exception context. Thus we
+    // rely solely on our frames and managed code unwinding. This also means that
+    // if we pass through InlinedCallFrame we end up with empty context pointers.
+#if defined(TARGET_UNIX) || defined(TARGET_X86)
 #define HANDLE_NULL_CONTEXT_POINTER
-#endif // TARGET_UNIX
+#else // TARGET_UNIX || TARGET_X86
+#define HANDLE_NULL_CONTEXT_POINTER _ASSERTE(false)
+#endif // TARGET_UNIX || TARGET_X86
 
 #define UPDATEREG(reg)                                                                      \
     do {                                                                                    \

src/coreclr/vm/frames.h

@@ -1039,8 +1039,15 @@ class SoftwareExceptionFrame : public Frame
         return PTR_HOST_MEMBER_TADDR(SoftwareExceptionFrame, this, m_ReturnAddress);
     }
 
+#ifndef DACCESS_COMPILE
+#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
+    void Init(TransitionBlock *pTransitionBlock);
+    void InitAndLink(TransitionBlock *pTransitionBlock, Thread *pThread);
+#else
     void Init();
     void InitAndLink(Thread *pThread);
+#endif
+#endif
 
     Interception GetInterception_Impl()
     {

src/coreclr/vm/jithelpers.cpp

@@ -1810,24 +1810,6 @@ HCIMPLEND
 
 /*************************************************************/
 
-#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
-static void TransitionBlockToContext(TransitionBlock* transitionBlock, T_CONTEXT *pContext)
-{
-    //#define ARGUMENT_REGISTER(reg) pContext->reg = transitionBlock->m_argumentRegisters.reg;
-    //ENUM_ARGUMENT_REGISTERS();
-    //#undef ARGUMENT_REGISTER
-    pContext->Ecx = transitionBlock->m_argumentRegisters.ECX;
-    pContext->Edx = transitionBlock->m_argumentRegisters.EDX;
-
-    #define CALLEE_SAVED_REGISTER(reg) pContext->reg = transitionBlock->m_calleeSavedRegisters.reg;
-    ENUM_CALLEE_SAVED_REGISTERS();
-    #undef CALLEE_SAVED_REGISTER
-
-    pContext->Esp = (UINT_PTR)(transitionBlock + 1);
-    pContext->Eip = transitionBlock->m_ReturnAddress;
-}
-#endif
-
 #if defined(TARGET_X86) && defined(TARGET_WINDOWS)
 EXTERN_C FCDECL1(void, IL_Throw,  Object* obj);
 EXTERN_C HCIMPL2(void, IL_Throw_x86,  Object* obj, TransitionBlock* transitionBlock)
@@ -1851,11 +1833,11 @@ HCIMPL1(void, IL_Throw,  Object* obj)
 
         SoftwareExceptionFrame exceptionFrame;
 #if defined(TARGET_X86) && defined(TARGET_WINDOWS)
-        TransitionBlockToContext(transitionBlock, exceptionFrame.GetContext());
+        exceptionFrame.InitAndLink(transitionBlock, pThread);
 #else
         ClrCaptureContext(exceptionFrame.GetContext());
-#endif
         exceptionFrame.InitAndLink(pThread);
+#endif
 
         FC_CAN_TRIGGER_GC();
 
@@ -1950,11 +1932,11 @@ HCIMPL0(void, IL_Rethrow)
 
         SoftwareExceptionFrame exceptionFrame;
 #if defined(TARGET_X86) && defined(TARGET_WINDOWS)
-        TransitionBlockToContext(transitionBlock, exceptionFrame.GetContext());
+        exceptionFrame.InitAndLink(transitionBlock, pThread);
 #else
         ClrCaptureContext(exceptionFrame.GetContext());
-#endif
         exceptionFrame.InitAndLink(pThread);
+#endif
 
         ExInfo *pActiveExInfo = (ExInfo*)pThread->GetExceptionState()->GetCurrentExceptionTracker();