Update FUNCTION_ENTRY_POINT() to be compatible with a wider variety of input parameters.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6883 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/MdePkg/Include/Ebc/ProcessorBind.h
index b83ebe8766d939bbe3ad668eebaf43402b27c2fb..966ddb67813b3dbed497932e4f51f061b23e859b 100644 (file)
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/MdePkg/Include/Ebc/ProcessorBind.h
@@ -90,7 +90,7 @@ typedef unsigned long         UINTN;
   @return The pointer to the first instruction of a function given a function pointer.\r
 **/\r
 \r
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(FunctionPointer)\r
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
 #endif \r
 \r

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index b3486ea8ef9b44af6f8b88741aa1f72371b1c474..3f3fae73cf0e7c662494a1034f524bd7ca9a664f 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -219,7 +219,7 @@ typedef INT32   INTN;
   @return The pointer to the first instruction of a function given a function pointer.\r
   \r
 **/\r
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(FunctionPointer)\r
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index 16bba6589bc9ad3d5c0c4ddeb3efa44efb8d277f..ac695fe38b6e3141dacc0628f50f07d3eacfc6ac 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -250,7 +250,7 @@ typedef struct {
   @return The pointer to the first instruction of a function given a function pointer.\r
   \r
 **/\r
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (((EFI_PLABEL *)(FunctionPointer))->EntryPoint)\r
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(((EFI_PLABEL *)(FunctionPointer))->EntryPoint)\r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 91b0306dcbcb4da4856a47be20e4c9d557700ff2..a54cc1b5d029f2dc89049796f9325aa7696321a1 100644 (file)
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -248,7 +248,7 @@ typedef INT64   INTN;
   @return The pointer to the first instruction of a function given a function pointer.\r
   \r
 **/\r
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(FunctionPointer)\r
+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)\r
 \r
 #endif\r
 \r