Skip to content

Update unmanaged signatures to match managed QCall signatures. #113578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2025
Merged

Update unmanaged signatures to match managed QCall signatures. #113578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d5d7f8
Update unmanaged signatures to match
AaronRobinsonMSFT Mar 16, 2025
f02da14
Fix return.
AaronRobinsonMSFT Mar 16, 2025
41cde24
Review feedback
AaronRobinsonMSFT Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/coreclr/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5909,7 +5909,7 @@ void FixupDispatcherContext(DISPATCHER_CONTEXT* pDispatcherContext, CONTEXT* pCo
}

pDispatcherContext->ControlPc = (UINT_PTR) GetIP(pDispatcherContext->ContextRecord);

#if defined(TARGET_ARM64)
// Since this routine is used to fixup contexts for async exceptions,
// clear the CONTEXT_UNWOUND_TO_CALL flag since, semantically, frames
Expand Down Expand Up @@ -8379,7 +8379,7 @@ static void NotifyFunctionEnter(StackFrameIterator *pThis, Thread *pThread, ExIn
pExInfo->m_pMDToReportFunctionLeave = pMD;
}

extern "C" bool QCALLTYPE SfiInit(StackFrameIterator* pThis, CONTEXT* pStackwalkCtx, bool instructionFault, bool* pfIsExceptionIntercepted)
extern "C" BOOL QCALLTYPE SfiInit(StackFrameIterator* pThis, CONTEXT* pStackwalkCtx, BOOL instructionFault, uint8_t* pfIsExceptionIntercepted)
{
QCALL_CONTRACT;

Expand Down Expand Up @@ -8494,7 +8494,7 @@ extern "C" bool QCALLTYPE SfiInit(StackFrameIterator* pThis, CONTEXT* pStackwalk
pThis->SetAdjustedControlPC(controlPC);
pThis->UpdateIsRuntimeWrappedExceptions();

*pfIsExceptionIntercepted = CheckExceptionInterception(pThis, pExInfo);
*pfIsExceptionIntercepted = (uint8_t)CheckExceptionInterception(pThis, pExInfo);
}
else
{
Expand Down Expand Up @@ -8531,7 +8531,7 @@ static StackWalkAction MoveToNextNonSkippedFrame(StackFrameIterator* pStackFrame

bool IsCallDescrWorkerInternalReturnAddress(PCODE pCode);

extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideClauseIdx, bool* fUnwoundReversePInvoke, bool* pfIsExceptionIntercepted)
extern "C" BOOL QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideClauseIdx, uint8_t* fUnwoundReversePInvoke, uint8_t* pfIsExceptionIntercepted)
{
QCALL_CONTRACT;

Expand Down Expand Up @@ -8606,7 +8606,7 @@ extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideCla

if (fUnwoundReversePInvoke)
{
*fUnwoundReversePInvoke = invalidRevPInvoke;
*fUnwoundReversePInvoke = (uint8_t)invalidRevPInvoke;
}

if (invalidRevPInvoke)
Expand Down Expand Up @@ -8653,7 +8653,7 @@ extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideCla
{
if (fUnwoundReversePInvoke)
{
*fUnwoundReversePInvoke = false;
*fUnwoundReversePInvoke = (uint8_t)FALSE;
}
}

Expand Down Expand Up @@ -8760,12 +8760,12 @@ Exit:;
pThis->SetAdjustedControlPC(controlPC);
pThis->UpdateIsRuntimeWrappedExceptions();

*pfIsExceptionIntercepted = CheckExceptionInterception(pThis, pTopExInfo);
*pfIsExceptionIntercepted = (uint8_t)CheckExceptionInterception(pThis, pTopExInfo);

return true;
return TRUE;
}

return false;
return FALSE;
}

namespace AsmOffsetsAsserts
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/exceptionhandlingqcalls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ extern "C" void QCALLTYPE ResumeAtInterceptionLocation(REGDISPLAY* pvRegDisplay)
extern "C" void QCALLTYPE AppendExceptionStackFrame(QCall::ObjectHandleOnStack exceptionObj, SIZE_T ip, SIZE_T sp, int flags, ExInfo *pExInfo);
extern "C" BOOL QCALLTYPE EHEnumInitFromStackFrameIterator(StackFrameIterator *pFrameIter, IJitManager::MethodRegionInfo *pMethodRegionInfo, EH_CLAUSE_ENUMERATOR * pEHEnum);
extern "C" BOOL QCALLTYPE EHEnumNext(EH_CLAUSE_ENUMERATOR* pEHEnum, RhEHClause* pEHClause);
extern "C" bool QCALLTYPE SfiInit(StackFrameIterator* pThis, CONTEXT* pStackwalkCtx, bool instructionFault, bool* pIsExceptionIntercepted);
extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, unsigned int* uExCollideClauseIdx, bool* fUnwoundReversePInvoke, bool* pIsExceptionIntercepted);
extern "C" BOOL QCALLTYPE SfiInit(StackFrameIterator* pThis, CONTEXT* pStackwalkCtx, BOOL instructionFault, /* .NET bool */ uint8_t* pIsExceptionIntercepted);
extern "C" BOOL QCALLTYPE SfiNext(StackFrameIterator* pThis, unsigned int* uExCollideClauseIdx, /* .NET bool */ uint8_t* fUnwoundReversePInvoke, /* .NET bool */ uint8_t* pIsExceptionIntercepted);
#endif // DACCESS_COMPILE

#endif // FEATURE_EH_FUNCLETS
Expand Down
Loading