MdePkg/Include: Add VA list support for VS2017/ARM64

[mirror_edk2.git] / MdePkg / Include / Base.h

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index a94182f08886d8297eb0cf5a4d7aa873654eca64..4f7bd4449c3642688e5b514ba5fde15cb9f93791 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -668,16 +668,15 @@ struct _LIST_ENTRY {
 \r
 #define VA_COPY(Dest, Start)          __va_copy (Dest, Start)\r
 \r
-#elif defined(_M_ARM)\r
+#elif defined(_M_ARM) || defined(_M_ARM64)\r
 //\r
 // MSFT ARM variable argument list support.\r
-// Same as the generic macros below, except for VA_ARG that needs extra adjustment.\r
 //\r
 \r
 typedef char* VA_LIST;\r
 \r
-#define VA_START(Marker, Parameter)     (Marker = (VA_LIST) ((UINTN) & (Parameter) + _INT_SIZE_OF(Parameter)))\r
-#define VA_ARG(Marker, TYPE)            (*(TYPE *) ((Marker += _INT_SIZE_OF(TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE)))\r
+#define VA_START(Marker, Parameter)     __va_start (&Marker, &Parameter, _INT_SIZE_OF (Parameter), __alignof(Parameter), &Parameter)\r
+#define VA_ARG(Marker, TYPE)            (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE)))\r
 #define VA_END(Marker)                  (Marker = (VA_LIST) 0)\r
 #define VA_COPY(Dest, Start)            ((void)((Dest) = (Start)))\r
 \r