From be988481c2533aaa60f981c4703d61f2946a8447 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 14 Dec 2016 15:55:50 +0900 Subject: [PATCH] Move RUNTIME_FUNCTION__BeginAddress into clrnt.h 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. --- src/inc/clrnt.h | 9 +++++++-- 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 a1eefe849efc..0e082c79d5c3 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 37c7fba480ed..3b517ae21297 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