From 3402aac7d985bf8a9f9d3c639f3fe93609380513 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 19 Aug 2014 13:29:52 +0000 Subject: [PATCH] ARM Packages: Removed trailing spaces Trailing spaces create issue/warning when generating/applying patches. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ronald Cron Reviewed-By: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524 --- .../LinuxLoader/LinuxAtagLoader.inf | 14 +- .../LinuxLoader/LinuxFdtLoader.inf | 14 +- ArmPkg/ArmPkg.dsc | 10 +- .../Arm11MpCoreLib/Arm11MpCoreLib.inf | 14 +- .../ArmCortexA15Lib/ArmCortexA15Lib.inf | 14 +- .../ArmCortexA8Lib/ArmCortexA8Lib.inf | 14 +- .../ArmCortexA9Lib/ArmCortexA9Lib.inf | 14 +- ArmPkg/Drivers/ArmGic/ArmGicDxe.inf | 2 +- .../Drivers/CpuDxe/ArmV4/ExceptionSupport.S | 34 +- .../Drivers/CpuDxe/ArmV4/ExceptionSupport.asm | 24 +- ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c | 18 +- .../Drivers/CpuDxe/ArmV6/ExceptionSupport.S | 74 ++-- .../Drivers/CpuDxe/ArmV6/ExceptionSupport.asm | 78 ++-- ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c | 32 +- ArmPkg/Drivers/CpuDxe/CpuDxe.c | 46 +-- ArmPkg/Drivers/CpuDxe/CpuDxe.h | 14 +- ArmPkg/Drivers/CpuDxe/CpuDxe.inf | 10 +- ArmPkg/Drivers/CpuPei/CpuPei.c | 18 +- ArmPkg/Drivers/CpuPei/CpuPei.inf | 4 +- ArmPkg/Drivers/TimerDxe/TimerDxe.c | 62 ++-- ArmPkg/Drivers/TimerDxe/TimerDxe.inf | 19 +- ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c | 34 +- ArmPkg/Filesystem/SemihostFs/SemihostFs.inf | 16 +- ArmPkg/Include/AsmMacroIoLib.h | 8 +- ArmPkg/Include/AsmMacroIoLib.inc | 112 +++--- ArmPkg/Include/Chipset/ARM926EJ-S.h | 2 +- ArmPkg/Include/Chipset/ArmArchTimer.h | 14 +- ArmPkg/Include/Chipset/ArmV7.h | 2 +- ArmPkg/Include/Chipset/ArmV7Mmu.h | 14 +- ArmPkg/Include/Guid/ArmMpCoreInfo.h | 14 +- ArmPkg/Include/Library/ArmDisassemblerLib.h | 20 +- ArmPkg/Include/Library/ArmLib.h | 30 +- .../Library/DefaultExceptionHandlerLib.h | 4 +- ArmPkg/Include/Library/SemihostLib.h | 6 +- .../Library/UncachedMemoryAllocationLib.h | 12 +- .../Include/Protocol/VirtualUncachedPages.h | 4 +- .../ArmArchTimerLib/ArmArchTimerLib.inf | 18 +- .../ArmCacheMaintenanceLib.c | 4 +- .../ArmDisassemblerLib/ArmDisassembler.c | 102 +++--- .../ArmDisassemblerLib/ThumbDisassembler.c | 284 +++++++-------- ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 76 ++-- ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf | 20 +- ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c | 2 +- ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf | 6 +- ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c | 14 +- ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf | 6 +- ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf | 4 +- ArmPkg/Library/ArmLib/Arm11/Arm11Support.S | 22 +- ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm | 20 +- ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf | 4 +- .../Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf | 2 +- .../ArmLib/Arm9/Arm9CacheInformation.c | 22 +- ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c | 16 +- ArmPkg/Library/ArmLib/Arm9/Arm9Support.S | 20 +- ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm | 16 +- ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S | 14 +- .../Library/ArmLib/ArmV7/ArmLibSupportV7.asm | 14 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c | 14 +- .../ArmLib/ArmV7/ArmV7ArchTimerSupport.S | 2 +- .../ArmLib/ArmV7/ArmV7ArchTimerSupport.asm | 2 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c | 48 +-- ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h | 2 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf | 6 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf | 8 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf | 18 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c | 32 +- ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S | 42 +-- ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm | 46 +-- .../Library/ArmLib/Common/Arm/ArmLibSupport.S | 6 +- .../ArmLib/Common/Arm/ArmLibSupport.asm | 8 +- ArmPkg/Library/ArmLib/Common/ArmLib.c | 2 +- ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h | 6 +- .../ArmLib/Null/NullArmCacheInformation.c | 20 +- ArmPkg/Library/ArmLib/Null/NullArmLib.c | 2 +- ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 10 +- .../Library/ArmSmcLibNull/ArmSmcLibNull.inf | 6 +- ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S | 50 +-- .../Library/BaseMemoryLibStm/Arm/CopyMem.asm | 50 +-- ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S | 20 +- .../Library/BaseMemoryLibStm/Arm/SetMem.asm | 20 +- .../BaseMemoryLibStm/BaseMemoryLibStm.inf | 8 +- .../BaseMemoryLibStm/CompareMemWrapper.c | 4 +- .../Library/BaseMemoryLibStm/CopyMemWrapper.c | 4 +- ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c | 8 +- .../BaseMemoryLibStm/ScanMem16Wrapper.c | 2 +- .../BaseMemoryLibStm/ScanMem32Wrapper.c | 2 +- .../BaseMemoryLibStm/ScanMem64Wrapper.c | 2 +- .../BaseMemoryLibStm/ScanMem8Wrapper.c | 8 +- .../Library/BaseMemoryLibStm/SetMemWrapper.c | 2 +- .../Library/BaseMemoryLibStm/ZeroMemWrapper.c | 4 +- .../Library/BaseMemoryLibVstm/Arm/CopyMem.S | 10 +- .../Library/BaseMemoryLibVstm/Arm/CopyMem.asm | 10 +- ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S | 5 +- .../Library/BaseMemoryLibVstm/Arm/SetMem.asm | 9 +- .../BaseMemoryLibVstm/BaseMemoryLibVstm.inf | 8 +- .../BaseMemoryLibVstm/CompareMemWrapper.c | 4 +- .../BaseMemoryLibVstm/CopyMemWrapper.c | 4 +- ArmPkg/Library/BaseMemoryLibVstm/MemLibGuid.c | 8 +- .../BaseMemoryLibVstm/ScanMem16Wrapper.c | 2 +- .../BaseMemoryLibVstm/ScanMem32Wrapper.c | 2 +- .../BaseMemoryLibVstm/ScanMem64Wrapper.c | 2 +- .../BaseMemoryLibVstm/ScanMem8Wrapper.c | 8 +- .../Library/BaseMemoryLibVstm/SetMemWrapper.c | 2 +- .../BaseMemoryLibVstm/ZeroMemWrapper.c | 4 +- ArmPkg/Library/BdsLib/Arm/BdsLinuxAtag.c | 14 +- ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c | 18 +- ArmPkg/Library/BdsLib/BdsFilePath.c | 14 +- ArmPkg/Library/BdsLib/BdsInternal.h | 14 +- ArmPkg/Library/BdsLib/BdsLib.inf | 18 +- ArmPkg/Library/BdsLib/BdsLinuxLoader.h | 14 +- .../CompilerIntrinsicsLib/Arm/Llvm_int_lib.h | 20 +- .../CompilerIntrinsicsLib/Arm/ashldi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/ashldi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/ashrdi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/ashrdi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/clzsi2.S | 2 +- .../CompilerIntrinsicsLib/Arm/clzsi2.c | 22 +- .../CompilerIntrinsicsLib/Arm/ctzsi2.S | 4 +- .../CompilerIntrinsicsLib/Arm/ctzsi2.c | 20 +- .../Library/CompilerIntrinsicsLib/Arm/div.asm | 6 +- .../CompilerIntrinsicsLib/Arm/divdi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/divdi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/divsi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/divsi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/lasr.asm | 6 +- .../CompilerIntrinsicsLib/Arm/ldivmod.S | 8 +- .../CompilerIntrinsicsLib/Arm/ldivmod.asm | 6 +- .../CompilerIntrinsicsLib/Arm/llsl.asm | 2 +- .../CompilerIntrinsicsLib/Arm/llsr.asm | 2 +- .../CompilerIntrinsicsLib/Arm/lshrdi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/lshrdi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/memcpy4.asm | 2 +- .../CompilerIntrinsicsLib/Arm/memmove.asm | 2 +- .../CompilerIntrinsicsLib/Arm/memset.S | 2 +- .../CompilerIntrinsicsLib/Arm/moddi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/moddi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/modsi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/modsi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/muldi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/muldi3.c | 22 +- .../Library/CompilerIntrinsicsLib/Arm/mullu.S | 2 +- .../CompilerIntrinsicsLib/Arm/mullu.asm | 6 +- .../CompilerIntrinsicsLib/Arm/sourcery.S | 4 +- .../CompilerIntrinsicsLib/Arm/switch.asm | 6 +- .../CompilerIntrinsicsLib/Arm/switch16.S | 2 +- .../CompilerIntrinsicsLib/Arm/switch32.S | 4 +- .../CompilerIntrinsicsLib/Arm/switch8.S | 2 +- .../CompilerIntrinsicsLib/Arm/switchu8.S | 2 +- .../CompilerIntrinsicsLib/Arm/ucmpdi2.S | 4 +- .../CompilerIntrinsicsLib/Arm/ucmpdi2.c | 22 +- .../CompilerIntrinsicsLib/Arm/udivdi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/udivdi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/udivmoddi4.S | 4 +- .../CompilerIntrinsicsLib/Arm/udivmoddi4.c | 26 +- .../CompilerIntrinsicsLib/Arm/udivsi3.S | 2 +- .../CompilerIntrinsicsLib/Arm/udivsi3.c | 22 +- .../Library/CompilerIntrinsicsLib/Arm/uldiv.S | 16 +- .../CompilerIntrinsicsLib/Arm/uldiv.asm | 16 +- .../CompilerIntrinsicsLib/Arm/uldivmod.c | 6 +- .../CompilerIntrinsicsLib/Arm/umoddi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/umoddi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/umodsi3.S | 4 +- .../CompilerIntrinsicsLib/Arm/umodsi3.c | 22 +- .../CompilerIntrinsicsLib/Arm/uread.asm | 2 +- .../CompilerIntrinsicsLib/Arm/uwrite.asm | 2 +- .../CompilerIntrinsicsLib.inf | 10 +- .../Arm/DebugAgentException.S | 2 +- .../Arm/DebugAgentException.asm | 4 +- .../DebugAgentSymbolsBaseLib.inf | 18 +- .../DebugPeCoffExtraActionLib.c | 14 +- .../DebugUncachedMemoryAllocationLib.c | 72 ++-- .../DebugUncachedMemoryAllocationLib.inf | 8 +- .../Arm/DefaultExceptionHandler.c | 40 +-- .../PeiServicesTablePointer.c | 18 +- .../PeiServicesTablePointerLib.inf | 4 +- .../RvdPeCoffExtraActionLib.c | 28 +- ArmPkg/Library/SemiHostingDebugLib/DebugLib.c | 52 +-- .../SemiHostingDebugLib.inf | 2 +- .../SemiHostingSerialPortLib/SerialPortLib.c | 6 +- ArmPkg/Library/SemihostLib/Arm/GccSemihost.S | 18 +- ArmPkg/Library/SemihostLib/SemihostLib.c | 2 +- ArmPkg/Library/SemihostLib/SemihostPrivate.h | 2 +- .../UncachedMemoryAllocationLib.c | 60 ++-- ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc | 60 ++-- ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf | 22 +- ArmPlatformPkg/ArmPlatformPkg.dec | 34 +- ArmPlatformPkg/ArmPlatformPkg.dsc | 62 ++-- ArmPlatformPkg/ArmPlatformPkg.fdf | 22 +- .../ArmRealViewEb-RTSM-A8.dsc | 56 +-- .../ArmRealViewEb-RTSM-A9x2.dsc | 56 +-- .../ArmRealViewEb-RTSM-MPCore.fdf | 36 +- .../ArmRealViewEb-RTSM-UniCore.fdf | 22 +- .../ArmRealViewEbPkg/ArmRealViewEb.dsc.inc | 40 +-- .../ArmRealViewEbPkg/ArmRealViewEbPkg.dec | 2 +- .../Debugger_scripts/EfiFuncs.inc | 80 ++--- .../Debugger_scripts/rvi_boot_from_ram.inc | 2 +- .../Debugger_scripts/rvi_hw_setup.inc | 2 +- .../Debugger_scripts/rvi_load_symbols.inc | 2 +- .../Debugger_scripts/rvi_symbols_macros.inc | 64 ++-- .../Debugger_scripts/rvi_unload_symbols.inc | 2 +- .../ArmRealViewEbPkg/FvbDxe/FvbDxe.c | 70 ++-- .../ArmRealViewEbPkg/FvbDxe/FvbDxe.inf | 8 +- .../Include/Platform/ArmPlatform.h | 16 +- .../InterruptDxe/InterruptDxe.c | 72 ++-- .../InterruptDxe/InterruptDxe.inf | 10 +- .../ArmRealViewEbLibRTSM/ArmRealViewEb.c | 14 +- .../ArmRealViewEbHelper.S | 2 +- .../ArmRealViewEbHelper.asm | 2 +- .../ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf | 14 +- .../ArmRealViewEbLibSec.inf | 14 +- .../ArmRealViewEbLibRTSM/ArmRealViewEbMem.c | 14 +- .../ArmRealViewEbSec.c | 14 +- .../ArmRealViewEbSecLib.inf | 14 +- .../DebugAgentTimerLib/DebugAgentTimerLib.c | 28 +- .../Library/GdbSerialLib/GdbSerialLib.c | 18 +- .../Library/GdbSerialLib/GdbSerialLib.inf | 8 +- .../NorFlashArmRealViewEbLib.inf | 10 +- .../PL111LcdArmRealViewEbLib.inf | 16 +- .../Library/ResetSystemLib/ResetSystemLib.c | 8 +- .../SysConfigArmRealViewEbLib.inf | 10 +- .../ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 52 +-- .../ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf | 40 +-- .../ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 52 +-- .../ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 30 +- .../ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 62 ++-- .../ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 40 +-- .../ArmVExpress-RTSM-A15_MPCore.dsc | 66 ++-- .../ArmVExpress-RTSM-A15_MPCore.fdf | 38 +- .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc | 60 ++-- .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf | 42 +-- .../ArmVExpress-RTSM-AEMv8Ax4.dsc | 12 +- .../ArmVExpress-RTSM-AEMv8Ax4.fdf | 4 +- .../ArmVExpressPkg/ArmVExpress.dsc.inc | 60 ++-- .../ArmVExpressPkg/ArmVExpressPkg.dec | 16 +- .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 14 +- .../Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 14 +- .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.S | 2 +- .../ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 14 +- .../ArmVExpressLibCTA9x4/ArmVExpressLib.inf | 14 +- .../ArmVExpressLibSec.inf | 14 +- .../Library/ArmVExpressLibCTA9x4/CTA9x4.c | 14 +- .../ArmVExpressLibCTA9x4/CTA9x4Helper.S | 12 +- .../ArmVExpressLibCTA9x4/CTA9x4Helper.asm | 14 +- .../Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c | 14 +- .../ArmVExpressLibRTSM/Arm/RTSMHelper.S | 14 +- .../ArmVExpressLibRTSM/Arm/RTSMHelper.asm | 14 +- .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 16 +- .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 14 +- .../Library/ArmVExpressLibRTSM/RTSMMem.c | 14 +- .../ArmVExpressSecLib.inf | 14 +- .../ArmVExpressSecLibCTA9x4/CTA9x4Sec.c | 14 +- .../ArmVExpressSysConfigLib.inf | 10 +- .../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 2 +- .../HdLcdArmVExpressLib.inf | 16 +- .../NorFlashArmVExpressLib.inf | 8 +- .../PL111LcdArmVExpressLib.inf | 10 +- .../Library/ResetSystemLib/ResetSystemLib.c | 2 +- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- ArmPlatformPkg/Bds/BdsHelper.c | 14 +- ArmPlatformPkg/Bds/BootOptionSupport.c | 2 +- .../Drivers/ArmTrustZone/ArmTrustZone.c | 14 +- .../Drivers/ArmTrustZone/ArmTrustZone.inf | 14 +- .../HdLcdGraphicsOutputDxe.inf | 12 +- .../PL111LcdGraphicsOutputDxe.inf | 8 +- .../Drivers/NorFlashDxe/NorFlashDxe.inf | 18 +- .../Drivers/NorFlashDxe/NorFlashFvbDxe.c | 2 +- ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c | 2 +- .../Drivers/PL011Uart/PL011Uart.inf | 12 +- .../Drivers/PL061GpioDxe/PL061GpioDxe.inf | 16 +- ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c | 20 +- ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.h | 16 +- .../Drivers/PL180MciDxe/PL180MciDxe.inf | 18 +- ArmPlatformPkg/Drivers/PL301Axi/PL301Axi.c | 20 +- ArmPlatformPkg/Drivers/PL301Axi/PL301Axi.inf | 14 +- .../Drivers/PL310L2Cache/PL310L2Cache.c | 14 +- .../Drivers/PL310L2Cache/PL310L2CacheSec.inf | 14 +- ArmPlatformPkg/Drivers/PL34xDmc/PL341Dmc.c | 14 +- ArmPlatformPkg/Drivers/PL34xDmc/PL341Dmc.inf | 14 +- .../Drivers/PL35xSmc/InitializeSMC.S | 14 +- .../Drivers/PL35xSmc/InitializeSMC.asm | 18 +- ArmPlatformPkg/Drivers/PL35xSmc/PL35xSmc.inf | 14 +- .../Drivers/SP804TimerDxe/SP804Timer.c | 114 +++--- .../Drivers/SP804TimerDxe/SP804TimerDxe.inf | 12 +- .../Drivers/SP805WatchdogDxe/SP805Watchdog.c | 2 +- .../SP805WatchdogDxe/SP805WatchdogDxe.inf | 18 +- ArmPlatformPkg/Include/Drivers/ArmTrustzone.h | 14 +- ArmPlatformPkg/Include/Drivers/PL011Uart.h | 14 +- ArmPlatformPkg/Include/Drivers/SP804Timer.h | 14 +- .../Include/Guid/ArmGlobalVariableHob.h | 8 +- .../Include/Library/ArmPlatformLib.h | 14 +- .../Include/Library/ArmPlatformSecLib.h | 14 +- .../Dxe/DxeArmPlatformGlobalVariableLib.inf | 12 +- .../Pei/PeiArmPlatformGlobalVariableLib.inf | 8 +- .../PrePiArmPlatformGlobalVariableLib.inf | 8 +- .../Sec/SecArmPlatformGlobalVariableLib.c | 2 +- .../Sec/SecArmPlatformGlobalVariableLib.inf | 8 +- .../Arm/ArmPlatformHelper.S | 2 +- .../Arm/ArmPlatformHelper.asm | 2 +- .../ArmPlatformLibNull/ArmPlatformLibNull.c | 14 +- .../ArmPlatformLibNull/ArmPlatformLibNull.inf | 14 +- .../ArmPlatformLibNullMem.c | 14 +- .../ArmPlatformLibNullSec.inf | 14 +- .../ArmPlatformLibNullSec.c | 14 +- .../ArmPlatformLibNullSec.inf | 14 +- .../ArmPlatformStackLib.inf | 14 +- .../ArmTrustedMonitorLibNull.inf | 16 +- .../DebugSecExtraActionLib.inf | 14 +- .../Library/EblCmdLib/Arm/EblCmdMmu.c | 14 +- ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c | 44 +-- .../Library/EblCmdLib/EblCmdLib.inf | 12 +- .../Library/L2X0CacheLibNull/L2X0Cache.c | 14 +- .../L2X0CacheLibNull/L2X0CacheLibNull.inf | 14 +- .../PL011SerialPortExtLib.c | 2 +- .../PL011SerialPortExtLib.inf | 10 +- .../PL011SerialPortLib/PL011SerialPortLib.c | 2 +- .../PL011SerialPortLib/PL011SerialPortLib.inf | 12 +- .../PeiServicesTablePointer.c | 28 +- .../PeiServicesTablePointerLib.inf | 2 +- .../PrePiHobListPointer.c | 16 +- .../PrePiHobListPointerLib.inf | 16 +- .../Library/SP804TimerLib/SP804TimerLib.c | 6 +- .../Library/SP804TimerLib/SP804TimerLib.inf | 12 +- .../MemoryInitPei/MemoryInitPeiLib.inf | 12 +- ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c | 20 +- .../MemoryInitPei/MemoryInitPeim.inf | 12 +- ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf | 20 +- ArmPlatformPkg/PlatformPei/PlatformPeim.c | 22 +- ArmPlatformPkg/PlatformPei/PlatformPeim.inf | 24 +- .../PrePeiCore/Arm/ArchPrePeiCore.c | 14 +- ArmPlatformPkg/PrePeiCore/Arm/Exception.S | 16 +- ArmPlatformPkg/PrePeiCore/Arm/Exception.asm | 22 +- .../PrePeiCore/Arm/PrePeiCoreEntryPoint.S | 16 +- .../PrePeiCore/Arm/PrePeiCoreEntryPoint.asm | 24 +- ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S | 14 +- ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm | 10 +- ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 2 +- .../PrePeiCore/PrePeiCoreMPCore.inf | 22 +- .../PrePeiCore/PrePeiCoreUniCore.inf | 22 +- ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm | 6 +- ArmPlatformPkg/PrePi/LzmaDecompress.h | 22 +- ArmPlatformPkg/PrePi/PeiMPCore.inf | 16 +- ArmPlatformPkg/PrePi/PeiUniCore.inf | 16 +- ArmPlatformPkg/PrePi/PrePi.c | 8 +- ArmPlatformPkg/Scripts/Ds5/build_report.py | 28 +- .../Scripts/Ds5/cmd_load_symbols.py | 22 +- ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py | 78 ++-- ArmPlatformPkg/Scripts/Ds5/firmware_volume.py | 134 +++---- ArmPlatformPkg/Scripts/Ds5/system_table.py | 54 +-- ArmPlatformPkg/Sec/Arm/Helper.S | 18 +- ArmPlatformPkg/Sec/Arm/Helper.asm | 20 +- ArmPlatformPkg/Sec/Arm/SecEntryPoint.S | 26 +- ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm | 32 +- ArmPlatformPkg/Sec/Sec.inf | 34 +- BeagleBoardPkg/Bds/Bds.inf | 18 +- BeagleBoardPkg/Bds/BdsEntry.c | 66 ++-- BeagleBoardPkg/Bds/BdsEntry.h | 2 +- BeagleBoardPkg/Bds/FirmwareVolume.c | 46 +-- BeagleBoardPkg/BeagleBoardPkg.dsc | 98 +++--- BeagleBoardPkg/BeagleBoardPkg.fdf | 36 +- .../Debugger_scripts/rvi_boot_from_ram.inc | 2 +- .../Debugger_scripts/rvi_hw_setup.inc | 2 +- .../Debugger_scripts/rvi_load_symbols.inc | 2 +- .../Debugger_scripts/rvi_symbols_macros.inc | 64 ++-- .../Debugger_scripts/rvi_unload_symbols.inc | 2 +- BeagleBoardPkg/Include/BeagleBoard.h | 16 +- .../Library/BeagleBoardLib/BeagleBoard.c | 18 +- .../BeagleBoardLib/BeagleBoardHelper.S | 14 +- .../BeagleBoardLib/BeagleBoardHelper.asm | 14 +- .../Library/BeagleBoardLib/BeagleBoardLib.inf | 14 +- .../Library/BeagleBoardLib/BeagleBoardMem.c | 14 +- BeagleBoardPkg/Library/BeagleBoardLib/Clock.c | 2 +- .../Library/BeagleBoardLib/PadConfiguration.c | 2 +- BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c | 32 +- .../Library/EblCmdLib/EblCmdLib.inf | 6 +- .../Library/GdbSerialLib/GdbSerialLib.c | 16 +- .../Library/GdbSerialLib/GdbSerialLib.inf | 8 +- .../Library/ResetSystemLib/ResetSystemLib.c | 10 +- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S | 18 +- BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm | 34 +- BeagleBoardPkg/Sec/Cache.c | 8 +- BeagleBoardPkg/Sec/Clock.c | 2 +- BeagleBoardPkg/Sec/LzmaDecompress.h | 22 +- BeagleBoardPkg/Sec/PadConfiguration.c | 2 +- BeagleBoardPkg/Sec/Sec.c | 10 +- BeagleBoardPkg/Sec/Sec.inf | 14 +- BeagleBoardPkg/Tools/generate_image.c | 64 ++-- BeagleBoardPkg/Tools/replace.c | 16 +- EmbeddedPkg/Ebl/CmdTemplate.c | 2 +- EmbeddedPkg/Ebl/Command.c | 94 ++--- EmbeddedPkg/Ebl/Dir.c | 50 +-- EmbeddedPkg/Ebl/Ebl.h | 18 +- EmbeddedPkg/Ebl/Ebl.inf | 46 +-- EmbeddedPkg/Ebl/EfiDevice.c | 132 +++---- EmbeddedPkg/Ebl/Hob.c | 34 +- EmbeddedPkg/Ebl/HwDebug.c | 30 +- EmbeddedPkg/Ebl/HwIoDebug.c | 6 +- EmbeddedPkg/Ebl/Main.c | 90 ++--- EmbeddedPkg/Ebl/Network.c | 20 +- EmbeddedPkg/Ebl/Script.c | 20 +- EmbeddedPkg/Ebl/Variable.c | 16 +- EmbeddedPkg/EblExternCmd/EntryPointGlue.c | 14 +- EmbeddedPkg/EblExternCmd/Main.c | 8 +- .../EmbeddedMonotonicCounter.c | 8 +- .../EmbeddedMonotonicCounter.inf | 6 +- EmbeddedPkg/EmbeddedPkg.dec | 8 +- EmbeddedPkg/EmbeddedPkg.dsc | 34 +- EmbeddedPkg/EmbeddedPkg.fdf | 20 +- EmbeddedPkg/GdbStub/Arm/Processor.c | 132 +++---- EmbeddedPkg/GdbStub/GdbStub.c | 332 +++++++++--------- EmbeddedPkg/GdbStub/GdbStub.inf | 40 +-- EmbeddedPkg/GdbStub/GdbStubInternal.h | 168 ++++----- EmbeddedPkg/GdbStub/Ia32/Processor.c | 178 +++++----- EmbeddedPkg/GdbStub/SerialIo.c | 122 +++---- EmbeddedPkg/GdbStub/X64/Processor.c | 178 +++++----- EmbeddedPkg/Include/Guid/ExtractSection.h | 2 +- .../Include/Library/DebugAgentTimerLib.h | 19 +- EmbeddedPkg/Include/Library/DmaLib.h | 76 ++-- .../Library/EblAddExternalCommandLib.h | 4 +- EmbeddedPkg/Include/Library/EblCmdLib.h | 2 +- EmbeddedPkg/Include/Library/EblNetworkLib.h | 4 +- EmbeddedPkg/Include/Library/EfiFileLib.h | 76 ++-- .../Include/Library/EfiResetSystemLib.h | 4 +- EmbeddedPkg/Include/Library/GdbSerialLib.h | 16 +- .../Include/Library/PrePiHobListPointerLib.h | 16 +- EmbeddedPkg/Include/Library/PrePiLib.h | 62 ++-- .../Include/Library/RealTimeClockLib.h | 2 +- .../Include/Library/SerialPortExtLib.h | 2 +- .../Protocol/DebugSupportPeriodicCallback.h | 4 +- EmbeddedPkg/Include/Protocol/EblAddCommand.h | 10 +- EmbeddedPkg/Include/Protocol/EmbeddedDevice.h | 18 +- .../Include/Protocol/EmbeddedExternalDevice.h | 4 +- EmbeddedPkg/Include/Protocol/EmbeddedGpio.h | 10 +- .../Include/Protocol/HardwareInterrupt.h | 16 +- EmbeddedPkg/Include/Protocol/MmcHost.h | 16 +- EmbeddedPkg/Include/Protocol/PeCoffLoader.h | 94 ++--- EmbeddedPkg/Include/libfdt_env.h | 14 +- .../DebugAgentTimerLib.c | 19 +- .../Library/DxeHobPeCoffLib/DxeHobPeCoff.c | 88 ++--- .../DxeHobPeCoffLib/DxeHobPeCoffLib.inf | 4 +- .../EblAddExternalCommandLib.c | 14 +- .../EblAddExternalCommandLib.inf | 7 +- .../Library/EblCmdLibNull/EblCmdLibNull.inf | 7 +- .../Library/EblNetworkLib/EblNetworkLib.c | 24 +- .../Library/EblNetworkLib/EblNetworkLib.inf | 8 +- EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c | 132 +++---- EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf | 8 +- EmbeddedPkg/Library/FdtLib/FdtLib.inf | 14 +- .../Arm/ExceptionSupport.ARMv6.S | 74 ++-- .../Arm/ExceptionSupport.ARMv6.asm | 78 ++-- .../Library/GdbDebugAgent/Arm/Processor.c | 128 +++---- .../Library/GdbDebugAgent/GdbDebugAgent.c | 224 ++++++------ .../Library/GdbDebugAgent/GdbDebugAgent.h | 172 ++++----- .../Library/GdbDebugAgent/GdbDebugAgent.inf | 8 +- .../Library/GdbDebugAgent/Ia32/Processor.c | 158 ++++----- .../Library/GdbDebugAgent/X64/Processor.c | 178 +++++----- .../GdbSerialDebugPortLib.c | 40 +-- .../GdbSerialDebugPortLib.inf | 2 +- .../Library/GdbSerialLib/GdbSerialLib.c | 44 +-- .../HalRuntimeServicesExampleLib/Capsule.c | 62 ++-- .../HalRuntimeServicesExampleLib/Mtc.c | 4 +- .../ReportStatusCode.c | 44 +-- .../HalRuntimeServicesExampleLib/Reset.c | 4 +- .../HalRuntimeServicesExampleLib/Rtc.c | 6 +- .../HalRuntimeServicesExampleLib/Variable.c | 22 +- .../LzmaHobCustomDecompressLib.c | 8 +- .../LzmaHobCustomDecompressLib.inf | 2 +- EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c | 60 ++-- EmbeddedPkg/Library/NullDmaLib/NullDmaLib.inf | 18 +- .../PrePiExtractGuidedSectionLib.c | 40 +-- .../PrePiExtractGuidedSectionLib.inf | 8 +- EmbeddedPkg/Library/PrePiHobLib/Hob.c | 68 ++-- .../Library/PrePiHobLib/PrePiHobLib.inf | 4 +- .../PrePiHobListPointer.c | 18 +- .../PrePiHobListPointerLib.inf | 17 +- EmbeddedPkg/Library/PrePiLib/FwVol.c | 136 +++---- EmbeddedPkg/Library/PrePiLib/PrePi.h | 2 +- EmbeddedPkg/Library/PrePiLib/PrePiLib.c | 32 +- EmbeddedPkg/Library/PrePiLib/PrePiLib.inf | 8 +- .../Library/PrePiLib/ReportStatusCode.c | 8 +- .../MemoryAllocationLib.c | 4 +- .../PrePiMemoryAllocationLib.inf | 6 +- .../RealTimeClockLib.c | 6 +- .../TemplateRealTimeClockLib.inf | 1 - .../TemplateResetSystemLib/ResetSystemLib.c | 24 +- .../TemplateSerialPortExtLib.c | 2 +- .../TemplateSerialPortLib.c | 4 +- EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf | 10 +- .../RealTimeClockRuntimeDxe/RealTimeClock.c | 6 +- .../RealTimeClockRuntimeDxe.inf | 2 +- EmbeddedPkg/ResetRuntimeDxe/reset.c | 4 +- EmbeddedPkg/SerialDxe/SerialDxe.inf | 12 +- EmbeddedPkg/SerialDxe/SerialIo.c | 18 +- .../SimpleTextInOutSerial/SimpleTextInOut.c | 36 +- .../SimpleTextInOutSerial.inf | 16 +- EmbeddedPkg/TemplateSec/TemplateSec.c | 20 +- EmbeddedPkg/TemplateSec/TemplateSec.inf | 14 +- EmbeddedPkg/Universal/MmcDxe/ComponentName.c | 16 +- EmbeddedPkg/Universal/MmcDxe/Diagnostics.c | 16 +- EmbeddedPkg/Universal/MmcDxe/Mmc.c | 24 +- EmbeddedPkg/Universal/MmcDxe/Mmc.h | 34 +- EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf | 16 +- Omap35xxPkg/Flash/Flash.c | 30 +- Omap35xxPkg/Flash/Flash.inf | 10 +- Omap35xxPkg/Gpio/Gpio.c | 4 +- Omap35xxPkg/Gpio/Gpio.inf | 10 +- Omap35xxPkg/Include/Library/OmapDmaLib.h | 24 +- Omap35xxPkg/Include/Library/OmapLib.h | 4 +- Omap35xxPkg/Include/Omap3530/Omap3530Dma.h | 10 +- Omap35xxPkg/Include/Omap3530/Omap3530MMCHS.h | 2 +- Omap35xxPkg/Include/Omap3530/Omap3530Prcm.h | 2 +- Omap35xxPkg/Include/TPS65950.h | 2 +- Omap35xxPkg/InterruptDxe/HardwareInterrupt.c | 50 +-- Omap35xxPkg/InterruptDxe/InterruptDxe.inf | 10 +- .../LcdGraphicsOutputBlt.c | 4 +- .../LcdGraphicsOutputDxe.c | 18 +- .../LcdGraphicsOutputDxe.h | 2 +- .../LcdGraphicsOutputDxe.inf | 6 +- .../DebugAgentTimerLib/DebugAgentTimerLib.c | 33 +- .../DebugAgentTimerLib/DebugAgentTimerLib.inf | 3 +- Omap35xxPkg/Library/EblCmdLib/EblCmdLib.c | 4 +- Omap35xxPkg/Library/EblCmdLib/EblCmdLib.inf | 8 +- .../Library/GdbSerialLib/GdbSerialLib.c | 16 +- .../Library/GdbSerialLib/GdbSerialLib.inf | 8 +- .../Omap35xxTimerLib/Omap35xxTimerLib.inf | 2 +- .../Library/Omap35xxTimerLib/TimerLib.c | 16 +- Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.c | 52 +-- Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf | 18 +- Omap35xxPkg/Library/OmapLib/OmapLib.c | 4 +- Omap35xxPkg/Library/OmapLib/OmapLib.inf | 14 +- .../RealTimeClockLib/RealTimeClockLib.c | 14 +- .../RealTimeClockLib/RealTimeClockLib.inf | 18 +- .../Library/ResetSystemLib/ResetSystemLib.c | 8 +- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- .../Library/SerialPortLib/SerialPortLib.c | 6 +- .../Library/SerialPortLib/SerialPortLib.inf | 2 +- Omap35xxPkg/MMCHSDxe/MMCHS.c | 92 ++--- Omap35xxPkg/MMCHSDxe/MMCHS.h | 12 +- Omap35xxPkg/MMCHSDxe/MMCHS.inf | 8 +- Omap35xxPkg/MmcHostDxe/MmcHostDxe.c | 10 +- Omap35xxPkg/MmcHostDxe/MmcHostDxe.h | 14 +- Omap35xxPkg/MmcHostDxe/MmcHostDxe.inf | 16 +- Omap35xxPkg/Omap35xxPkg.dec | 6 +- Omap35xxPkg/Omap35xxPkg.dsc | 36 +- Omap35xxPkg/PciEmulation/PciEmulation.c | 40 +-- Omap35xxPkg/PciEmulation/PciEmulation.h | 16 +- Omap35xxPkg/PciEmulation/PciEmulation.inf | 5 +- Omap35xxPkg/PciEmulation/PciRootBridgeIo.c | 72 ++-- Omap35xxPkg/SmbusDxe/Smbus.c | 10 +- Omap35xxPkg/SmbusDxe/Smbus.inf | 10 +- Omap35xxPkg/TPS65950Dxe/TPS65950.c | 10 +- Omap35xxPkg/TPS65950Dxe/TPS65950.inf | 8 +- Omap35xxPkg/TimerDxe/Timer.c | 118 +++---- Omap35xxPkg/TimerDxe/TimerDxe.inf | 12 +- 554 files changed, 6330 insertions(+), 6342 deletions(-) diff --git a/ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf b/ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf index db1a3dc827..dcc2597c24 100644 --- a/ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf +++ b/ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf b/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf index fbd13308ad..55a6969bb8 100644 --- a/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf +++ b/ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 2dbcb86e2c..15ea2ef939 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -31,13 +31,13 @@ [BuildOptions] XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7 - XCODE:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG - + XCODE:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG + GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -mfpu=neon - GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG + GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8 - RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG + RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG [LibraryClasses.common] BaseLib|MdePkg/Library/BaseLib/BaseLib.inf @@ -74,7 +74,7 @@ BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf - + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf [LibraryClasses.ARM] diff --git a/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11MpCoreLib.inf b/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11MpCoreLib.inf index f7ecfb0900..3a796c19d0 100644 --- a/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11MpCoreLib.inf +++ b/ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11MpCoreLib.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011-2012, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf index 3ddd4c5704..ed4bdc377d 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011-2012, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf index c6895879c2..890958a7e3 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf index a84501dea4..236b0bcb6c 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf @@ -1,13 +1,13 @@ #/* @file # Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #*/ diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf index 9be6160255..7dc14b34ec 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf +++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = ArmGicDxe - FILE_GUID = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 + FILE_GUID = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S index 2b439f3331..c82618aa1b 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S +++ b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------ # # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
# @@ -52,7 +52,7 @@ ASM_PFX(ResetEntry): stmfd SP!,{LR} @ Store the link register for the current mode sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR stmfd SP!,{R0-R12} @ Store the register state - + mov R0,#0 ldr R1,ASM_PFX(CommonExceptionEntry) bx R1 @@ -147,18 +147,18 @@ ASM_PFX(ExceptionHandlersEnd): ASM_PFX(AsmCommonExceptionEntry): mrc p15, 0, R1, c6, c0, 2 @ Read IFAR - str R1, [SP, #0x50] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR - + str R1, [SP, #0x50] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR + mrc p15, 0, R1, c5, c0, 1 @ Read IFSR str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR - + mrc p15, 0, R1, c6, c0, 0 @ Read DFAR str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR - + mrc p15, 0, R1, c5, c0, 0 @ Read DFSR str R1, [SP, #0x44] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFSR - - ldr R1, [SP, #0x5c] @ srsdb saved pre-exception CPSR on the stack + + ldr R1, [SP, #0x5c] @ srsdb saved pre-exception CPSR on the stack str R1, [SP, #0x40] @ Store it in EFI_SYSTEM_CONTEXT_ARM.CPSR and r1, r1, #0x1f @ Check to see if User or System Mode cmp r1, #0x1f @@ -167,25 +167,25 @@ ASM_PFX(AsmCommonExceptionEntry): ldmneed r2, {lr}^ @ User or System mode, use unbanked register ldmneed r2, {lr} @ All other modes used banked register - ldr R1, [SP, #0x58] @ PC is the LR pushed by srsdb + ldr R1, [SP, #0x58] @ PC is the LR pushed by srsdb str R1, [SP, #0x3c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.PC - - sub R1, SP, #0x60 @ We pused 0x60 bytes on the stack + + sub R1, SP, #0x60 @ We pused 0x60 bytes on the stack str R1, [SP, #0x34] @ Store it in EFI_SYSTEM_CONTEXT_ARM.SP - - @ R0 is exception type + + @ R0 is exception type mov R1,SP @ Prepare System Context pointer as an argument for the exception handler blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler - + ldr R2,[SP,#0x40] @ EFI_SYSTEM_CONTEXT_ARM.CPSR - str R2,[SP,#0x5c] @ Store it back to srsdb stack slot so it can be restored + str R2,[SP,#0x5c] @ Store it back to srsdb stack slot so it can be restored ldr R2,[SP,#0x3c] @ EFI_SYSTEM_CONTEXT_ARM.PC - str R2,[SP,#0x58] @ Store it back to srsdb stack slot so it can be restored + str R2,[SP,#0x58] @ Store it back to srsdb stack slot so it can be restored ldmfd SP!,{R0-R12} @ Restore general purpose registers @ Exception handler can not change SP or LR as we would blow chunks - + add SP,SP,#0x20 @ Clear out the remaining stack space ldmfd SP!,{LR} @ restore the link register for this context rfefd SP! @ return from exception via srsdb stack slot diff --git a/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm index 2ea8d65f15..9f09a0bc76 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm +++ b/ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
// @@ -20,7 +20,7 @@ PRESERVE8 AREA DxeExceptionHandlers, CODE, READONLY - + ExceptionHandlersStart Reset @@ -107,35 +107,35 @@ ExceptionHandlersEnd AsmCommonExceptionEntry mrc p15, 0, r1, c6, c0, 2 ; Read IFAR stmfd SP!,{R1} ; Store the IFAR - + mrc p15, 0, r1, c5, c0, 1 ; Read IFSR stmfd SP!,{R1} ; Store the IFSR - + mrc p15, 0, r1, c6, c0, 0 ; Read DFAR stmfd SP!,{R1} ; Store the DFAR - + mrc p15, 0, r1, c5, c0, 0 ; Read DFSR stmfd SP!,{R1} ; Store the DFSR - + mrs R1,SPSR ; Read SPSR (which is the pre-exception CPSR) stmfd SP!,{R1} ; Store the SPSR - + stmfd SP!,{LR} ; Store the link register (which is the pre-exception PC) stmfd SP,{SP,LR}^ ; Store user/system mode stack pointer and link register nop ; Required by ARM architecture SUB SP,SP,#0x08 ; Adjust stack pointer stmfd SP!,{R2-R12} ; Store general purpose registers - + ldr R3,[SP,#0x50] ; Read saved R1 from the stack (it was saved by the exception entry routine) ldr R2,[SP,#0x4C] ; Read saved R0 from the stack (it was saved by the exception entry routine) stmfd SP!,{R2-R3} ; Store general purpose registers R0 and R1 - + mov R1,SP ; Prepare System Context pointer as an argument for the exception handler - + sub SP,SP,#4 ; Adjust SP to preserve 8-byte alignment blx CommonCExceptionHandler ; Call exception handler add SP,SP,#4 ; Adjust SP back to where we were - + ldr R2,[SP,#0x40] ; Load CPSR from context, in case it has changed MSR SPSR_cxsf,R2 ; Store it back to the SPSR to be restored when exiting this handler @@ -146,7 +146,7 @@ AsmCommonExceptionEntry ldmfd SP!,{LR} ; Restore the link register (which is the pre-exception PC) add SP,SP,#0x1C ; Clear out the remaining stack space movs PC,LR ; Return from exception - + END diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c index 22c56a347b..4b05199db3 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c @@ -2,7 +2,7 @@ Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
Copyright (c) 2014, ARM Limited. All rights reserved.
- + This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -13,7 +13,7 @@ **/ -#include "CpuDxe.h" +#include "CpuDxe.h" //FIXME: Will not compile on non-ARMv7 builds #include @@ -45,9 +45,9 @@ EFI_EXCEPTION_CALLBACK gDebuggerExceptionHandlers[MAX_ARM_EXCEPTION + 1]; /** - This function registers and enables the handler specified by InterruptHandler for a processor - interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the - handler for the processor interrupt or exception type specified by InterruptType is uninstalled. + This function registers and enables the handler specified by InterruptHandler for a processor + interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the + handler for the processor interrupt or exception type specified by InterruptType is uninstalled. The installed handler is called once for each processor interrupt or exception. @param InterruptType A pointer to the processor's current interrupt state. Set to TRUE if interrupts @@ -102,7 +102,7 @@ CommonCExceptionHandler ( DEBUG ((EFI_D_ERROR, "Unknown exception type %d from %08x\n", ExceptionType, SystemContext.SystemContextArm->PC)); ASSERT (FALSE); } - + if (ExceptionType == EXCEPT_ARM_SOFTWARE_INTERRUPT) { // // ARM JTAG debuggers some times use this vector, so it is not an error to get one @@ -139,8 +139,8 @@ InitializeExceptions ( Cpu->DisableInterrupt (Cpu); // - // EFI does not use the FIQ, but a debugger might so we must disable - // as we take over the exception vectors. + // EFI does not use the FIQ, but a debugger might so we must disable + // as we take over the exception vectors. // FiqEnabled = ArmGetFiqState (); ArmDisableFiq (); @@ -224,7 +224,7 @@ InitializeExceptions ( } if (IrqEnabled) { - // + // // Restore interrupt state // Status = Cpu->EnableInterrupt (Cpu); diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S index 6a1a15570f..3433b99cd4 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------ # # Use ARMv6 instruction to operate on a single stack # @@ -22,7 +22,7 @@ This is the stack constructed by the exception handler (low address to high address) # R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM Reg Offset - === ====== + === ====== R0 0x00 # stmfd SP!,{R0-R12} R1 0x04 R2 0x08 @@ -44,14 +44,14 @@ This is the stack constructed by the exception handler (low address to high addr DFAR 0x48 IFSR 0x4c IFAR 0x50 - + LR 0x54 # SVC Link register (we need to restore it) - - LR 0x58 # pushed by srsfd - CPSR 0x5c + + LR 0x58 # pushed by srsfd + CPSR 0x5c */ - + GCC_ASM_EXPORT(ExceptionHandlersStart) GCC_ASM_EXPORT(ExceptionHandlersEnd) @@ -103,7 +103,7 @@ ASM_PFX(ResetEntry): stmfd SP!,{LR} @ Store the link register for the current mode sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR stmfd SP!,{R0-R12} @ Store the register state - + mov R0,#0 @ ExceptionType ldr R1,ASM_PFX(CommonExceptionEntry) bx R1 @@ -200,53 +200,53 @@ ASM_PFX(CommonExceptionEntry): ASM_PFX(ExceptionHandlersEnd): // -// This code runs from CpuDxe driver loaded address. It is patched into +// This code runs from CpuDxe driver loaded address. It is patched into // CommonExceptionEntry. // ASM_PFX(AsmCommonExceptionEntry): mrc p15, 0, R1, c6, c0, 2 @ Read IFAR - str R1, [SP, #0x50] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR - + str R1, [SP, #0x50] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR + mrc p15, 0, R1, c5, c0, 1 @ Read IFSR str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR - + mrc p15, 0, R1, c6, c0, 0 @ Read DFAR str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR - + mrc p15, 0, R1, c5, c0, 0 @ Read DFSR str R1, [SP, #0x44] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFSR - - ldr R1, [SP, #0x5c] @ srsdb saved pre-exception CPSR on the stack + + ldr R1, [SP, #0x5c] @ srsdb saved pre-exception CPSR on the stack str R1, [SP, #0x40] @ Store it in EFI_SYSTEM_CONTEXT_ARM.CPSR add R2, SP, #0x38 @ Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR and R3, R1, #0x1f @ Check CPSR to see if User or System Mode cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) - cmpne R3, #0x10 @ + cmpne R3, #0x10 @ stmeqed R2, {lr}^ @ save unbanked lr - @ else + @ else stmneed R2, {lr} @ save SVC lr - ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd + ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd @ Check to see if we have to adjust for Thumb entry sub r4, r0, #1 @ if (ExceptionType == 1 || ExceptionType == 2)) { - cmp r4, #1 @ // UND & SVC have differnt LR adjust for Thumb + cmp r4, #1 @ // UND & SVC have differnt LR adjust for Thumb bhi NoAdjustNeeded - - tst r1, #0x20 @ if ((CPSR & T)) == T) { // Thumb Mode on entry + + tst r1, #0x20 @ if ((CPSR & T)) == T) { // Thumb Mode on entry addne R5, R5, #2 @ PC += 2; strne R5,[SP,#0x58] @ Update LR value pushed by srsfd - + NoAdjustNeeded: str R5, [SP, #0x3c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.PC - + add R1, SP, #0x60 @ We pushed 0x60 bytes on the stack str R1, [SP, #0x34] @ Store it in EFI_SYSTEM_CONTEXT_ARM.SP - - @ R0 is ExceptionType - mov R1,SP @ R1 is SystemContext + + @ R0 is ExceptionType + mov R1,SP @ R1 is SystemContext #if (FixedPcdGet32(PcdVFPEnabled)) vpush {d0-d15} @ save vstm registers in case they are used in optimizations @@ -256,7 +256,7 @@ NoAdjustNeeded: tst R4, #4 subne SP, SP, #4 @ Adjust SP if not 8-byte aligned -/* +/* VOID EFIAPI CommonCExceptionHandler ( @@ -264,13 +264,13 @@ CommonCExceptionHandler ( IN OUT EFI_SYSTEM_CONTEXT SystemContext R1 ) -*/ +*/ blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler mov SP, R4 @ Restore SP #if (FixedPcdGet32(PcdVFPEnabled)) - vpop {d0-d15} + vpop {d0-d15} #endif ldr R1, [SP, #0x4c] @ Restore EFI_SYSTEM_CONTEXT_ARM.IFSR @@ -278,26 +278,26 @@ CommonCExceptionHandler ( ldr R1, [SP, #0x44] @ Restore EFI_SYSTEM_CONTEXT_ARM.DFSR mcr p15, 0, R1, c5, c0, 0 @ Write DFSR - + ldr R1,[SP,#0x3c] @ EFI_SYSTEM_CONTEXT_ARM.PC - str R1,[SP,#0x58] @ Store it back to srsfd stack slot so it can be restored + str R1,[SP,#0x58] @ Store it back to srsfd stack slot so it can be restored ldr R1,[SP,#0x40] @ EFI_SYSTEM_CONTEXT_ARM.CPSR - str R1,[SP,#0x5c] @ Store it back to srsfd stack slot so it can be restored - + str R1,[SP,#0x5c] @ Store it back to srsfd stack slot so it can be restored + add R3, SP, #0x54 @ Make R3 point to SVC LR saved on entry add R2, SP, #0x38 @ Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR and R1, R1, #0x1f @ Check to see if User or System Mode cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) - cmpne R1, #0x10 @ + cmpne R1, #0x10 @ ldmeqed R2, {lr}^ @ restore unbanked lr @ else ldmneed R3, {lr} @ restore SVC lr, via ldmfd SP!, {LR} - + ldmfd SP!,{R0-R12} @ Restore general purpose registers @ Exception handler can not change SP - + add SP,SP,#0x20 @ Clear out the remaining stack space ldmfd SP!,{LR} @ restore the link register for this context rfefd SP! @ return from exception via srsfd stack slot - + diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm index fbb86993dc..b28ff9f7ee 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // Use ARMv6 instruction to operate on a single stack // @@ -22,7 +22,7 @@ This is the stack constructed by the exception handler (low address to high address) # R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM Reg Offset - === ====== + === ====== R0 0x00 # stmfd SP!,{R0-R12} R1 0x04 R2 0x08 @@ -44,15 +44,15 @@ This is the stack constructed by the exception handler (low address to high addr DFAR 0x48 IFSR 0x4c IFAR 0x50 - + LR 0x54 # SVC Link register (we need to restore it) - - LR 0x58 # pushed by srsfd - CPSR 0x5c + + LR 0x58 # pushed by srsfd + CPSR 0x5c */ - - + + EXPORT ExceptionHandlersStart EXPORT ExceptionHandlersEnd EXPORT CommonExceptionEntry @@ -61,7 +61,7 @@ This is the stack constructed by the exception handler (low address to high addr PRESERVE8 AREA DxeExceptionHandlers, CODE, READONLY, CODEALIGN, ALIGN=5 - + // // This code gets copied to the ARM vector table // ExceptionHandlersStart - ExceptionHandlersEnd gets copied @@ -98,7 +98,7 @@ ResetEntry stmfd SP!,{LR} ; Store the link register for the current mode sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR stmfd SP!,{R0-R12} ; Store the register state - + mov R0,#0 ; ExceptionType ldr R1,CommonExceptionEntry bx R1 @@ -112,7 +112,7 @@ UndefinedInstructionEntry stmfd SP!,{R0-R12} ; Store the register state mov R0,#1 ; ExceptionType - ldr R1,CommonExceptionEntry; + ldr R1,CommonExceptionEntry; bx R1 SoftwareInterruptEntry @@ -195,53 +195,53 @@ CommonExceptionEntry ExceptionHandlersEnd // -// This code runs from CpuDxe driver loaded address. It is patched into +// This code runs from CpuDxe driver loaded address. It is patched into // CommonExceptionEntry. // AsmCommonExceptionEntry mrc p15, 0, R1, c6, c0, 2 ; Read IFAR - str R1, [SP, #0x50] ; Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR - + str R1, [SP, #0x50] ; Store it in EFI_SYSTEM_CONTEXT_ARM.IFAR + mrc p15, 0, R1, c5, c0, 1 ; Read IFSR str R1, [SP, #0x4c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR - + mrc p15, 0, R1, c6, c0, 0 ; Read DFAR str R1, [SP, #0x48] ; Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR - + mrc p15, 0, R1, c5, c0, 0 ; Read DFSR str R1, [SP, #0x44] ; Store it in EFI_SYSTEM_CONTEXT_ARM.DFSR - - ldr R1, [SP, #0x5c] ; srsfd saved pre-exception CPSR on the stack + + ldr R1, [SP, #0x5c] ; srsfd saved pre-exception CPSR on the stack str R1, [SP, #0x40] ; Store it in EFI_SYSTEM_CONTEXT_ARM.CPSR add R2, SP, #0x38 ; Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR and R3, R1, #0x1f ; Check CPSR to see if User or System Mode cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f)) - cmpne R3, #0x10 ; + cmpne R3, #0x10 ; stmeqed R2, {lr}^ ; save unbanked lr - ; else + ; else stmneed R2, {lr} ; save SVC lr - ldr R5, [SP, #0x58] ; PC is the LR pushed by srsfd + ldr R5, [SP, #0x58] ; PC is the LR pushed by srsfd ; Check to see if we have to adjust for Thumb entry sub r4, r0, #1 ; if (ExceptionType == 1 || ExceptionType == 2)) { - cmp r4, #1 ; // UND & SVC have differnt LR adjust for Thumb + cmp r4, #1 ; // UND & SVC have differnt LR adjust for Thumb bhi NoAdjustNeeded - - tst r1, #0x20 ; if ((CPSR & T)) == T) { // Thumb Mode on entry + + tst r1, #0x20 ; if ((CPSR & T)) == T) { // Thumb Mode on entry addne R5, R5, #2 ; PC += 2; strne R5,[SP,#0x58] ; Update LR value pushed by srsfd - + NoAdjustNeeded str R5, [SP, #0x3c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.PC - + add R1, SP, #0x60 ; We pushed 0x60 bytes on the stack str R1, [SP, #0x34] ; Store it in EFI_SYSTEM_CONTEXT_ARM.SP - - ; R0 is ExceptionType - mov R1,SP ; R1 is SystemContext + + ; R0 is ExceptionType + mov R1,SP ; R1 is SystemContext #if (FixedPcdGet32(PcdVFPEnabled)) vpush {d0-d15} ; save vstm registers in case they are used in optimizations @@ -251,7 +251,7 @@ NoAdjustNeeded tst R4, #4 subne SP, SP, #4 ; Adjust SP if not 8-byte aligned -/* +/* VOID EFIAPI CommonCExceptionHandler ( @@ -267,35 +267,35 @@ CommonCExceptionHandler ( #if (FixedPcdGet32(PcdVFPEnabled)) vpop {d0-d15} #endif - + ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR mcr p15, 0, R1, c5, c0, 1 ; Write IFSR ldr R1, [SP, #0x44] ; Restore EFI_SYSTEM_CONTEXT_ARM.DFSR mcr p15, 0, R1, c5, c0, 0 ; Write DFSR - + ldr R1,[SP,#0x3c] ; EFI_SYSTEM_CONTEXT_ARM.PC - str R1,[SP,#0x58] ; Store it back to srsfd stack slot so it can be restored + str R1,[SP,#0x58] ; Store it back to srsfd stack slot so it can be restored ldr R1,[SP,#0x40] ; EFI_SYSTEM_CONTEXT_ARM.CPSR - str R1,[SP,#0x5c] ; Store it back to srsfd stack slot so it can be restored - + str R1,[SP,#0x5c] ; Store it back to srsfd stack slot so it can be restored + add R3, SP, #0x54 ; Make R3 point to SVC LR saved on entry add R2, SP, #0x38 ; Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR and R1, R1, #0x1f ; Check to see if User or System Mode cmp R1, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f)) - cmpne R1, #0x10 ; + cmpne R1, #0x10 ; ldmeqed R2, {lr}^ ; restore unbanked lr ; else ldmneed R3, {lr} ; restore SVC lr, via ldmfd SP!, {LR} - + ldmfd SP!,{R0-R12} ; Restore general purpose registers ; Exception handler can not change SP - + add SP,SP,#0x20 ; Clear out the remaining stack space ldmfd SP!,{LR} ; restore the link register for this context rfefd SP! ; return from exception via srsfd stack slot - + END diff --git a/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c b/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c index 18778f3ac6..63da8ba8cb 100644 --- a/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c +++ b/ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c @@ -24,7 +24,7 @@ typedef UINT32 ARM_FIRST_LEVEL_DESCRIPTOR; // Second Level Descriptors typedef UINT32 ARM_PAGE_TABLE_ENTRY; -EFI_STATUS +EFI_STATUS SectionToGcdAttributes ( IN UINT32 SectionAttributes, OUT UINT64 *GcdAttributes @@ -418,12 +418,12 @@ UpdatePageEntries ( // Calculate number of 4KB page table entries to change NumPageEntries = Length / TT_DESCRIPTOR_PAGE_SIZE; - + // Iterate for the number of 4KB pages to change Offset = 0; for(p = 0; p < NumPageEntries; p++) { // Calculate index into first level translation table for page table value - + FirstLevelIdx = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(BaseAddress + Offset) >> TT_DESCRIPTOR_SECTION_BASE_SHIFT; ASSERT (FirstLevelIdx < TRANSLATION_TABLE_SECTION_COUNT); @@ -435,9 +435,9 @@ UpdatePageEntries ( Status = ConvertSectionToPages (FirstLevelIdx << TT_DESCRIPTOR_SECTION_BASE_SHIFT); if (EFI_ERROR(Status)) { // Exit for loop - break; - } - + break; + } + // Re-read descriptor Descriptor = FirstLevelTable[FirstLevelIdx]; } @@ -462,7 +462,7 @@ UpdatePageEntries ( // Make this virtual address point at a physical page PageTableEntry &= ~VirtualMask; } - + if (CurrentPageTableEntry != PageTableEntry) { Mva = (VOID *)(UINTN)((((UINTN)FirstLevelIdx) << TT_DESCRIPTOR_SECTION_BASE_SHIFT) + (PageTableIndex << TT_DESCRIPTOR_PAGE_BASE_SHIFT)); if ((CurrentPageTableEntry & TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) == TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) { @@ -471,14 +471,14 @@ UpdatePageEntries ( WriteBackInvalidateDataCacheRange (Mva, TT_DESCRIPTOR_PAGE_SIZE); } - // Only need to update if we are changing the entry - PageTable[PageTableIndex] = PageTableEntry; + // Only need to update if we are changing the entry + PageTable[PageTableIndex] = PageTableEntry; ArmUpdateTranslationTableEntry ((VOID *)&PageTable[PageTableIndex], Mva); } Status = EFI_SUCCESS; Offset += TT_DESCRIPTOR_PAGE_SIZE; - + } // End first level translation table loop return Status; @@ -508,7 +508,7 @@ UpdateSectionEntries ( // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone) // EntryValue: values at bit positions specified by EntryMask - // Make sure we handle a section range that is unmapped + // Make sure we handle a section range that is unmapped EntryMask = TT_DESCRIPTOR_SECTION_TYPE_MASK; EntryValue = TT_DESCRIPTOR_SECTION_TYPE_SECTION; @@ -567,7 +567,7 @@ UpdateSectionEntries ( // calculate number of 1MB first level entries this applies to NumSections = Length / TT_DESCRIPTOR_SECTION_SIZE; - + // iterate through each descriptor for(i=0; i Copyright (c) 2011, ARM Limited. All rights reserved. - + This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -21,14 +21,14 @@ BOOLEAN mInterruptState = FALSE; /** - This function flushes the range of addresses from Start to Start+Length - from the processor's data cache. If Start is not aligned to a cache line - boundary, then the bytes before Start to the preceding cache line boundary - are also flushed. If Start+Length is not aligned to a cache line boundary, - then the bytes past Start+Length to the end of the next cache line boundary - are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be - supported. If the data cache is fully coherent with all DMA operations, then - this function can just return EFI_SUCCESS. If the processor does not support + This function flushes the range of addresses from Start to Start+Length + from the processor's data cache. If Start is not aligned to a cache line + boundary, then the bytes before Start to the preceding cache line boundary + are also flushed. If Start+Length is not aligned to a cache line boundary, + then the bytes past Start+Length to the end of the next cache line boundary + are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be + supported. If the data cache is fully coherent with all DMA operations, then + this function can just return EFI_SUCCESS. If the processor does not support flushing a range of the data cache, then the entire data cache can be flushed. @param This The EFI_CPU_ARCH_PROTOCOL instance. @@ -70,13 +70,13 @@ CpuFlushCpuDataCache ( default: return EFI_INVALID_PARAMETER; } - + return EFI_SUCCESS; } /** - This function enables interrupt processing by the processor. + This function enables interrupt processing by the processor. @param This The EFI_CPU_ARCH_PROTOCOL instance. @@ -120,8 +120,8 @@ CpuDisableInterrupt ( /** - This function retrieves the processor's current interrupt state a returns it in - State. If interrupts are currently enabled, then TRUE is returned. If interrupts + This function retrieves the processor's current interrupt state a returns it in + State. If interrupts are currently enabled, then TRUE is returned. If interrupts are currently disabled, then FALSE is returned. @param This The EFI_CPU_ARCH_PROTOCOL instance. @@ -150,9 +150,9 @@ CpuGetInterruptState ( /** This function generates an INIT on the processor. If this function succeeds, then the - processor will be reset, and control will not be returned to the caller. If InitType is - not supported by this processor, or the processor cannot programmatically generate an - INIT without help from external hardware, then EFI_UNSUPPORTED is returned. If an error + processor will be reset, and control will not be returned to the caller. If InitType is + not supported by this processor, or the processor cannot programmatically generate an + INIT without help from external hardware, then EFI_UNSUPPORTED is returned. If an error occurs attempting to generate an INIT, then EFI_DEVICE_ERROR is returned. @param This The EFI_CPU_ARCH_PROTOCOL instance. @@ -199,7 +199,7 @@ CpuGetTimerValue ( /** Callback function for idle events. - + @param Event Event whose notification function is being invoked. @param Context The pointer to the notification function's context, which is implementation-dependent. @@ -241,22 +241,22 @@ CpuDxeInitialize ( EFI_STATUS Status; EFI_EVENT IdleLoopEvent; - InitializeExceptions (&mCpu); - + InitializeExceptions (&mCpu); + Status = gBS->InstallMultipleProtocolInterfaces ( - &mCpuHandle, - &gEfiCpuArchProtocolGuid, &mCpu, + &mCpuHandle, + &gEfiCpuArchProtocolGuid, &mCpu, &gVirtualUncachedPagesProtocolGuid, &gVirtualUncachedPages, NULL ); - + // // Make sure GCD and MMU settings match. This API calls gDS->SetMemorySpaceAttributes () // and that calls EFI_CPU_ARCH_PROTOCOL.SetMemoryAttributes, so this code needs to go // after the protocol is installed // SyncCacheConfig (&mCpu); - + // If the platform is a MPCore system then install the Configuration Table describing the // secondary core states if (ArmIsMpCore()) { diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.h b/ArmPkg/Drivers/CpuDxe/CpuDxe.h index d5b50641e3..d16abe400e 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.h +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.h @@ -48,9 +48,9 @@ /** - This function registers and enables the handler specified by InterruptHandler for a processor - interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the - handler for the processor interrupt or exception type specified by InterruptType is uninstalled. + This function registers and enables the handler specified by InterruptHandler for a processor + interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the + handler for the processor interrupt or exception type specified by InterruptType is uninstalled. The installed handler is called once for each processor interrupt or exception. @param InterruptType A pointer to the processor's current interrupt state. Set to TRUE if interrupts @@ -75,9 +75,9 @@ RegisterInterruptHandler ( /** - This function registers and enables the handler specified by InterruptHandler for a processor - interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the - handler for the processor interrupt or exception type specified by InterruptType is uninstalled. + This function registers and enables the handler specified by InterruptHandler for a processor + interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the + handler for the processor interrupt or exception type specified by InterruptType is uninstalled. The installed handler is called once for each processor interrupt or exception. @param InterruptType A pointer to the processor's current interrupt state. Set to TRUE if interrupts @@ -120,7 +120,7 @@ SyncCacheConfig ( IN EFI_CPU_ARCH_PROTOCOL *CpuProtocol ); -EFI_STATUS +EFI_STATUS ConvertSectionToPages ( IN EFI_PHYSICAL_ADDRESS BaseAddress ); diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf index e0d5190e55..01f65a3655 100644 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf @@ -1,7 +1,7 @@ #/** @file -# +# # DXE CPU driver -# +# # Copyright (c) 2009, Apple Inc. All rights reserved.
# Copyright (c) 2011-2013, ARM Limited. All rights reserved. # @@ -9,10 +9,10 @@ # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# #**/ [Defines] @@ -83,7 +83,7 @@ [Pcd.common] gArmTokenSpaceGuid.PcdVFPEnabled gArmTokenSpaceGuid.PcdCpuVectorBaseAddress - + [FeaturePcd.common] gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport gArmTokenSpaceGuid.PcdRelocateVectorTable diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.c b/ArmPkg/Drivers/CpuPei/CpuPei.c index e070c998c2..d54f42acfc 100755 --- a/ArmPkg/Drivers/CpuPei/CpuPei.c +++ b/ArmPkg/Drivers/CpuPei/CpuPei.c @@ -4,18 +4,18 @@ Copyright (c) 2006, Intel Corporation. All rights reserved.
Copyright (c) 2011 Hewlett Packard Corporation. All rights reserved.
Copyright (c) 2011-2013, ARM Limited. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: MemoryInit.c - + Abstract: PEIM to provide fake memory init @@ -51,7 +51,7 @@ Arguments: FileHandle - Handle of the file being invoked. PeiServices - Describes the list of possible PEI Services. - + Returns: Status - EFI_SUCCESS if the boot mode could be set diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.inf b/ArmPkg/Drivers/CpuPei/CpuPei.inf index ebd1fe412b..eafccd6009 100755 --- a/ArmPkg/Drivers/CpuPei/CpuPei.inf +++ b/ArmPkg/Drivers/CpuPei/CpuPei.inf @@ -45,7 +45,7 @@ [Ppis] gArmMpCoreInfoPpiGuid - + [Guids] gArmMpCoreInfoGuid @@ -55,4 +55,4 @@ [Depex] gEfiPeiMemoryDiscoveredPpiGuid - + diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c index a43a10f48c..633876bea6 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c @@ -40,16 +40,16 @@ UINT64 mTimerPeriod = 0; EFI_HARDWARE_INTERRUPT_PROTOCOL *gInterrupt = NULL; /** - This function registers the handler NotifyFunction so it is called every time - the timer interrupt fires. It also passes the amount of time since the last - handler call to the NotifyFunction. If NotifyFunction is NULL, then the - handler is unregistered. If the handler is registered, then EFI_SUCCESS is - returned. If the CPU does not support registering a timer interrupt handler, - then EFI_UNSUPPORTED is returned. If an attempt is made to register a handler - when a handler is already registered, then EFI_ALREADY_STARTED is returned. - If an attempt is made to unregister a handler when a handler is not registered, - then EFI_INVALID_PARAMETER is returned. If an error occurs attempting to - register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR + This function registers the handler NotifyFunction so it is called every time + the timer interrupt fires. It also passes the amount of time since the last + handler call to the NotifyFunction. If NotifyFunction is NULL, then the + handler is unregistered. If the handler is registered, then EFI_SUCCESS is + returned. If the CPU does not support registering a timer interrupt handler, + then EFI_UNSUPPORTED is returned. If an attempt is made to register a handler + when a handler is already registered, then EFI_ALREADY_STARTED is returned. + If an attempt is made to unregister a handler when a handler is not registered, + then EFI_INVALID_PARAMETER is returned. If an error occurs attempting to + register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR is returned. @param This The EFI_TIMER_ARCH_PROTOCOL instance. @@ -102,17 +102,17 @@ ExitBootServicesEvent ( /** - This function adjusts the period of timer interrupts to the value specified - by TimerPeriod. If the timer period is updated, then the selected timer - period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned. If - the timer hardware is not programmable, then EFI_UNSUPPORTED is returned. - If an error occurs while attempting to update the timer period, then the - timer hardware will be put back in its state prior to this call, and - EFI_DEVICE_ERROR is returned. If TimerPeriod is 0, then the timer interrupt - is disabled. This is not the same as disabling the CPU's interrupts. - Instead, it must either turn off the timer hardware, or it must adjust the - interrupt controller so that a CPU interrupt is not generated when the timer - interrupt fires. + This function adjusts the period of timer interrupts to the value specified + by TimerPeriod. If the timer period is updated, then the selected timer + period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned. If + the timer hardware is not programmable, then EFI_UNSUPPORTED is returned. + If an error occurs while attempting to update the timer period, then the + timer hardware will be put back in its state prior to this call, and + EFI_DEVICE_ERROR is returned. If TimerPeriod is 0, then the timer interrupt + is disabled. This is not the same as disabling the CPU's interrupts. + Instead, it must either turn off the timer hardware, or it must adjust the + interrupt controller so that a CPU interrupt is not generated when the timer + interrupt fires. @param This The EFI_TIMER_ARCH_PROTOCOL instance. @param TimerPeriod The rate to program the timer interrupt in 100 nS units. If @@ -136,7 +136,7 @@ TimerDriverSetTimerPeriod ( ) { UINT64 TimerTicks; - + // Always disable the timer ArmArchTimerDisableTimer (); @@ -158,9 +158,9 @@ TimerDriverSetTimerPeriod ( } /** - This function retrieves the period of timer interrupts in 100 ns units, - returns that value in TimerPeriod, and returns EFI_SUCCESS. If TimerPeriod - is NULL, then EFI_INVALID_PARAMETER is returned. If a TimerPeriod of 0 is + This function retrieves the period of timer interrupts in 100 ns units, + returns that value in TimerPeriod, and returns EFI_SUCCESS. If TimerPeriod + is NULL, then EFI_INVALID_PARAMETER is returned. If a TimerPeriod of 0 is returned, then the timer is currently disabled. @param This The EFI_TIMER_ARCH_PROTOCOL instance. @@ -188,12 +188,12 @@ TimerDriverGetTimerPeriod ( } /** - This function generates a soft timer interrupt. If the platform does not support soft - timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned. - If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler() - service, then a soft timer interrupt will be generated. If the timer interrupt is - enabled when this service is called, then the registered handler will be invoked. The - registered handler should not be able to distinguish a hardware-generated timer + This function generates a soft timer interrupt. If the platform does not support soft + timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned. + If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler() + service, then a soft timer interrupt will be generated. If the timer interrupt is + enabled when this service is called, then the registered handler will be invoked. The + registered handler should not be able to distinguish a hardware-generated timer interrupt from a software-generated timer interrupt. @param This The EFI_TIMER_ARCH_PROTOCOL instance. diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.inf b/ArmPkg/Drivers/TimerDxe/TimerDxe.inf index 061fcbc688..50477ba42a 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.inf +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.inf @@ -1,22 +1,22 @@ #/** @file -# +# # Component description file for Timer DXE module -# +# # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# #**/ [Defines] INF_VERSION = 0x00010005 BASE_NAME = ArmTimerDxe - FILE_GUID = 49ea041e-6752-42ca-b0b1-7344fe2546b7 + FILE_GUID = 49ea041e-6752-42ca-b0b1-7344fe2546b7 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 @@ -40,20 +40,19 @@ BaseMemoryLib DebugLib UefiDriverEntryPoint - IoLib + IoLib [Guids] [Protocols] - gEfiTimerArchProtocolGuid + gEfiTimerArchProtocolGuid gHardwareInterruptProtocolGuid [Pcd.common] gEmbeddedTokenSpaceGuid.PcdTimerPeriod - gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum + gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum gArmTokenSpaceGuid.PcdArmArchTimerIntrNum - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz + gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz [Depex] gHardwareInterruptProtocolGuid - \ No newline at end of file diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c index ede23ef2ed..3d6e72aa5a 100644 --- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c +++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -129,7 +129,7 @@ VolumeOpen ( ) { SEMIHOST_FCB *RootFcb = NULL; - + if (Root == NULL) { return EFI_INVALID_PARAMETER; } @@ -138,7 +138,7 @@ VolumeOpen ( if (RootFcb == NULL) { return EFI_OUT_OF_RESOURCES; } - + RootFcb->IsRoot = TRUE; RootFcb->Info.Attribute = EFI_FILE_READ_ONLY | EFI_FILE_DIRECTORY; @@ -212,7 +212,7 @@ FileOpen ( if (EFI_ERROR(Status)) { return Status; } - + IsRoot = FALSE; } @@ -267,7 +267,7 @@ FileClose ( FreeFCB (Fcb); } } - + return Status; } @@ -357,7 +357,7 @@ FileWrite ( *BufferSize -= WriteSize; Fcb->Position += *BufferSize; } - + return Status; } @@ -368,7 +368,7 @@ FileGetPosition ( ) { SEMIHOST_FCB *Fcb = NULL; - + if (Position == NULL) { return EFI_INVALID_PARAMETER; } @@ -447,11 +447,11 @@ GetFileInfo ( Info->FileName[0] = L'\0'; } else { for (Index = 0; Index < NameSize; Index++) { - Info->FileName[Index] = Fcb->FileName[Index]; + Info->FileName[Index] = Fcb->FileName[Index]; } } - *BufferSize = ResultSize; + *BufferSize = ResultSize; return EFI_SUCCESS; } @@ -467,11 +467,11 @@ GetFilesystemInfo ( EFI_FILE_SYSTEM_INFO *Info = NULL; EFI_STATUS Status; UINTN ResultSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (mSemihostFsLabel); - + if (*BufferSize >= ResultSize) { ZeroMem (Buffer, ResultSize); Status = EFI_SUCCESS; - + Info = Buffer; Info->Size = ResultSize; @@ -485,7 +485,7 @@ GetFilesystemInfo ( Status = EFI_BUFFER_TOO_SMALL; } - *BufferSize = ResultSize; + *BufferSize = ResultSize; return Status; } @@ -500,9 +500,9 @@ FileGetInfo ( SEMIHOST_FCB *Fcb; EFI_STATUS Status; UINTN ResultSize; - + Fcb = SEMIHOST_FCB_FROM_THIS(File); - + if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) != 0) { Status = GetFilesystemInfo (Fcb, BufferSize, Buffer); } else if (CompareGuid (InformationType, &gEfiFileInfoGuid) != 0) { @@ -596,8 +596,8 @@ SemihostFsEntryPoint ( } Status = gBS->InstallMultipleProtocolInterfaces ( - &gInstallHandle, - &gEfiSimpleFileSystemProtocolGuid, &gSemihostFs, + &gInstallHandle, + &gEfiSimpleFileSystemProtocolGuid, &gSemihostFs, &gEfiDevicePathProtocolGuid, &gDevicePath, NULL ); @@ -606,6 +606,6 @@ SemihostFsEntryPoint ( FreePool (mSemihostFsLabel); } } - + return Status; } diff --git a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf index fdf669be56..164df2d85e 100644 --- a/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf +++ b/ArmPkg/Filesystem/SemihostFs/SemihostFs.inf @@ -4,13 +4,13 @@ # Copyright (c) 2009, Apple Inc. All rights reserved.
# Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved. # -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php # -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #**/ @@ -25,7 +25,7 @@ [Sources.ARM, Sources.AARCH64] Arm/SemihostFs.c - + [Packages] MdePkg/MdePkg.dec ArmPkg/ArmPkg.dec @@ -45,4 +45,4 @@ [Protocols] gEfiSimpleFileSystemProtocolGuid gEfiDevicePathProtocolGuid - + diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h index dac2e150cc..408b2ca280 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/ArmPkg/Include/AsmMacroIoLib.h @@ -159,7 +159,7 @@ _InitializePrimaryStackEnd: ldr r1, =Address ; \ ldr r0, =Data ; \ str r0, [r1] - + #define MmioOr32(Address, OrData) \ ldr r1, =Address ; \ ldr r2, =OrData ; \ @@ -181,7 +181,7 @@ _InitializePrimaryStackEnd: and r0, r0, r2 ; \ ldr r2, =OrData ; \ orr r0, r0, r2 ; \ - str r0, [r1] + str r0, [r1] #define MmioWriteFromReg32(Address, Reg) \ ldr r1, =Address ; \ @@ -235,7 +235,7 @@ _InitializePrimaryStackEnd: #else // -// Use ARM assembly macros, form armasam +// Use ARM assembly macros, form armasam // // Less magic in the macros if ldr reg, =expr works // @@ -251,7 +251,7 @@ _InitializePrimaryStackEnd: // returns Data in R0 and Address in R1, and OrData in r2 #define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData - + // returns _Data in R0 and _Address in R1, and _OrData in r2 diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc index 54c32d4c34..87e497b31a 100644 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ b/ArmPkg/Include/AsmMacroIoLib.inc @@ -5,81 +5,81 @@ ; Copyright (c) 2009, Apple Inc. All rights reserved.
; Copyright (c) 2011-2012, ARM Ltd. All rights reserved.
; -; This program and the accompanying materials -; are licensed and made available under the terms and conditions of the BSD License -; which accompanies this distribution. The full text of the license may be found at -; http://opensource.org/licenses/bsd-license.php -; -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; This program and the accompanying materials +; are licensed and made available under the terms and conditions of the BSD License +; which accompanies this distribution. The full text of the license may be found at +; http://opensource.org/licenses/bsd-license.php +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ; ;**/ - MACRO - MmioWrite32Macro $Address, $Data - ldr r1, = ($Address) - ldr r0, = ($Data) - str r0, [r1] + MACRO + MmioWrite32Macro $Address, $Data + ldr r1, = ($Address) + ldr r0, = ($Data) + str r0, [r1] MEND - - MACRO - MmioOr32Macro $Address, $OrData - ldr r1, =($Address) - ldr r2, =($OrData) - ldr r0, [r1] - orr r0, r0, r2 - str r0, [r1] + + MACRO + MmioOr32Macro $Address, $OrData + ldr r1, =($Address) + ldr r2, =($OrData) + ldr r0, [r1] + orr r0, r0, r2 + str r0, [r1] MEND - MACRO - MmioAnd32Macro $Address, $AndData - ldr r1, =($Address) - ldr r2, =($AndData) - ldr r0, [r1] - and r0, r0, r2 - str r0, [r1] + MACRO + MmioAnd32Macro $Address, $AndData + ldr r1, =($Address) + ldr r2, =($AndData) + ldr r0, [r1] + and r0, r0, r2 + str r0, [r1] MEND - MACRO - MmioAndThenOr32Macro $Address, $AndData, $OrData - ldr r1, =($Address) - ldr r0, [r1] - ldr r2, =($AndData) - and r0, r0, r2 - ldr r2, =($OrData) - orr r0, r0, r2 - str r0, [r1] + MACRO + MmioAndThenOr32Macro $Address, $AndData, $OrData + ldr r1, =($Address) + ldr r0, [r1] + ldr r2, =($AndData) + and r0, r0, r2 + ldr r2, =($OrData) + orr r0, r0, r2 + str r0, [r1] MEND - MACRO - MmioWriteFromReg32Macro $Address, $Reg - ldr r1, =($Address) - str $Reg, [r1] + MACRO + MmioWriteFromReg32Macro $Address, $Reg + ldr r1, =($Address) + str $Reg, [r1] MEND - MACRO - MmioRead32Macro $Address - ldr r1, =($Address) - ldr r0, [r1] + MACRO + MmioRead32Macro $Address + ldr r1, =($Address) + ldr r0, [r1] + MEND + + MACRO + MmioReadToReg32Macro $Address, $Reg + ldr r1, =($Address) + ldr $Reg, [r1] MEND - MACRO - MmioReadToReg32Macro $Address, $Reg - ldr r1, =($Address) - ldr $Reg, [r1] + MACRO + LoadConstantMacro $Data + ldr r0, =($Data) MEND - MACRO - LoadConstantMacro $Data - ldr r0, =($Data) + MACRO + LoadConstantToRegMacro $Data, $Reg + ldr $Reg, =($Data) MEND - MACRO - LoadConstantToRegMacro $Data, $Reg - ldr $Reg, =($Data) - MEND - ; The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack ; Note: Global Size will be modified MACRO diff --git a/ArmPkg/Include/Chipset/ARM926EJ-S.h b/ArmPkg/Include/Chipset/ARM926EJ-S.h index 8e1b6e1462..4ef110358f 100644 --- a/ArmPkg/Include/Chipset/ARM926EJ-S.h +++ b/ArmPkg/Include/Chipset/ARM926EJ-S.h @@ -58,7 +58,7 @@ #define TT_DESCRIPTOR_SECTION_WRITE_BACK (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \ TT_DESCRIPTOR_SECTION_DOMAIN(0) | \ TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK | \ - TT_DESCRIPTOR_TYPE_SECTION) + TT_DESCRIPTOR_TYPE_SECTION) #define TT_DESCRIPTOR_SECTION_WRITE_THROUGH (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \ TT_DESCRIPTOR_SECTION_DOMAIN(0) | \ TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH | \ diff --git a/ArmPkg/Include/Chipset/ArmArchTimer.h b/ArmPkg/Include/Chipset/ArmArchTimer.h index fcc03ca921..1caad3d336 100644 --- a/ArmPkg/Include/Chipset/ArmArchTimer.h +++ b/ArmPkg/Include/Chipset/ArmArchTimer.h @@ -1,14 +1,14 @@ /** @file * * Copyright (c) 2011-2013, ARM Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php * -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* This program and the accompanying materials +* are licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * **/ diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h index 839a192516..ceb32170ed 100644 --- a/ArmPkg/Include/Chipset/ArmV7.h +++ b/ArmPkg/Include/Chipset/ArmV7.h @@ -94,7 +94,7 @@ ArmEnableSWPInstruction ( VOID ); -UINTN +UINTN EFIAPI ArmReadCbar ( VOID diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/ArmPkg/Include/Chipset/ArmV7Mmu.h index a3b3e35f10..24ab1755fa 100644 --- a/ArmPkg/Include/Chipset/ArmV7Mmu.h +++ b/ArmPkg/Include/Chipset/ArmV7Mmu.h @@ -1,14 +1,14 @@ /** @file * * Copyright (c) 2011-2013, ARM Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php * -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* This program and the accompanying materials +* are licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * **/ diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmMpCoreInfo.h index dba2becca9..fe690e274b 100644 --- a/ArmPkg/Include/Guid/ArmMpCoreInfo.h +++ b/ArmPkg/Include/Guid/ArmMpCoreInfo.h @@ -1,14 +1,14 @@ /** @file * * Copyright (c) 2011, ARM Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php * -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* This program and the accompanying materials +* are licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * **/ diff --git a/ArmPkg/Include/Library/ArmDisassemblerLib.h b/ArmPkg/Include/Library/ArmDisassemblerLib.h index 757c95ec79..d6a493f2cb 100644 --- a/ArmPkg/Include/Library/ArmDisassemblerLib.h +++ b/ArmPkg/Include/Library/ArmDisassemblerLib.h @@ -16,19 +16,19 @@ #define __ARM_DISASSEBLER_LIB_H__ /** - Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to - point to next instructin. - - We cheat and only decode instructions that access + Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to + point to next instructin. + + We cheat and only decode instructions that access memory. If the instruction is not found we dump the instruction in hex. - - @param OpCodePtrPtr Pointer to pointer of ARM Thumb instruction to disassemble. + + @param OpCodePtrPtr Pointer to pointer of ARM Thumb instruction to disassemble. @param Thumb TRUE for Thumb(2), FALSE for ARM instruction stream @param Extended TRUE dump hex for instruction too. @param ItBlock Size of IT Block @param Buf Buffer to sprintf disassembly into. - @param Size Size of Buf in bytes. - + @param Size Size of Buf in bytes. + **/ VOID DisassembleInstruction ( @@ -39,5 +39,5 @@ DisassembleInstruction ( OUT CHAR8 *Buf, OUT UINTN Size ); - -#endif + +#endif diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h index bc3b89663c..0bb0d4a063 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -148,43 +148,43 @@ EFIAPI ArmDataCachePresent ( VOID ); - + UINTN EFIAPI ArmDataCacheSize ( VOID ); - + UINTN EFIAPI ArmDataCacheAssociativity ( VOID ); - + UINTN EFIAPI ArmDataCacheLineLength ( VOID ); - + BOOLEAN EFIAPI ArmInstructionCachePresent ( VOID ); - + UINTN EFIAPI ArmInstructionCacheSize ( VOID ); - + UINTN EFIAPI ArmInstructionCacheAssociativity ( VOID ); - + UINTN EFIAPI ArmInstructionCacheLineLength ( @@ -311,7 +311,7 @@ EFIAPI ArmDisableInstructionCache ( VOID ); - + VOID EFIAPI ArmEnableMmu ( @@ -395,7 +395,7 @@ EFIAPI ArmDisableFiq ( VOID ); - + BOOLEAN EFIAPI ArmGetFiqState ( @@ -407,14 +407,14 @@ EFIAPI ArmInvalidateTlb ( VOID ); - + VOID EFIAPI ArmUpdateTranslationTableEntry ( IN VOID *TranslationTableEntry, IN VOID *Mva ); - + VOID EFIAPI ArmSetDomainAccessControl ( @@ -440,13 +440,13 @@ ArmConfigureMmu ( OUT VOID **TranslationTableBase OPTIONAL, OUT UINTN *TranslationTableSize OPTIONAL ); - + BOOLEAN EFIAPI ArmMmuEnabled ( VOID ); - + VOID EFIAPI ArmEnableBranchPrediction ( @@ -482,13 +482,13 @@ EFIAPI ArmDataMemoryBarrier ( VOID ); - + VOID EFIAPI ArmDataSyncronizationBarrier ( VOID ); - + VOID EFIAPI ArmInstructionSynchronizationBarrier ( diff --git a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h index 7166dbb36e..5c7d7e2600 100644 --- a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h +++ b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h @@ -27,5 +27,5 @@ DefaultExceptionHandler ( IN EFI_EXCEPTION_TYPE ExceptionType, IN OUT EFI_SYSTEM_CONTEXT SystemContext ); - -#endif + +#endif diff --git a/ArmPkg/Include/Library/SemihostLib.h b/ArmPkg/Include/Library/SemihostLib.h index 6256551771..4026f51736 100644 --- a/ArmPkg/Include/Library/SemihostLib.h +++ b/ArmPkg/Include/Library/SemihostLib.h @@ -22,7 +22,7 @@ * about the semihosting interface. * */ - + #define SEMIHOST_FILE_MODE_READ (0 << 2) #define SEMIHOST_FILE_MODE_WRITE (1 << 2) #define SEMIHOST_FILE_MODE_APPEND (2 << 2) @@ -92,10 +92,10 @@ VOID SemihostWriteString ( IN CHAR8 *String ); - + UINT32 SemihostSystem ( IN CHAR8 *CommandLine ); - + #endif // __SEMIHOSTING_H__ diff --git a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h index 4161fc7c62..a49d8d3ac9 100644 --- a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h +++ b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h @@ -121,7 +121,7 @@ UncachedAllocateReservedPages ( If Buffer was not allocated with a page allocation function in the Memory Allocation Library, then ASSERT(). If Pages is zero, then ASSERT(). - + @param Buffer Pointer to the buffer of pages to free. @param Pages The number of 4 KB pages to free. @@ -212,7 +212,7 @@ UncachedAllocateAlignedReservedPages ( If Buffer was not allocated with an aligned page allocation function in the Memory Allocation Library, then ASSERT(). If Pages is zero, then ASSERT(). - + @param Buffer Pointer to the buffer of pages to free. @param Pages The number of 4 KB pages to free. @@ -343,7 +343,7 @@ UncachedAllocateReservedZeroPool ( allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). + If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). @param AllocationSize The number of bytes to allocate and zero. @param Buffer The buffer to copy to the allocated buffer. @@ -366,7 +366,7 @@ UncachedAllocateCopyPool ( allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). + If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). @param AllocationSize The number of bytes to allocate and zero. @param Buffer The buffer to copy to the allocated buffer. @@ -389,7 +389,7 @@ UncachedAllocateRuntimeCopyPool ( allocated buffer. If AllocationSize is 0, then a valid buffer of 0 size is returned. If there is not enough memory remaining to satisfy the request, then NULL is returned. If Buffer is NULL, then ASSERT(). - If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). + If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). @param AllocationSize The number of bytes to allocate and zero. @param Buffer The buffer to copy to the allocated buffer. @@ -639,7 +639,7 @@ UncachedAllocateAlignedReservedCopyPool ( ); /** - Frees a buffer that was previously allocated with one of the aligned pool allocation functions + Frees a buffer that was previously allocated with one of the aligned pool allocation functions in the Memory Allocation Library. Frees the buffer specified by Buffer. Buffer must have been allocated on a previous call to the diff --git a/ArmPkg/Include/Protocol/VirtualUncachedPages.h b/ArmPkg/Include/Protocol/VirtualUncachedPages.h index cf987b0438..0822184b89 100644 --- a/ArmPkg/Include/Protocol/VirtualUncachedPages.h +++ b/ArmPkg/Include/Protocol/VirtualUncachedPages.h @@ -37,7 +37,7 @@ EFI_STATUS IN EFI_PHYSICAL_ADDRESS VirtualMask, OUT UINT64 *Attributes OPTIONAL ); - + typedef EFI_STATUS (EFIAPI *FREE_CONVERTED_PAGES) ( @@ -57,4 +57,4 @@ struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL { extern EFI_GUID gVirtualUncachedPagesProtocolGuid; -#endif +#endif diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf index 9c13e81307..fa5ca0cc7a 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf @@ -1,14 +1,14 @@ #/** @file -# +# # Copyright (c) 2011-2012, ARM Limited. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php -# +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# +# #**/ [Defines] @@ -17,7 +17,7 @@ FILE_GUID = 82da1b44-d2d6-4a7d-bbf0-a0cb67964034 MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = TimerLib + LIBRARY_CLASS = TimerLib CONSTRUCTOR = TimerConstructor [Sources.common] @@ -27,18 +27,18 @@ MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec - + [LibraryClasses] DebugLib IoLib ArmLib - BaseLib - + BaseLib + [Protocols] - + [Guids] - + [Pcd] gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz diff --git a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c index f4c12e7173..8501e5c613 100644 --- a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c +++ b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c @@ -2,7 +2,7 @@ Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. - + This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -27,7 +27,7 @@ CacheRangeOperation ( UINTN ArmCacheLineLength = ArmDataCacheLineLength(); UINTN ArmCacheLineAlignmentMask = ArmCacheLineLength - 1; UINTN ArmCacheOperationThreshold = PcdGet32(PcdArmCacheOperationThreshold); - + if ((CacheOperation != NULL) && (Length >= ArmCacheOperationThreshold)) { ArmDrainWriteBuffer (); CacheOperation (); diff --git a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c index 78f0d137ea..29a8d44386 100644 --- a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c +++ b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c @@ -2,7 +2,7 @@ Default exception handler Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
- + This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -90,7 +90,7 @@ MRegList ( UINTN Index, Start, End; CHAR8 *Str; BOOLEAN First; - + Str = mMregListStr; *Str = '\0'; AsciiStrCat (Str, "{"); @@ -100,13 +100,13 @@ MRegList ( for (Index++; ((OpCode & (1 << Index)) != 0) && Index <= 15; Index++) { End = Index; } - + if (!First) { AsciiStrCat (Str, ","); } else { First = FALSE; } - + if (Start == End) { AsciiStrCat (Str, gReg[Start]); AsciiStrCat (Str, ", "); @@ -121,7 +121,7 @@ MRegList ( AsciiStrCat (Str, "ERROR"); } AsciiStrCat (Str, "}"); - + // BugBug: Make caller pass in buffer it is cleaner return mMregListStr; } @@ -145,17 +145,17 @@ RotateRight ( /** - Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to - point to next instructin. - - We cheat and only decode instructions that access + Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to + point to next instructin. + + We cheat and only decode instructions that access memory. If the instruction is not found we dump the instruction in hex. - - @param OpCodePtr Pointer to pointer of ARM instruction to disassemble. + + @param OpCodePtr Pointer to pointer of ARM instruction to disassemble. @param Buf Buffer to sprintf disassembly into. - @param Size Size of Buf in bytes. + @param Size Size of Buf in bytes. @param Extended TRUE dump hex for instruction too. - + **/ VOID DisassembleArmInstruction ( @@ -177,7 +177,7 @@ DisassembleArmInstruction ( P = (OpCode & BIT24) == BIT24; U = (OpCode & BIT23) == BIT23; B = (OpCode & BIT22) == BIT22; // Also called S - W = (OpCode & BIT21) == BIT21; + W = (OpCode & BIT21) == BIT21; L = (OpCode & BIT20) == BIT20; S = (OpCode & BIT6) == BIT6; H = (OpCode & BIT5) == BIT5; @@ -195,27 +195,27 @@ DisassembleArmInstruction ( // LDREX, STREX if ((OpCode & 0x0fe000f0) == 0x01800090) { if (L) { - // A4.1.27 LDREX{} , [] - AsciiSPrint (Buf, Size, "LDREX%a %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn]); + // A4.1.27 LDREX{} , [] + AsciiSPrint (Buf, Size, "LDREX%a %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn]); } else { // A4.1.103 STREX{} , , [] - AsciiSPrint (Buf, Size, "STREX%a %a, %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn], gReg[Rn]); - } + AsciiSPrint (Buf, Size, "STREX%a %a, %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn], gReg[Rn]); + } return; } - + // LDM/STM if ((OpCode & 0x0e000000) == 0x08000000) { if (L) { // A4.1.20 LDM{} {!}, // A4.1.21 LDM{} , ^ // A4.1.22 LDM{} {!}, ^ - AsciiSPrint (Buf, Size, "LDM%a%a, %a%a, %a", COND (OpCode), LDM_EXT (Rn ,(OpCode >> 23) & 3), gReg[Rn], WRITE (W), MRegList (OpCode), USER (B)); + AsciiSPrint (Buf, Size, "LDM%a%a, %a%a, %a", COND (OpCode), LDM_EXT (Rn ,(OpCode >> 23) & 3), gReg[Rn], WRITE (W), MRegList (OpCode), USER (B)); } else { // A4.1.97 STM{} {!}, // A4.1.98 STM{} , ^ - AsciiSPrint (Buf, Size, "STM%a%a, %a%a, %a", COND (OpCode), LDM_EXT (Rn ,(OpCode >> 23) & 3), gReg[Rn], WRITE (W), MRegList (OpCode), USER (B)); - } + AsciiSPrint (Buf, Size, "STM%a%a, %a%a, %a", COND (OpCode), LDM_EXT (Rn ,(OpCode >> 23) & 3), gReg[Rn], WRITE (W), MRegList (OpCode), USER (B)); + } return; } @@ -225,7 +225,7 @@ DisassembleArmInstruction ( if ((OpCode & 0xfd70f000 ) == 0xf550f000) { Index = AsciiSPrint (Buf, Size, "PLD"); } else { - Index = AsciiSPrint (Buf, Size, "%a%a%a%a %a, ", L ? "LDR" : "STR", COND (OpCode), BYTE (B), (!(P) && W) ? "T":"", gReg[Rd]); + Index = AsciiSPrint (Buf, Size, "%a%a%a%a %a, ", L ? "LDR" : "STR", COND (OpCode), BYTE (B), (!(P) && W) ? "T":"", gReg[Rd]); } if (P) { if (!I) { @@ -256,7 +256,7 @@ DisassembleArmInstruction ( } else { Type = "ROR"; } - + AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a%a, %a, #%d]%a", gReg[Rn], SIGN (U), gReg[Rm], Type, shift_imm, WRITE (W)); } } else { // !P @@ -287,13 +287,13 @@ DisassembleArmInstruction ( } else { Type = "ROR"; } - + AsciiSPrint (&Buf[Index], Size - Index, "[%a], #%a%a, %a, #%d", gReg[Rn], SIGN (U), gReg[Rm], Type, shift_imm); } } - return; + return; } - + if ((OpCode & 0x0e000000) == 0x00000000) { // LDR/STR address mode 3 // LDR|STR{}H|SH|SB|D , @@ -314,8 +314,8 @@ DisassembleArmInstruction ( Root = "STR%aD %a "; } } - - Index = AsciiSPrint (Buf, Size, Root, COND (OpCode), gReg[Rd]); + + Index = AsciiSPrint (Buf, Size, Root, COND (OpCode), gReg[Rd]); S = (OpCode & BIT6) == BIT6; H = (OpCode & BIT5) == BIT5; @@ -350,7 +350,7 @@ DisassembleArmInstruction ( AsciiSPrint (Buf, Size, "SWP%a%a %a, %a, [%a]", COND (OpCode), BYTE (B), gReg[Rd], gReg[Rm], gReg[Rn]); return; } - + if ((OpCode & 0xfe5f0f00) == 0xf84d0500) { // A4.1.90 SRS SRS #{!} AsciiSPrint (Buf, Size, "SRS%a #0x%x%a", gLdmStack[(OpCode >> 23) & 3], OpCode & 0x1f, WRITE (W)); @@ -362,13 +362,13 @@ DisassembleArmInstruction ( AsciiSPrint (Buf, Size, "RFE%a %a", gLdmStack[(OpCode >> 23) & 3], gReg[Rn], WRITE (W)); return; } - + if ((OpCode & 0xfff000f0) == 0xe1200070) { // A4.1.7 BKPT AsciiSPrint (Buf, Size, "BKPT %x", ((OpCode >> 8) | (OpCode & 0xf)) & 0xffff); return; - } - + } + if ((OpCode & 0xfff10020) == 0xf1000000) { // A4.1.16 CPS {, #} if (((OpCode >> 6) & 0x7) == 0) { @@ -381,19 +381,19 @@ DisassembleArmInstruction ( } } return; - } - + } + if ((OpCode & 0x0f000000) == 0x0f000000) { // A4.1.107 SWI{} AsciiSPrint (Buf, Size, "SWI%a %x", COND (OpCode), OpCode & 0x00ffffff); return; - } + } if ((OpCode & 0x0fb00000) == 0x01000000) { // A4.1.38 MRS{} , CPSR MRS{} , SPSR AsciiSPrint (Buf, Size, "MRS%a %a, %a", COND (OpCode), gReg[Rd], B ? "SPSR" : "CPSR"); return; - } + } if ((OpCode & 0x0db00000) == 0x03200000) { @@ -406,14 +406,14 @@ DisassembleArmInstruction ( AsciiSPrint (Buf, Size, "MRS%a %a_%a, %a", COND (OpCode), B ? "SPSR" : "CPSR", gReg[Rd]); } return; - } + } if ((OpCode & 0xff000010) == 0xfe000000) { // A4.1.13 CDP{} , , , , , AsciiSPrint (Buf, Size, "CDP%a 0x%x, 0x%x, CR%d, CR%d, CR%d, 0x%x", COND (OpCode), (OpCode >> 8) & 0xf, (OpCode >> 20) & 0xf, Rn, Rd, Rm, (OpCode >> 5) &0x7); return; } - + if ((OpCode & 0x0e000000) == 0x0c000000) { // A4.1.19 LDC and A4.1.96 SDC if ((OpCode & 0xf0000000) == 0xf0000000) { @@ -421,36 +421,36 @@ DisassembleArmInstruction ( } else { Index = AsciiSPrint (Buf, Size, "%a%a 0x%x, CR%d, ", L ? "LDC":"SDC", COND (OpCode), (OpCode >> 8) & 0xf, Rd); } - + if (!P) { - if (!W) { + if (!W) { // A5.5.5.5 [],