diff options
| author | Olivier Martin <olivier.martin@arm.com> | 2014-11-11 00:51:11 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@Edk2> | 2014-11-11 00:51:11 +0000 |
| commit | fb7ea6114a780b2fe0da56156d65fa7659ffe2e2 (patch) | |
| tree | c6f9f4cf7f6976c602ef0f3dae33e0d9ed70d836 /ArmPkg/Library/ArmSmcLib | |
| parent | 6382e5df4e320b8b7db40bccbeccbd89d368d52f (diff) | |
| download | edk2-fb7ea6114a780b2fe0da56156d65fa7659ffe2e2.tar.gz edk2-fb7ea6114a780b2fe0da56156d65fa7659ffe2e2.tar.bz2 edk2-fb7ea6114a780b2fe0da56156d65fa7659ffe2e2.zip | |
ArmPkg: Ensured the stack is always quad-word aligned
From the AArch64 Procedure Call Standard (ARM IHI 0055B):
5.2.2.1 Universal stack constraints
At all times the following basic constraints must hold:
- SP mod 16 = 0. The stack must be quad-word aligned.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16327 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Library/ArmSmcLib')
| -rw-r--r-- | ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S index f73c98cfc3..46c17674c1 100644 --- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S @@ -17,8 +17,8 @@ GCC_ASM_EXPORT(ArmCallSmc)
ASM_PFX(ArmCallSmc):
- // Push x0 on the stack
- str x0, [sp, #-8]!
+ // Push x0 on the stack - The stack must always be quad-word aligned
+ str x0, [sp, #-16]!
// Load the SMC arguments values into the appropriate registers
ldp x6, x7, [x0, #48]
@@ -29,9 +29,9 @@ ASM_PFX(ArmCallSmc): smc #0
// Pop the ARM_SMC_ARGS structure address from the stack into x9
- ldr x9, [sp], #8
+ ldr x9, [sp], #16
- // Store the SMC returned values into the appropriate registers
+ // Store the SMC returned values into the ARM_SMC_ARGS structure.
// A SMC call can return up to 4 values - we do not need to store back x4-x7.
stp x2, x3, [x9, #16]
stp x0, x1, [x9, #0]
|