diff options
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S | 5 | ||||
-rw-r--r-- | ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S index edf3d4723f..a4e165fdc7 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S +++ b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S @@ -57,6 +57,7 @@ This is the stack constructed by the exception handler (low address to high addr .globl ASM_PFX(CommonCExceptionHandler) .text +.fpu neon @ makes vpush/vpop assemble .align 3 @@ -246,6 +247,8 @@ NoAdjustNeeded: @ R0 is ExceptionType mov R1,SP @ R1 is SystemContext + vpush {d0-d15} @ save vstm registers in case they are used in optimizations
+ /* VOID EFIAPI @@ -257,6 +260,8 @@ CommonCExceptionHandler ( */ blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler + vpop {d0-d15} + ldr R1, [SP, #0x4c] @ Restore EFI_SYSTEM_CONTEXT_ARM.IFSR mcr p15, 0, R1, c5, c0, 1 @ Write IFSR diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm index 8584ef0794..a8a477026e 100644 --- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm +++ b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.asm @@ -243,6 +243,8 @@ NoAdjustNeeded ; R0 is ExceptionType mov R1,SP ; R1 is SystemContext + vpush {d0-d15} ; save vstm registers in case they are used in optimizations
+ /* VOID EFIAPI @@ -253,6 +255,8 @@ CommonCExceptionHandler ( */ blx CommonCExceptionHandler ; Call exception handler +
+ vpop {d0-d15}
ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR mcr p15, 0, R1, c5, c0, 1 ; Write IFSR |