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

[x86/Linux] Fix exception handling routine #8433

Merged
merged 2 commits into from
Dec 6, 2016
Merged

[x86/Linux] Fix exception handling routine #8433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88aecdc
[x86/Linux] Fix exception handling routine
parjong Dec 2, 2016
52bad65
Revise comment-style
parjong Dec 6, 2016
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
6 changes: 3 additions & 3 deletions src/vm/exceptmacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ VOID DECLSPEC_NORETURN RaiseTheExceptionInternalOnly(OBJECTREF throwable, BOOL r
void UnwindAndContinueRethrowHelperInsideCatch(Frame* pEntryFrame, Exception* pException);
VOID DECLSPEC_NORETURN UnwindAndContinueRethrowHelperAfterCatch(Frame* pEntryFrame, Exception* pException);

#ifdef FEATURE_PAL
#if defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS)
VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHardwareException);

#define INSTALL_MANAGED_EXCEPTION_DISPATCHER \
Expand Down Expand Up @@ -334,14 +334,14 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar
UNREACHABLE(); \
}

#else
#else // FEATURE_PAL && WIN64EXCEPTIONS

#define INSTALL_MANAGED_EXCEPTION_DISPATCHER
#define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER
#define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP
#define UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP

#endif // FEATURE_PAL
#endif // FEATURE_PAL && WIN64EXCEPTIONS

#define INSTALL_UNWIND_AND_CONTINUE_HANDLER_NO_PROBE \
{ \
Expand Down