ArmPlatformPkg: Fix Global Variable region initialization when GlobalVariable's size is zero

The exit loop was not considering a size of zero for the Global Variable region.



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

ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S

@@ -70,9 +70,10 @@ _SetupPrimaryCoreStack:
   mov   r3, sp
   mov   r1, #0x0
 _InitGlobals:
-  str   r1, [r3], #4
   cmp   r3, r2
-  bne   _InitGlobals
+  beq   _PrepareArguments
+  str   r1, [r3], #4
+  b     _InitGlobals
 
 _PrepareArguments:
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector

ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm

@@ -72,9 +72,10 @@ _SetupPrimaryCoreStack
   mov   r3, sp
   mov   r1, #0x0
 _InitGlobals
-  str   r1, [r3], #4
   cmp   r3, r2
-  bne   _InitGlobals
+  beq   _PrepareArguments
+  str   r1, [r3], #4
+  b     _InitGlobals
 
 _PrepareArguments
   // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector

ArmPlatformPkg/PrePi/ModuleEntryPoint.S

@@ -127,10 +127,10 @@ _SetGlobals:
   mov   r3, sp
   mov   r2, #0x0
 _InitGlobals:
-  str   r2, [r3], #4
   cmp   r3, r1
-  bne   _InitGlobals
-
+  beq   _PrepareArguments
+  str   r2, [r3], #4
+  b     _InitGlobals
 
 _PrepareArguments:
   mov   r0, r5

ArmPlatformPkg/PrePi/ModuleEntryPoint.asm

@@ -128,10 +128,10 @@ _SetGlobals
   mov   r3, sp
   mov   r2, #0x0
 _InitGlobals
-  str   r2, [r3], #4
   cmp   r3, r1
-  bne   _InitGlobals
-
+  beq   _PrepareArguments
+  str   r2, [r3], #4
+  b     _InitGlobals
 
 _PrepareArguments
   mov   r0, r5

ArmPlatformPkg/Sec/SecEntryPoint.S

@@ -86,11 +86,10 @@ _SetupPrimaryCoreStack:
   mov     r3, sp
   mov     r1, #0x0
 _InitGlobals:
-  str     r1, [r3], #4
   cmp     r3, r2
-  bne     _InitGlobals
-
-  b     _PrepareArguments
+  beq     _PrepareArguments
+  str     r1, [r3], #4
+  b       _InitGlobals
 
 _SetupSecondaryCoreStack:
   // Get the Core Position (ClusterId * 4) + CoreId

ArmPlatformPkg/Sec/SecEntryPoint.asm

@@ -88,11 +88,10 @@ _SetupPrimaryCoreStack
   mov     r3, sp
   mov     r1, #0x0
 _InitGlobals
-  str     r1, [r3], #4
   cmp     r3, r2
-  bne     _InitGlobals
-
-  b     _PrepareArguments
+  beq     _PrepareArguments
+  str     r1, [r3], #4
+  b       _InitGlobals
 
 _SetupSecondaryCoreStack
   // Get the Core Position (ClusterId * 4) + CoreId