Revision: 19172
          http://sourceforge.net/p/edk2/code/19172
Author:   abiesheuvel
Date:     2015-12-08 14:15:14 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
ArmPkg/PrePeiCore: use explicit UINTN cast in VOID* arithmetic

RVCT does not like the arithmetic involving a VOID* pointer that was
introduced in SVN r19163, so use explicit casts instead.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/19163

Modified Paths:
--------------
    trunk/edk2/ArmPlatformPkg/PrePeiCore/MainMPCore.c
    trunk/edk2/ArmPlatformPkg/PrePeiCore/MainUniCore.c

Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/MainMPCore.c
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/MainMPCore.c   2015-12-08 13:49:40 UTC 
(rev 19171)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/MainMPCore.c   2015-12-08 14:15:14 UTC 
(rev 19172)
@@ -146,7 +146,7 @@
   SecCoreData.TemporaryRamSize       = TemporaryRamSize;
   SecCoreData.PeiTemporaryRamBase    = SecCoreData.TemporaryRamBase;
   SecCoreData.PeiTemporaryRamSize    = ALIGN_VALUE 
(SecCoreData.TemporaryRamSize / 2, CPU_STACK_ALIGNMENT);
-  SecCoreData.StackBase              = SecCoreData.TemporaryRamBase + 
SecCoreData.PeiTemporaryRamSize;
+  SecCoreData.StackBase              = (VOID 
*)((UINTN)SecCoreData.TemporaryRamBase + SecCoreData.PeiTemporaryRamSize);
   SecCoreData.StackSize              = (TemporaryRamBase + TemporaryRamSize) - 
(UINTN)SecCoreData.StackBase;
 
   // Jump to PEI core entry point

Modified: trunk/edk2/ArmPlatformPkg/PrePeiCore/MainUniCore.c
===================================================================
--- trunk/edk2/ArmPlatformPkg/PrePeiCore/MainUniCore.c  2015-12-08 13:49:40 UTC 
(rev 19171)
+++ trunk/edk2/ArmPlatformPkg/PrePeiCore/MainUniCore.c  2015-12-08 14:15:14 UTC 
(rev 19172)
@@ -55,7 +55,7 @@
   SecCoreData.TemporaryRamSize       = TemporaryRamSize;
   SecCoreData.PeiTemporaryRamBase    = SecCoreData.TemporaryRamBase;
   SecCoreData.PeiTemporaryRamSize    = ALIGN_VALUE 
(SecCoreData.TemporaryRamSize / 2, CPU_STACK_ALIGNMENT);
-  SecCoreData.StackBase              = SecCoreData.TemporaryRamBase + 
SecCoreData.PeiTemporaryRamSize;
+  SecCoreData.StackBase              = (VOID 
*)((UINTN)SecCoreData.TemporaryRamBase + SecCoreData.PeiTemporaryRamSize);
   SecCoreData.StackSize              = (TemporaryRamBase + TemporaryRamSize) - 
(UINTN)SecCoreData.StackBase;
 
   // Jump to PEI core entry point


------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to