diff options
author | Jonghyun Park <parjong@gmail.com> | 2016-12-14 19:35:21 +0900 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-14 11:35:21 +0100 |
commit | 3a8ebe8cefd0e2e7e14c544bcce687bf87fc7de9 (patch) | |
tree | d690a6a45f912a4db932c41abb1f8268132f2d26 /src | |
parent | 676216ab65a6b0ef83782298f414c87e24a1256f (diff) | |
download | coreclr-3a8ebe8cefd0e2e7e14c544bcce687bf87fc7de9.tar.gz coreclr-3a8ebe8cefd0e2e7e14c544bcce687bf87fc7de9.tar.bz2 coreclr-3a8ebe8cefd0e2e7e14c544bcce687bf87fc7de9.zip |
Move RUNTIME_FUNCTION__BeginAddress into clrnt.h (#8632)
RUNTIME_FUNCTION__BeginAddress is defined in corcompile.h for x86, but
is defined in clrnt.h for all the other architectures.
This commit moves RUNTIME_FUNCTION__BeginAddress defines for x86 into
clrnt.h to make it consistent.
Diffstat (limited to 'src')
-rw-r--r-- | src/inc/clrnt.h | 9 | ||||
-rw-r--r-- | src/inc/corcompile.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/inc/clrnt.h b/src/inc/clrnt.h index a1eefe849e..0e082c79d5 100644 --- a/src/inc/clrnt.h +++ b/src/inc/clrnt.h @@ -835,13 +835,18 @@ RtlVirtualUnwind_Unsafe( // X86 // -#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) +#ifdef _TARGET_X86_ +#ifndef FEATURE_PAL typedef struct _DISPATCHER_CONTEXT { _EXCEPTION_REGISTRATION_RECORD* RegistrationPointer; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; -#endif // _TARGET_X86_ && !FEATURE_PAL +#endif // !FEATURE_PAL + +#define RUNTIME_FUNCTION__BeginAddress(prf) (prf)->BeginAddress + +#endif // _TARGET_X86_ #ifdef _TARGET_ARM_ #include "daccess.h" diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 37c7fba480..3b517ae212 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -85,7 +85,6 @@ typedef struct _RUNTIME_FUNCTION { typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; -#define RUNTIME_FUNCTION__BeginAddress(prf) (prf)->BeginAddress // Chained unwind info. Used for cold methods. #define RUNTIME_FUNCTION_INDIRECT 0x80000000 |