Fix Up ResumeEsp inside ProcessCLRException

Author: parjong

src/inc/eetwain.h

@@ -653,7 +653,7 @@ HRESULT FixContextForEnC(PCONTEXT        pCtx,
     static void EnsureCallerContextIsValid( PREGDISPLAY pRD, StackwalkCacheEntry* pCacheEntry, EECodeInfo * pCodeInfo = NULL );
     static size_t GetCallerSp( PREGDISPLAY  pRD );
 #ifdef _TARGET_X86_
-    static size_t GetResumeSp( PREGDISPLAY  pRD );
+    static size_t GetResumeSp( PCONTEXT  pContext );
 #endif // _TARGET_X86_
 #endif // WIN64EXCEPTIONS
 

src/vm/eetwain.cpp

@@ -4035,9 +4035,13 @@ bool UnwindStackFrame(PREGDISPLAY     pContext,
 
 #ifdef WIN64EXCEPTIONS
 #ifdef _TARGET_X86_
-size_t EECodeManager::GetResumeSp( PREGDISPLAY  pRD )
+size_t EECodeManager::GetResumeSp( PCONTEXT  pContext )
 {
-    EECodeInfo codeInfo(pRD->ControlPC);
+    PCODE currentPc = PCODE(pContext->Eip);
+
+    _ASSERTE(ExecutionManager::IsManagedCode(currentPc));
+
+    EECodeInfo codeInfo(currentPc);
 
     PTR_CBYTE methodStart = PTR_CBYTE(codeInfo.GetSavedMethodCode());
 
@@ -4067,11 +4071,11 @@ size_t EECodeManager::GetResumeSp( PREGDISPLAY  pRD )
 
     if (isESPFrame)
     {
-        const size_t curESP = pRD->SP;
+        const size_t curESP = (size_t)(pContext->Esp);
         return curESP + GetPushedArgSize(info, table, curOffs);
     }
 
-    const size_t curEBP = *pRD->GetEbpLocation();
+    const size_t curEBP = (size_t)(pContext->Ebp);
     return GetOutermostBaseFP(curEBP, info);
 }
 #endif // _TARGET_X86_

src/vm/exceptionhandling.cpp

@@ -123,6 +123,24 @@ bool FixNonvolatileRegisters(UINT_PTR  uOriginalSP,
                              bool      fAborting
                              );
 
+void FixContext(PCONTEXT *pContextRecord)
+{
+#define FIXUPREG(reg, value)                                                                \
+    do {                                                                                    \
+        STRESS_LOG2(LF_GCROOTS, LL_INFO100, "Updating " #reg " %p to %p\n",                 \
+                pContextRecord->reg,                                                        \
+                (value));                                                                   \
+        pContextRecord->reg = (value);                                                      \
+    } while (0)
+
+#ifdef _TARGET_X86_
+    size_t resumeSp = EECodeManager::GetResumeSp(pContextRecord);
+    FIXUPREG(ResumeEsp, resumeSp);
+#endif // _TARGET_X86_
+
+#undef FIXUPREG
+}
+
 MethodDesc * GetUserMethodForILStub(Thread * pThread, UINT_PTR uStubSP, MethodDesc * pILStubMD, Frame ** ppFrameOut);
 
 #ifdef FEATURE_PAL
@@ -441,14 +459,6 @@ void ExceptionTracker::UpdateNonvolatileRegisters(CONTEXT *pContextRecord, REGDI
         }                                                                                   \
     } while (0)
 
-#define UPDATEREG_VAL(reg)                                                                  \
-    do {                                                                                    \
-        STRESS_LOG2(LF_GCROOTS, LL_INFO100, "Updating " #reg " %p to %p\n",                 \
-                pContextRecord->reg,                                                        \
-                pRegDisplay->pCurrentContext->reg);                                         \
-        pContextRecord->reg = pRegDisplay->pCurrentContext->reg;                            \
-    } while (0)
-
 
 #if defined(_TARGET_X86_)
 
@@ -457,8 +467,6 @@ void ExceptionTracker::UpdateNonvolatileRegisters(CONTEXT *pContextRecord, REGDI
     UPDATEREG(Edi);
     UPDATEREG(Ebp);
 
-    UPDATEREG_VAL(ResumeEsp);
-
 #elif defined(_TARGET_AMD64_)
 
     UPDATEREG(Rbx);
@@ -1195,6 +1203,8 @@ ProcessCLRException(IN     PEXCEPTION_RECORD   pExceptionRecord
                 SetIP(pContextRecord, (PCODE)uResumePC);
             }
 
+            FixContext(pContextRecord);
+
 #ifdef STACK_GUARDS_DEBUG
             // We are transitioning back to managed code, so ensure that we are in
             // SO-tolerant mode before we do so.

src/vm/i386/cgenx86.cpp

@@ -384,7 +384,7 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
 #endif // DACCESS_COMPILE
 
     pRD->pCurrentContext->Eip = pRD->ControlPC = m_MachState.GetRetAddr();
-    pRD->pCurrentContext->Esp = pRD->SP = (DWORD) m_MachState.esp();
+    pRD->pCurrentContext->Esp = pRD->pCurrentContext->ResumeEsp = pRD->SP = (DWORD) m_MachState.esp();
 
 #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContext->regname = *((DWORD*) m_MachState.p##regname());
     ENUM_CALLEE_SAVED_REGISTERS();
@@ -402,11 +402,6 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
 
     ClearRegDisplayArgumentAndScratchRegisters(pRD);
 
-    //
-    // Fix up ResumeSp
-    //
-    pRD->pCurrentContext->ResumeEsp = EECodeManager::GetResumeSp(pRD);
-
 #else // WIN64EXCEPTIONS
 
     // reset pContext; it's only valid for active (top-most) frame