summaryrefslogtreecommitdiff
path: root/src/vm/gccover.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vm/gccover.cpp')
-rw-r--r--src/vm/gccover.cpp69
1 files changed, 32 insertions, 37 deletions
diff --git a/src/vm/gccover.cpp b/src/vm/gccover.cpp
index 7b8c4742f9..2ede08d823 100644
--- a/src/vm/gccover.cpp
+++ b/src/vm/gccover.cpp
@@ -125,13 +125,16 @@ bool IsOriginalInstruction(PBYTE instrPtr, GCCoverageInfo* gcCover, DWORD offset
void SetupAndSprinkleBreakpoints(
- MethodDesc * pMD,
+ NativeCodeVersion nativeCodeVersion,
EECodeInfo * pCodeInfo,
IJitManager::MethodRegionInfo methodRegionInfo,
BOOL fZapped
)
{
+ _ASSERTE(!nativeCodeVersion.IsNull());
+
// Allocate room for the GCCoverageInfo and copy of the method instructions
+ MethodDesc *pMD = nativeCodeVersion.GetMethodDesc();
size_t memSize = sizeof(GCCoverageInfo) + methodRegionInfo.hotSize + methodRegionInfo.coldSize;
GCCoverageInfo* gcCover = (GCCoverageInfo*)(void*) pMD->GetLoaderAllocator()->GetHighFrequencyHeap()->AllocAlignedMem(memSize, CODE_SIZE_ALIGN);
@@ -143,8 +146,6 @@ void SetupAndSprinkleBreakpoints(
gcCover->callerThread = 0;
gcCover->doingEpilogChecks = true;
- gcCover->lastMD = pMD; /* pass pMD to SprinkleBreakpoints */
-
gcCover->SprinkleBreakpoints(gcCover->savedCode,
gcCover->methodRegion.hotStartAddress,
gcCover->methodRegion.hotSize,
@@ -163,16 +164,15 @@ void SetupAndSprinkleBreakpoints(
}
#endif
- gcCover->lastMD = NULL; /* clear lastMD */
-
- _ASSERTE(!pMD->m_GcCover);
- *EnsureWritablePages(&pMD->m_GcCover) = gcCover;
+ nativeCodeVersion.SetGCCoverageInfo(gcCover);
}
-void SetupAndSprinkleBreakpointsForJittedMethod(MethodDesc * pMD,
+void SetupAndSprinkleBreakpointsForJittedMethod(NativeCodeVersion nativeCodeVersion,
PCODE codeStart
)
{
+ _ASSERTE(!nativeCodeVersion.IsNull());
+
EECodeInfo codeInfo(codeStart);
_ASSERTE(codeInfo.IsValid());
_ASSERTE(codeInfo.GetRelOffset() == 0);
@@ -183,9 +183,9 @@ void SetupAndSprinkleBreakpointsForJittedMethod(MethodDesc *
_ASSERTE(PCODEToPINSTR(codeStart) == methodRegionInfo.hotStartAddress);
#ifdef _DEBUG
- if (!g_pConfig->SkipGCCoverage(pMD->GetModule()->GetSimpleName()))
+ if (!g_pConfig->SkipGCCoverage(nativeCodeVersion.GetMethodDesc()->GetModule()->GetSimpleName()))
#endif
- SetupAndSprinkleBreakpoints(pMD,
+ SetupAndSprinkleBreakpoints(nativeCodeVersion,
&codeInfo,
methodRegionInfo,
FALSE
@@ -195,10 +195,12 @@ void SetupAndSprinkleBreakpointsForJittedMethod(MethodDesc *
/****************************************************************************/
/* called when a method is first jitted when GCStress level 4 or 8 is on */
-void SetupGcCoverage(MethodDesc* pMD, BYTE* methodStartPtr) {
+void SetupGcCoverage(NativeCodeVersion nativeCodeVersion, BYTE* methodStartPtr)
+{
+ _ASSERTE(!nativeCodeVersion.IsNull());
#ifdef _DEBUG
- if (!g_pConfig->ShouldGcCoverageOnMethod(pMD->m_pszDebugMethodName)) {
+ if (!g_pConfig->ShouldGcCoverageOnMethod(nativeCodeVersion.GetMethodDesc()->m_pszDebugMethodName)) {
return;
}
#endif
@@ -221,22 +223,23 @@ void SetupGcCoverage(MethodDesc* pMD, BYTE* methodStartPtr) {
// code, and since the rejitted method does not get instrumented
// we should be able to tolerate that the gc cover info does not
// match.
- if (pMD->m_GcCover)
+ if (nativeCodeVersion.GetGCCoverageInfo() != NULL)
{
return;
}
PCODE codeStart = (PCODE) methodStartPtr;
- SetupAndSprinkleBreakpointsForJittedMethod(pMD, codeStart);
+ SetupAndSprinkleBreakpointsForJittedMethod(nativeCodeVersion, codeStart);
}
#ifdef FEATURE_PREJIT
-void SetupGcCoverageForNativeMethod(MethodDesc* pMD,
+void SetupGcCoverageForNativeMethod(NativeCodeVersion nativeCodeVersion,
PCODE codeStart,
IJitManager::MethodRegionInfo& methodRegionInfo
)
{
+ _ASSERTE(!nativeCodeVersion.IsNull());
EECodeInfo codeInfo(codeStart);
_ASSERTE(codeInfo.IsValid());
@@ -244,7 +247,7 @@ void SetupGcCoverageForNativeMethod(MethodDesc* pMD,
_ASSERTE(PCODEToPINSTR(codeStart) == methodRegionInfo.hotStartAddress);
- SetupAndSprinkleBreakpoints(pMD,
+ SetupAndSprinkleBreakpoints(nativeCodeVersion,
&codeInfo,
methodRegionInfo,
TRUE
@@ -296,7 +299,7 @@ void SetupGcCoverageForNativeImage(Module* module)
IJitManager::MethodRegionInfo methodRegionInfo;
mi.GetMethodRegionInfo(&methodRegionInfo);
- SetupGcCoverageForNativeMethod(pMD, pMethodStart, methodRegionInfo);
+ SetupGcCoverageForNativeMethod(NativeCodeVersion(pMD), pMethodStart, methodRegionInfo);
}
}
#endif
@@ -1312,7 +1315,7 @@ bool IsGcCoverageInterrupt(LPVOID ip)
return false;
}
- GCCoverageInfo *gcCover = codeInfo.GetMethodDesc()->m_GcCover;
+ GCCoverageInfo *gcCover = codeInfo.GetNativeCodeVersion().GetGCCoverageInfo();
if (gcCover == nullptr)
{
return false;
@@ -1374,7 +1377,7 @@ BOOL OnGcCoverageInterrupt(PCONTEXT regs)
forceStack[1] = &pMD; // This is so I can see it fastchecked
forceStack[2] = &offset; // This is so I can see it fastchecked
- GCCoverageInfo* gcCover = pMD->m_GcCover;
+ GCCoverageInfo* gcCover = codeInfo.GetNativeCodeVersion().GetGCCoverageInfo();
forceStack[3] = &gcCover; // This is so I can see it fastchecked
if (gcCover == 0)
return(FALSE); // we aren't doing code gcCoverage on this function
@@ -1408,7 +1411,7 @@ BOOL OnGcCoverageInterrupt(PCONTEXT regs)
#ifdef _DEBUG
if (!g_pConfig->SkipGCCoverage(pMD->GetModule()->GetSimpleName()))
#endif
- DoGcStress(regs, pMD);
+ DoGcStress(regs, codeInfo.GetNativeCodeVersion());
#endif // !USE_REDIRECT_FOR_GCSTRESS
@@ -1426,22 +1429,22 @@ FORCEINLINE void UpdateGCStressInstructionWithoutGC ()
/****************************************************************************/
-void DoGcStress (PCONTEXT regs, MethodDesc *pMD)
+void DoGcStress (PCONTEXT regs, NativeCodeVersion nativeCodeVersion)
{
PCODE controlPc = GetIP(regs);
PBYTE instrPtr = reinterpret_cast<PBYTE>(PCODEToPINSTR(controlPc));
- if (!pMD)
+ if (nativeCodeVersion.IsNull())
{
- pMD = ExecutionManager::GetCodeMethodDesc(controlPc);
- if (!pMD)
+ nativeCodeVersion = ExecutionManager::GetNativeCodeVersion(controlPc);
+ if (nativeCodeVersion.IsNull())
return;
}
- GCCoverageInfo *gcCover = pMD->m_GcCover;
+ GCCoverageInfo *gcCover = nativeCodeVersion.GetGCCoverageInfo();
EECodeInfo codeInfo(controlPc);
- _ASSERTE(codeInfo.GetMethodDesc() == pMD);
+ _ASSERTE(codeInfo.GetNativeCodeVersion() == nativeCodeVersion);
DWORD offset = codeInfo.GetRelOffset();
Thread *pThread = GetThread();
@@ -1769,17 +1772,9 @@ void DoGcStress (PCONTEXT regs, MethodDesc *pMD)
gcFrame.Init(pThread, (OBJECTREF*)retValRegs, numberOfRegs, TRUE);
}
- if (gcCover->lastMD != pMD)
- {
- LOG((LF_GCROOTS, LL_INFO100000, "GCCOVER: Doing GC at method %s::%s offset 0x%x\n",
- pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName, offset));
- gcCover->lastMD =pMD;
- }
- else
- {
- LOG((LF_GCROOTS, LL_EVERYTHING, "GCCOVER: Doing GC at method %s::%s offset 0x%x\n",
- pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName, offset));
- }
+ MethodDesc *pMD = nativeCodeVersion.GetMethodDesc();
+ LOG((LF_GCROOTS, LL_EVERYTHING, "GCCOVER: Doing GC at method %s::%s offset 0x%x\n",
+ pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName, offset));
//-------------------------------------------------------------------------
// Do the actual stress work
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 13:00:16 +0000