Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Revises exception handling macros for x86/Linux #8381

Closed
wants to merge 1 commit into from
Closed

[x86/Linux] Revises exception handling macros for x86/Linux #8381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/vm/exceptmacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowSO();
UNINSTALL_EXCEPTION_HANDLING_RECORD(&(___pExRecord->m_ExReg)); \
}

#if !defined(WIN64EXCEPTIONS)
#if !defined(WIN64EXCEPTIONS) && !defined(FEATURE_PAL)

#define INSTALL_NESTED_EXCEPTION_HANDLER(frame) \
NestedHandlerExRecord *__pNestedHandlerExRecord = (NestedHandlerExRecord*) _alloca(sizeof(NestedHandlerExRecord)); \
Expand Down
6 changes: 6 additions & 0 deletions src/vm/i386/excepcpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Thread;
// Actually, the handler getting set is properly registered
#endif

#ifdef FEATURE_PAL
#define INSTALL_EXCEPTION_HANDLING_RECORD(record)
#define UNINSTALL_EXCEPTION_HANDLING_RECORD(record)
#define DECLARE_CPFH_EH_RECORD(pCurThread)
#else // FEATURE_PAL
#define INSTALL_EXCEPTION_HANDLING_RECORD(record) \
{ \
PEXCEPTION_REGISTRATION_RECORD __record = (record); \
Expand Down Expand Up @@ -64,6 +69,7 @@ class Thread;
___pExRecord->m_pEntryFrame = (pCurThread)->GetFrame();

#endif
#endif // FEATURE_PAL

//
// Retrieves the redirected CONTEXT* from the stack frame of one of the
Expand Down