sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM Packages: Removed trailing spaces

Browse Source 
Trailing spaces create issue/warning when generating/applying patches.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ronald Cron
2014-08-19 13:29:52 +00:00
committed by oliviermartin
parent 62d441fb17
commit 3402aac7d9
554 changed files with 6333 additions and 6345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011-2013, ARM Limited. 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

14
ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011-2013, ARM Limited. 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

10
ArmPkg/ArmPkg.dsc
View File

@ -31,13 +31,13 @@
[BuildOptions] [BuildOptions]
XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7 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:*_*_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:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A8
RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
[LibraryClasses.common] [LibraryClasses.common]
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
@ -74,7 +74,7 @@
BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
[LibraryClasses.ARM] [LibraryClasses.ARM]

14
ArmPkg/Drivers/ArmCpuLib/Arm11MpCoreLib/Arm11MpCoreLib.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011-2012, ARM Limited. All rights reserved. # 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

14
ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011-2012, ARM Limited. All rights reserved. # 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

14
ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011, ARM Limited. All rights reserved. # 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

14
ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011-2013, ARM Limited. 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/

2
ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
View File

@ -16,7 +16,7 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmGicDxe BASE_NAME = ArmGicDxe
FILE_GUID = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 FILE_GUID = DE371F7C-DEC4-4D21-ADF1-593ABCC15882
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0

34
ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# #
@ -52,7 +52,7 @@ ASM_PFX(ResetEntry):
stmfd SP!,{LR} @ Store the link register for the current mode stmfd SP!,{LR} @ Store the link register for the current mode
sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} @ Store the register state stmfd SP!,{R0-R12} @ Store the register state
mov R0,#0 mov R0,#0
ldr R1,ASM_PFX(CommonExceptionEntry) ldr R1,ASM_PFX(CommonExceptionEntry)
bx R1 bx R1
@ -147,18 +147,18 @@ ASM_PFX(ExceptionHandlersEnd):
ASM_PFX(AsmCommonExceptionEntry): ASM_PFX(AsmCommonExceptionEntry):
mrc p15, 0, R1, c6, c0, 2 @ Read IFAR 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 mrc p15, 0, R1, c5, c0, 1 @ Read IFSR
str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR
mrc p15, 0, R1, c6, c0, 0 @ Read DFAR mrc p15, 0, R1, c6, c0, 0 @ Read DFAR
str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR
mrc p15, 0, R1, c5, c0, 0 @ Read DFSR mrc p15, 0, R1, c5, c0, 0 @ Read DFSR
str R1, [SP, #0x44] @ Store it in EFI_SYSTEM_CONTEXT_ARM.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 str R1, [SP, #0x40] @ Store it in EFI_SYSTEM_CONTEXT_ARM.CPSR
and r1, r1, #0x1f @ Check to see if User or System Mode and r1, r1, #0x1f @ Check to see if User or System Mode
cmp r1, #0x1f cmp r1, #0x1f
@ -167,25 +167,25 @@ ASM_PFX(AsmCommonExceptionEntry):
ldmneed r2, {lr}^ @ User or System mode, use unbanked register ldmneed r2, {lr}^ @ User or System mode, use unbanked register
ldmneed r2, {lr} @ All other modes used banked 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 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 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 mov R1,SP @ Prepare System Context pointer as an argument for the exception handler
blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler
ldr R2,[SP,#0x40] @ EFI_SYSTEM_CONTEXT_ARM.CPSR 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 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 ldmfd SP!,{R0-R12} @ Restore general purpose registers
@ Exception handler can not change SP or LR as we would blow chunks @ Exception handler can not change SP or LR as we would blow chunks
add SP,SP,#0x20 @ Clear out the remaining stack space add SP,SP,#0x20 @ Clear out the remaining stack space
ldmfd SP!,{LR} @ restore the link register for this context ldmfd SP!,{LR} @ restore the link register for this context
rfefd SP! @ return from exception via srsdb stack slot rfefd SP! @ return from exception via srsdb stack slot

24
ArmPkg/Drivers/CpuDxe/ArmV4/ExceptionSupport.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
// //
@ -20,7 +20,7 @@
PRESERVE8 PRESERVE8
AREA DxeExceptionHandlers, CODE, READONLY AREA DxeExceptionHandlers, CODE, READONLY
ExceptionHandlersStart ExceptionHandlersStart
Reset Reset
@ -107,35 +107,35 @@ ExceptionHandlersEnd
AsmCommonExceptionEntry AsmCommonExceptionEntry
mrc p15, 0, r1, c6, c0, 2 ; Read IFAR mrc p15, 0, r1, c6, c0, 2 ; Read IFAR
stmfd SP!,{R1} ; Store the IFAR stmfd SP!,{R1} ; Store the IFAR
mrc p15, 0, r1, c5, c0, 1 ; Read IFSR mrc p15, 0, r1, c5, c0, 1 ; Read IFSR
stmfd SP!,{R1} ; Store the IFSR stmfd SP!,{R1} ; Store the IFSR
mrc p15, 0, r1, c6, c0, 0 ; Read DFAR mrc p15, 0, r1, c6, c0, 0 ; Read DFAR
stmfd SP!,{R1} ; Store the DFAR stmfd SP!,{R1} ; Store the DFAR
mrc p15, 0, r1, c5, c0, 0 ; Read DFSR mrc p15, 0, r1, c5, c0, 0 ; Read DFSR
stmfd SP!,{R1} ; Store the DFSR stmfd SP!,{R1} ; Store the DFSR
mrs R1,SPSR ; Read SPSR (which is the pre-exception CPSR) mrs R1,SPSR ; Read SPSR (which is the pre-exception CPSR)
stmfd SP!,{R1} ; Store the SPSR stmfd SP!,{R1} ; Store the SPSR
stmfd SP!,{LR} ; Store the link register (which is the pre-exception PC) 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 stmfd SP,{SP,LR}^ ; Store user/system mode stack pointer and link register
nop ; Required by ARM architecture nop ; Required by ARM architecture
SUB SP,SP,#0x08 ; Adjust stack pointer SUB SP,SP,#0x08 ; Adjust stack pointer
stmfd SP!,{R2-R12} ; Store general purpose registers 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 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) 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 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 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 sub SP,SP,#4 ; Adjust SP to preserve 8-byte alignment
blx CommonCExceptionHandler ; Call exception handler blx CommonCExceptionHandler ; Call exception handler
add SP,SP,#4 ; Adjust SP back to where we were add SP,SP,#4 ; Adjust SP back to where we were
ldr R2,[SP,#0x40] ; Load CPSR from context, in case it has changed 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 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) ldmfd SP!,{LR} ; Restore the link register (which is the pre-exception PC)
add SP,SP,#0x1C ; Clear out the remaining stack space add SP,SP,#0x1C ; Clear out the remaining stack space
movs PC,LR ; Return from exception movs PC,LR ; Return from exception
END END

18
ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2014, ARM Limited. All rights reserved.<BR> Copyright (c) 2014, ARM Limited. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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 //FIXME: Will not compile on non-ARMv7 builds
#include <Chipset/ArmV7.h> #include <Chipset/ArmV7.h>
@ -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 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 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. 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. 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 @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)); DEBUG ((EFI_D_ERROR, "Unknown exception type %d from %08x\n", ExceptionType, SystemContext.SystemContextArm->PC));
ASSERT (FALSE); ASSERT (FALSE);
} }
if (ExceptionType == EXCEPT_ARM_SOFTWARE_INTERRUPT) { if (ExceptionType == EXCEPT_ARM_SOFTWARE_INTERRUPT) {
// //
// ARM JTAG debuggers some times use this vector, so it is not an error to get one // 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); Cpu->DisableInterrupt (Cpu);
// //
// EFI does not use the FIQ, but a debugger might so we must disable // EFI does not use the FIQ, but a debugger might so we must disable
// as we take over the exception vectors. // as we take over the exception vectors.
// //
FiqEnabled = ArmGetFiqState (); FiqEnabled = ArmGetFiqState ();
ArmDisableFiq (); ArmDisableFiq ();
@ -224,7 +224,7 @@ InitializeExceptions (
} }
if (IrqEnabled) { if (IrqEnabled) {
// //
// Restore interrupt state // Restore interrupt state
// //
Status = Cpu->EnableInterrupt (Cpu); Status = Cpu->EnableInterrupt (Cpu);

74
ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Use ARMv6 instruction to operate on a single stack # 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) This is the stack constructed by the exception handler (low address to high address)
# R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM # R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM
Reg Offset Reg Offset
=== ====== === ======
R0 0x00 # stmfd SP!,{R0-R12} R0 0x00 # stmfd SP!,{R0-R12}
R1 0x04 R1 0x04
R2 0x08 R2 0x08
@ -44,14 +44,14 @@ This is the stack constructed by the exception handler (low address to high addr
DFAR 0x48 DFAR 0x48
IFSR 0x4c IFSR 0x4c
IFAR 0x50 IFAR 0x50
LR 0x54 # SVC Link register (we need to restore it) LR 0x54 # SVC Link register (we need to restore it)
LR 0x58 # pushed by srsfd LR 0x58 # pushed by srsfd
CPSR 0x5c CPSR 0x5c
*/ */
GCC_ASM_EXPORT(ExceptionHandlersStart) GCC_ASM_EXPORT(ExceptionHandlersStart)
GCC_ASM_EXPORT(ExceptionHandlersEnd) GCC_ASM_EXPORT(ExceptionHandlersEnd)
@ -103,7 +103,7 @@ ASM_PFX(ResetEntry):
stmfd SP!,{LR} @ Store the link register for the current mode stmfd SP!,{LR} @ Store the link register for the current mode
sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR sub SP,SP,#0x20 @ Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} @ Store the register state stmfd SP!,{R0-R12} @ Store the register state
mov R0,#0 @ ExceptionType mov R0,#0 @ ExceptionType
ldr R1,ASM_PFX(CommonExceptionEntry) ldr R1,ASM_PFX(CommonExceptionEntry)
bx R1 bx R1
@ -200,53 +200,53 @@ ASM_PFX(CommonExceptionEntry):
ASM_PFX(ExceptionHandlersEnd): 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. // CommonExceptionEntry.
// //
ASM_PFX(AsmCommonExceptionEntry): ASM_PFX(AsmCommonExceptionEntry):
mrc p15, 0, R1, c6, c0, 2 @ Read IFAR 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 mrc p15, 0, R1, c5, c0, 1 @ Read IFSR
str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR str R1, [SP, #0x4c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR
mrc p15, 0, R1, c6, c0, 0 @ Read DFAR mrc p15, 0, R1, c6, c0, 0 @ Read DFAR
str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR str R1, [SP, #0x48] @ Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR
mrc p15, 0, R1, c5, c0, 0 @ Read DFSR mrc p15, 0, R1, c5, c0, 0 @ Read DFSR
str R1, [SP, #0x44] @ Store it in EFI_SYSTEM_CONTEXT_ARM.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 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 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 and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 @ cmpne R3, #0x10 @
stmeqed R2, {lr}^ @ save unbanked lr stmeqed R2, {lr}^ @ save unbanked lr
@ else @ else
stmneed R2, {lr} @ save SVC lr 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 @ Check to see if we have to adjust for Thumb entry
sub r4, r0, #1 @ if (ExceptionType == 1 || ExceptionType == 2)) { 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 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; addne R5, R5, #2 @ PC += 2;
strne R5,[SP,#0x58] @ Update LR value pushed by srsfd strne R5,[SP,#0x58] @ Update LR value pushed by srsfd
NoAdjustNeeded: NoAdjustNeeded:
str R5, [SP, #0x3c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.PC str R5, [SP, #0x3c] @ Store it in EFI_SYSTEM_CONTEXT_ARM.PC
add R1, SP, #0x60 @ We pushed 0x60 bytes on the stack add R1, SP, #0x60 @ We pushed 0x60 bytes on the stack
str R1, [SP, #0x34] @ Store it in EFI_SYSTEM_CONTEXT_ARM.SP str R1, [SP, #0x34] @ Store it in EFI_SYSTEM_CONTEXT_ARM.SP
@ R0 is ExceptionType @ R0 is ExceptionType
mov R1,SP @ R1 is SystemContext mov R1,SP @ R1 is SystemContext
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpush {d0-d15} @ save vstm registers in case they are used in optimizations vpush {d0-d15} @ save vstm registers in case they are used in optimizations
@ -256,7 +256,7 @@ NoAdjustNeeded:
tst R4, #4 tst R4, #4
subne SP, SP, #4 @ Adjust SP if not 8-byte aligned subne SP, SP, #4 @ Adjust SP if not 8-byte aligned
/* /*
VOID VOID
EFIAPI EFIAPI
CommonCExceptionHandler ( CommonCExceptionHandler (
@ -264,13 +264,13 @@ CommonCExceptionHandler (
IN OUT EFI_SYSTEM_CONTEXT SystemContext R1 IN OUT EFI_SYSTEM_CONTEXT SystemContext R1
) )
*/ */
blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler
mov SP, R4 @ Restore SP mov SP, R4 @ Restore SP
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpop {d0-d15} vpop {d0-d15}
#endif #endif
ldr R1, [SP, #0x4c] @ Restore EFI_SYSTEM_CONTEXT_ARM.IFSR 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 ldr R1, [SP, #0x44] @ Restore EFI_SYSTEM_CONTEXT_ARM.DFSR
mcr p15, 0, R1, c5, c0, 0 @ Write DFSR mcr p15, 0, R1, c5, c0, 0 @ Write DFSR
ldr R1,[SP,#0x3c] @ EFI_SYSTEM_CONTEXT_ARM.PC 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 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 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 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 and R1, R1, #0x1f @ Check to see if User or System Mode
cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R1, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 @ cmpne R1, #0x10 @
ldmeqed R2, {lr}^ @ restore unbanked lr ldmeqed R2, {lr}^ @ restore unbanked lr
@ else @ else
ldmneed R3, {lr} @ restore SVC lr, via ldmfd SP!, {LR} ldmneed R3, {lr} @ restore SVC lr, via ldmfd SP!, {LR}
ldmfd SP!,{R0-R12} @ Restore general purpose registers ldmfd SP!,{R0-R12} @ Restore general purpose registers
@ Exception handler can not change SP @ Exception handler can not change SP
add SP,SP,#0x20 @ Clear out the remaining stack space add SP,SP,#0x20 @ Clear out the remaining stack space
ldmfd SP!,{LR} @ restore the link register for this context ldmfd SP!,{LR} @ restore the link register for this context
rfefd SP! @ return from exception via srsfd stack slot rfefd SP! @ return from exception via srsfd stack slot

78
ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Use ARMv6 instruction to operate on a single stack // 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) This is the stack constructed by the exception handler (low address to high address)
# R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM # R0 - IFAR is EFI_SYSTEM_CONTEXT for ARM
Reg Offset Reg Offset
=== ====== === ======
R0 0x00 # stmfd SP!,{R0-R12} R0 0x00 # stmfd SP!,{R0-R12}
R1 0x04 R1 0x04
R2 0x08 R2 0x08
@ -44,15 +44,15 @@ This is the stack constructed by the exception handler (low address to high addr
DFAR 0x48 DFAR 0x48
IFSR 0x4c IFSR 0x4c
IFAR 0x50 IFAR 0x50
LR 0x54 # SVC Link register (we need to restore it) LR 0x54 # SVC Link register (we need to restore it)
LR 0x58 # pushed by srsfd LR 0x58 # pushed by srsfd
CPSR 0x5c CPSR 0x5c
*/ */
EXPORT ExceptionHandlersStart EXPORT ExceptionHandlersStart
EXPORT ExceptionHandlersEnd EXPORT ExceptionHandlersEnd
EXPORT CommonExceptionEntry EXPORT CommonExceptionEntry
@ -61,7 +61,7 @@ This is the stack constructed by the exception handler (low address to high addr
PRESERVE8 PRESERVE8
AREA DxeExceptionHandlers, CODE, READONLY, CODEALIGN, ALIGN=5 AREA DxeExceptionHandlers, CODE, READONLY, CODEALIGN, ALIGN=5
// //
// This code gets copied to the ARM vector table // This code gets copied to the ARM vector table
// ExceptionHandlersStart - ExceptionHandlersEnd gets copied // ExceptionHandlersStart - ExceptionHandlersEnd gets copied
@ -98,7 +98,7 @@ ResetEntry
stmfd SP!,{LR} ; Store the link register for the current mode stmfd SP!,{LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state stmfd SP!,{R0-R12} ; Store the register state
mov R0,#0 ; ExceptionType mov R0,#0 ; ExceptionType
ldr R1,CommonExceptionEntry ldr R1,CommonExceptionEntry
bx R1 bx R1
@ -112,7 +112,7 @@ UndefinedInstructionEntry
stmfd SP!,{R0-R12} ; Store the register state stmfd SP!,{R0-R12} ; Store the register state
mov R0,#1 ; ExceptionType mov R0,#1 ; ExceptionType
ldr R1,CommonExceptionEntry; ldr R1,CommonExceptionEntry;
bx R1 bx R1
SoftwareInterruptEntry SoftwareInterruptEntry
@ -195,53 +195,53 @@ CommonExceptionEntry
ExceptionHandlersEnd 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. // CommonExceptionEntry.
// //
AsmCommonExceptionEntry AsmCommonExceptionEntry
mrc p15, 0, R1, c6, c0, 2 ; Read IFAR 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 mrc p15, 0, R1, c5, c0, 1 ; Read IFSR
str R1, [SP, #0x4c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR str R1, [SP, #0x4c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.IFSR
mrc p15, 0, R1, c6, c0, 0 ; Read DFAR mrc p15, 0, R1, c6, c0, 0 ; Read DFAR
str R1, [SP, #0x48] ; Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR str R1, [SP, #0x48] ; Store it in EFI_SYSTEM_CONTEXT_ARM.DFAR
mrc p15, 0, R1, c5, c0, 0 ; Read DFSR mrc p15, 0, R1, c5, c0, 0 ; Read DFSR
str R1, [SP, #0x44] ; Store it in EFI_SYSTEM_CONTEXT_ARM.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 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 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 and R3, R1, #0x1f ; Check CPSR to see if User or System Mode
cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 ; cmpne R3, #0x10 ;
stmeqed R2, {lr}^ ; save unbanked lr stmeqed R2, {lr}^ ; save unbanked lr
; else ; else
stmneed R2, {lr} ; save SVC lr 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 ; Check to see if we have to adjust for Thumb entry
sub r4, r0, #1 ; if (ExceptionType == 1 || ExceptionType == 2)) { 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 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; addne R5, R5, #2 ; PC += 2;
strne R5,[SP,#0x58] ; Update LR value pushed by srsfd strne R5,[SP,#0x58] ; Update LR value pushed by srsfd
NoAdjustNeeded NoAdjustNeeded
str R5, [SP, #0x3c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.PC str R5, [SP, #0x3c] ; Store it in EFI_SYSTEM_CONTEXT_ARM.PC
add R1, SP, #0x60 ; We pushed 0x60 bytes on the stack add R1, SP, #0x60 ; We pushed 0x60 bytes on the stack
str R1, [SP, #0x34] ; Store it in EFI_SYSTEM_CONTEXT_ARM.SP str R1, [SP, #0x34] ; Store it in EFI_SYSTEM_CONTEXT_ARM.SP
; R0 is ExceptionType ; R0 is ExceptionType
mov R1,SP ; R1 is SystemContext mov R1,SP ; R1 is SystemContext
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpush {d0-d15} ; save vstm registers in case they are used in optimizations vpush {d0-d15} ; save vstm registers in case they are used in optimizations
@ -251,7 +251,7 @@ NoAdjustNeeded
tst R4, #4 tst R4, #4
subne SP, SP, #4 ; Adjust SP if not 8-byte aligned subne SP, SP, #4 ; Adjust SP if not 8-byte aligned
/* /*
VOID VOID
EFIAPI EFIAPI
CommonCExceptionHandler ( CommonCExceptionHandler (
@ -267,35 +267,35 @@ CommonCExceptionHandler (
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpop {d0-d15} vpop {d0-d15}
#endif #endif
ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR
mcr p15, 0, R1, c5, c0, 1 ; Write IFSR mcr p15, 0, R1, c5, c0, 1 ; Write IFSR
ldr R1, [SP, #0x44] ; Restore EFI_SYSTEM_CONTEXT_ARM.DFSR ldr R1, [SP, #0x44] ; Restore EFI_SYSTEM_CONTEXT_ARM.DFSR
mcr p15, 0, R1, c5, c0, 0 ; Write DFSR mcr p15, 0, R1, c5, c0, 0 ; Write DFSR
ldr R1,[SP,#0x3c] ; EFI_SYSTEM_CONTEXT_ARM.PC 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 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 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 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 and R1, R1, #0x1f ; Check to see if User or System Mode
cmp R1, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f)) cmp R1, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 ; cmpne R1, #0x10 ;
ldmeqed R2, {lr}^ ; restore unbanked lr ldmeqed R2, {lr}^ ; restore unbanked lr
; else ; else
ldmneed R3, {lr} ; restore SVC lr, via ldmfd SP!, {LR} ldmneed R3, {lr} ; restore SVC lr, via ldmfd SP!, {LR}
ldmfd SP!,{R0-R12} ; Restore general purpose registers ldmfd SP!,{R0-R12} ; Restore general purpose registers
; Exception handler can not change SP ; Exception handler can not change SP
add SP,SP,#0x20 ; Clear out the remaining stack space add SP,SP,#0x20 ; Clear out the remaining stack space
ldmfd SP!,{LR} ; restore the link register for this context ldmfd SP!,{LR} ; restore the link register for this context
rfefd SP! ; return from exception via srsfd stack slot rfefd SP! ; return from exception via srsfd stack slot
END END

32
ArmPkg/Drivers/CpuDxe/ArmV6/Mmu.c
View File

@ -24,7 +24,7 @@ typedef UINT32 ARM_FIRST_LEVEL_DESCRIPTOR;
// Second Level Descriptors // Second Level Descriptors
typedef UINT32 ARM_PAGE_TABLE_ENTRY; typedef UINT32 ARM_PAGE_TABLE_ENTRY;
EFI_STATUS EFI_STATUS
SectionToGcdAttributes ( SectionToGcdAttributes (
IN UINT32 SectionAttributes, IN UINT32 SectionAttributes,
OUT UINT64 *GcdAttributes OUT UINT64 *GcdAttributes
@ -418,12 +418,12 @@ UpdatePageEntries (
// Calculate number of 4KB page table entries to change // Calculate number of 4KB page table entries to change
NumPageEntries = Length / TT_DESCRIPTOR_PAGE_SIZE; NumPageEntries = Length / TT_DESCRIPTOR_PAGE_SIZE;
// Iterate for the number of 4KB pages to change // Iterate for the number of 4KB pages to change
Offset = 0; Offset = 0;
for(p = 0; p < NumPageEntries; p++) { for(p = 0; p < NumPageEntries; p++) {
// Calculate index into first level translation table for page table value // Calculate index into first level translation table for page table value
FirstLevelIdx = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(BaseAddress + Offset) >> TT_DESCRIPTOR_SECTION_BASE_SHIFT; FirstLevelIdx = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(BaseAddress + Offset) >> TT_DESCRIPTOR_SECTION_BASE_SHIFT;
ASSERT (FirstLevelIdx < TRANSLATION_TABLE_SECTION_COUNT); ASSERT (FirstLevelIdx < TRANSLATION_TABLE_SECTION_COUNT);
@ -435,9 +435,9 @@ UpdatePageEntries (
Status = ConvertSectionToPages (FirstLevelIdx << TT_DESCRIPTOR_SECTION_BASE_SHIFT); Status = ConvertSectionToPages (FirstLevelIdx << TT_DESCRIPTOR_SECTION_BASE_SHIFT);
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
// Exit for loop // Exit for loop
break; break;
} }
// Re-read descriptor // Re-read descriptor
Descriptor = FirstLevelTable[FirstLevelIdx]; Descriptor = FirstLevelTable[FirstLevelIdx];
} }
@ -462,7 +462,7 @@ UpdatePageEntries (
// Make this virtual address point at a physical page // Make this virtual address point at a physical page
PageTableEntry &= ~VirtualMask; PageTableEntry &= ~VirtualMask;
} }
if (CurrentPageTableEntry != PageTableEntry) { if (CurrentPageTableEntry != PageTableEntry) {
Mva = (VOID *)(UINTN)((((UINTN)FirstLevelIdx) << TT_DESCRIPTOR_SECTION_BASE_SHIFT) + (PageTableIndex << TT_DESCRIPTOR_PAGE_BASE_SHIFT)); 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) { if ((CurrentPageTableEntry & TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) == TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) {
@ -471,14 +471,14 @@ UpdatePageEntries (
WriteBackInvalidateDataCacheRange (Mva, TT_DESCRIPTOR_PAGE_SIZE); WriteBackInvalidateDataCacheRange (Mva, TT_DESCRIPTOR_PAGE_SIZE);
} }
// Only need to update if we are changing the entry // Only need to update if we are changing the entry
PageTable[PageTableIndex] = PageTableEntry; PageTable[PageTableIndex] = PageTableEntry;
ArmUpdateTranslationTableEntry ((VOID *)&PageTable[PageTableIndex], Mva); ArmUpdateTranslationTableEntry ((VOID *)&PageTable[PageTableIndex], Mva);
} }
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
Offset += TT_DESCRIPTOR_PAGE_SIZE; Offset += TT_DESCRIPTOR_PAGE_SIZE;
} // End first level translation table loop } // End first level translation table loop
return Status; return Status;
@ -508,7 +508,7 @@ UpdateSectionEntries (
// EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone) // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone)
// EntryValue: values at bit positions specified by EntryMask // 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; EntryMask = TT_DESCRIPTOR_SECTION_TYPE_MASK;
EntryValue = TT_DESCRIPTOR_SECTION_TYPE_SECTION; EntryValue = TT_DESCRIPTOR_SECTION_TYPE_SECTION;
@ -567,7 +567,7 @@ UpdateSectionEntries (
// calculate number of 1MB first level entries this applies to // calculate number of 1MB first level entries this applies to
NumSections = Length / TT_DESCRIPTOR_SECTION_SIZE; NumSections = Length / TT_DESCRIPTOR_SECTION_SIZE;
// iterate through each descriptor // iterate through each descriptor
for(i=0; i<NumSections; i++) { for(i=0; i<NumSections; i++) {
CurrentDescriptor = FirstLevelTable[FirstLevelIdx + i]; CurrentDescriptor = FirstLevelTable[FirstLevelIdx + i];
@ -578,7 +578,7 @@ UpdateSectionEntries (
Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes, VirtualMask); Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes, VirtualMask);
} else { } else {
// still a section entry // still a section entry
// mask off appropriate fields // mask off appropriate fields
Descriptor = CurrentDescriptor & ~EntryMask; Descriptor = CurrentDescriptor & ~EntryMask;
@ -596,7 +596,7 @@ UpdateSectionEntries (
WriteBackInvalidateDataCacheRange (Mva, SIZE_1MB); WriteBackInvalidateDataCacheRange (Mva, SIZE_1MB);
} }
// Only need to update if we are changing the descriptor // Only need to update if we are changing the descriptor
FirstLevelTable[FirstLevelIdx + i] = Descriptor; FirstLevelTable[FirstLevelIdx + i] = Descriptor;
ArmUpdateTranslationTableEntry ((VOID *)&FirstLevelTable[FirstLevelIdx + i], Mva); ArmUpdateTranslationTableEntry ((VOID *)&FirstLevelTable[FirstLevelIdx + i], Mva);
} }
@ -608,7 +608,7 @@ UpdateSectionEntries (
return Status; return Status;
} }
EFI_STATUS EFI_STATUS
ConvertSectionToPages ( ConvertSectionToPages (
IN EFI_PHYSICAL_ADDRESS BaseAddress IN EFI_PHYSICAL_ADDRESS BaseAddress
) )
@ -673,7 +673,7 @@ SetMemoryAttributes (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
if(((BaseAddress & 0xFFFFF) == 0) && ((Length & 0xFFFFF) == 0)) { if(((BaseAddress & 0xFFFFF) == 0) && ((Length & 0xFFFFF) == 0)) {
// Is the base and length a multiple of 1 MB? // Is the base and length a multiple of 1 MB?
DEBUG ((EFI_D_PAGE, "SetMemoryAttributes(): MMU section 0x%x length 0x%x to %lx\n", (UINTN)BaseAddress, (UINTN)Length, Attributes)); DEBUG ((EFI_D_PAGE, "SetMemoryAttributes(): MMU section 0x%x length 0x%x to %lx\n", (UINTN)BaseAddress, (UINTN)Length, Attributes));

46
ArmPkg/Drivers/CpuDxe/CpuDxe.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011, ARM Limited. All rights reserved. Copyright (c) 2011, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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 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 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 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, 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 then the bytes past Start+Length to the end of the next cache line boundary
are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be are also flushed. The FlushType of EfiCpuFlushTypeWriteBackInvalidate must be
supported. If the data cache is fully coherent with all DMA operations, then 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 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. flushing a range of the data cache, then the entire data cache can be flushed.
@param This The EFI_CPU_ARCH_PROTOCOL instance. @param This The EFI_CPU_ARCH_PROTOCOL instance.
@ -70,13 +70,13 @@ CpuFlushCpuDataCache (
default: default:
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
return EFI_SUCCESS; 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. @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 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 State. If interrupts are currently enabled, then TRUE is returned. If interrupts
are currently disabled, then FALSE is returned. are currently disabled, then FALSE is returned.
@param This The EFI_CPU_ARCH_PROTOCOL instance. @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 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 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 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 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. occurs attempting to generate an INIT, then EFI_DEVICE_ERROR is returned.
@param This The EFI_CPU_ARCH_PROTOCOL instance. @param This The EFI_CPU_ARCH_PROTOCOL instance.
@ -199,7 +199,7 @@ CpuGetTimerValue (
/** /**
Callback function for idle events. Callback function for idle events.
@param Event Event whose notification function is being invoked. @param Event Event whose notification function is being invoked.
@param Context The pointer to the notification function's context, @param Context The pointer to the notification function's context,
which is implementation-dependent. which is implementation-dependent.
@ -241,22 +241,22 @@ CpuDxeInitialize (
EFI_STATUS Status; EFI_STATUS Status;
EFI_EVENT IdleLoopEvent; EFI_EVENT IdleLoopEvent;
InitializeExceptions (&mCpu); InitializeExceptions (&mCpu);
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&mCpuHandle, &mCpuHandle,
&gEfiCpuArchProtocolGuid, &mCpu, &gEfiCpuArchProtocolGuid, &mCpu,
&gVirtualUncachedPagesProtocolGuid, &gVirtualUncachedPages, &gVirtualUncachedPagesProtocolGuid, &gVirtualUncachedPages,
NULL NULL
); );
// //
// Make sure GCD and MMU settings match. This API calls gDS->SetMemorySpaceAttributes () // 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 // and that calls EFI_CPU_ARCH_PROTOCOL.SetMemoryAttributes, so this code needs to go
// after the protocol is installed // after the protocol is installed
// //
SyncCacheConfig (&mCpu); SyncCacheConfig (&mCpu);
// If the platform is a MPCore system then install the Configuration Table describing the // If the platform is a MPCore system then install the Configuration Table describing the
// secondary core states // secondary core states
if (ArmIsMpCore()) { if (ArmIsMpCore()) {

14
ArmPkg/Drivers/CpuDxe/CpuDxe.h
View File

@ -48,9 +48,9 @@
/** /**
This function registers and enables the handler specified by InterruptHandler for a processor 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 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. 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. 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 @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 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 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. 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. 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 @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 IN EFI_CPU_ARCH_PROTOCOL *CpuProtocol
); );
EFI_STATUS EFI_STATUS
ConvertSectionToPages ( ConvertSectionToPages (
IN EFI_PHYSICAL_ADDRESS BaseAddress IN EFI_PHYSICAL_ADDRESS BaseAddress
); );

10
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
View File

@ -1,7 +1,7 @@
#/** @file #/** @file
# #
# DXE CPU driver # DXE CPU driver
# #
# Copyright (c) 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011-2013, ARM Limited. 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 # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
[Defines] [Defines]
@ -83,7 +83,7 @@
[Pcd.common] [Pcd.common]
gArmTokenSpaceGuid.PcdVFPEnabled gArmTokenSpaceGuid.PcdVFPEnabled
gArmTokenSpaceGuid.PcdCpuVectorBaseAddress gArmTokenSpaceGuid.PcdCpuVectorBaseAddress
[FeaturePcd.common] [FeaturePcd.common]
gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport
gArmTokenSpaceGuid.PcdRelocateVectorTable gArmTokenSpaceGuid.PcdRelocateVectorTable

18
ArmPkg/Drivers/CpuPei/CpuPei.c
View File

@ -4,18 +4,18 @@ Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2011 Hewlett Packard Corporation. All rights reserved.<BR> Copyright (c) 2011 Hewlett Packard Corporation. All rights reserved.<BR>
Copyright (c) 2011-2013, ARM Limited. All rights reserved.<BR> Copyright (c) 2011-2013, ARM Limited. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: Module Name:
MemoryInit.c MemoryInit.c
Abstract: Abstract:
PEIM to provide fake memory init PEIM to provide fake memory init
@ -51,7 +51,7 @@ Arguments:
FileHandle - Handle of the file being invoked. FileHandle - Handle of the file being invoked.
PeiServices - Describes the list of possible PEI Services. PeiServices - Describes the list of possible PEI Services.
Returns: Returns:
Status - EFI_SUCCESS if the boot mode could be set Status - EFI_SUCCESS if the boot mode could be set

4
ArmPkg/Drivers/CpuPei/CpuPei.inf
View File

@ -45,7 +45,7 @@
[Ppis] [Ppis]
gArmMpCoreInfoPpiGuid gArmMpCoreInfoPpiGuid
[Guids] [Guids]
gArmMpCoreInfoGuid gArmMpCoreInfoGuid
@ -55,4 +55,4 @@
[Depex] [Depex]
gEfiPeiMemoryDiscoveredPpiGuid gEfiPeiMemoryDiscoveredPpiGuid

62
ArmPkg/Drivers/TimerDxe/TimerDxe.c
View File

@ -40,16 +40,16 @@ UINT64 mTimerPeriod = 0;
EFI_HARDWARE_INTERRUPT_PROTOCOL *gInterrupt = NULL; EFI_HARDWARE_INTERRUPT_PROTOCOL *gInterrupt = NULL;
/** /**
This function registers the handler NotifyFunction so it is called every time 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 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 call to the NotifyFunction. If NotifyFunction is NULL, then the
handler is unregistered. If the handler is registered, then EFI_SUCCESS is handler is unregistered. If the handler is registered, then EFI_SUCCESS is
returned. If the CPU does not support registering a timer interrupt handler, 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 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. 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, 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 then EFI_INVALID_PARAMETER is returned. If an error occurs attempting to
register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR
is returned. is returned.
@param This The EFI_TIMER_ARCH_PROTOCOL instance. @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 This function adjusts the period of timer interrupts to the value specified
by TimerPeriod. If the timer period is updated, then the selected timer 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 period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned. If
the timer hardware is not programmable, then EFI_UNSUPPORTED is returned. the timer hardware is not programmable, then EFI_UNSUPPORTED is returned.
If an error occurs while attempting to update the timer period, then the 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 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 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. 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 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 controller so that a CPU interrupt is not generated when the timer
interrupt fires. interrupt fires.
@param This The EFI_TIMER_ARCH_PROTOCOL instance. @param This The EFI_TIMER_ARCH_PROTOCOL instance.
@param TimerPeriod The rate to program the timer interrupt in 100 nS units. If @param TimerPeriod The rate to program the timer interrupt in 100 nS units. If
@ -136,7 +136,7 @@ TimerDriverSetTimerPeriod (
) )
{ {
UINT64 TimerTicks; UINT64 TimerTicks;
// Always disable the timer // Always disable the timer
ArmArchTimerDisableTimer (); ArmArchTimerDisableTimer ();
@ -158,9 +158,9 @@ TimerDriverSetTimerPeriod (
} }
/** /**
This function retrieves the period of timer interrupts in 100 ns units, This function retrieves the period of timer interrupts in 100 ns units,
returns that value in TimerPeriod, and returns EFI_SUCCESS. If TimerPeriod 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 is NULL, then EFI_INVALID_PARAMETER is returned. If a TimerPeriod of 0 is
returned, then the timer is currently disabled. returned, then the timer is currently disabled.
@param This The EFI_TIMER_ARCH_PROTOCOL instance. @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 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. 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() 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 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 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 registered handler should not be able to distinguish a hardware-generated timer
interrupt from a software-generated timer interrupt. interrupt from a software-generated timer interrupt.
@param This The EFI_TIMER_ARCH_PROTOCOL instance. @param This The EFI_TIMER_ARCH_PROTOCOL instance.

19
ArmPkg/Drivers/TimerDxe/TimerDxe.inf
View File

@ -1,22 +1,22 @@
#/** @file #/** @file
# #
# Component description file for Timer DXE module # Component description file for Timer DXE module
# #
# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmTimerDxe BASE_NAME = ArmTimerDxe
FILE_GUID = 49ea041e-6752-42ca-b0b1-7344fe2546b7 FILE_GUID = 49ea041e-6752-42ca-b0b1-7344fe2546b7
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
@ -40,20 +40,19 @@
BaseMemoryLib BaseMemoryLib
DebugLib DebugLib
UefiDriverEntryPoint UefiDriverEntryPoint
IoLib IoLib
[Guids] [Guids]
[Protocols] [Protocols]
gEfiTimerArchProtocolGuid gEfiTimerArchProtocolGuid
gHardwareInterruptProtocolGuid gHardwareInterruptProtocolGuid
[Pcd.common] [Pcd.common]
gEmbeddedTokenSpaceGuid.PcdTimerPeriod gEmbeddedTokenSpaceGuid.PcdTimerPeriod
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum
gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerIntrNum
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz
[Depex] [Depex]
gHardwareInterruptProtocolGuid gHardwareInterruptProtocolGuid

34
ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
View File

@ -21,7 +21,7 @@
#include <Guid/FileSystemVolumeLabelInfo.h> #include <Guid/FileSystemVolumeLabelInfo.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/SemihostLib.h> #include <Library/SemihostLib.h>
@ -129,7 +129,7 @@ VolumeOpen (
) )
{ {
SEMIHOST_FCB *RootFcb = NULL; SEMIHOST_FCB *RootFcb = NULL;
if (Root == NULL) { if (Root == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -138,7 +138,7 @@ VolumeOpen (
if (RootFcb == NULL) { if (RootFcb == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
RootFcb->IsRoot = TRUE; RootFcb->IsRoot = TRUE;
RootFcb->Info.Attribute = EFI_FILE_READ_ONLY | EFI_FILE_DIRECTORY; RootFcb->Info.Attribute = EFI_FILE_READ_ONLY | EFI_FILE_DIRECTORY;
@ -212,7 +212,7 @@ FileOpen (
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
return Status; return Status;
} }
IsRoot = FALSE; IsRoot = FALSE;
} }
@ -267,7 +267,7 @@ FileClose (
FreeFCB (Fcb); FreeFCB (Fcb);
} }
} }
return Status; return Status;
} }
@ -357,7 +357,7 @@ FileWrite (
*BufferSize -= WriteSize; *BufferSize -= WriteSize;
Fcb->Position += *BufferSize; Fcb->Position += *BufferSize;
} }
return Status; return Status;
} }
@ -368,7 +368,7 @@ FileGetPosition (
) )
{ {
SEMIHOST_FCB *Fcb = NULL; SEMIHOST_FCB *Fcb = NULL;
if (Position == NULL) { if (Position == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -447,11 +447,11 @@ GetFileInfo (
Info->FileName[0] = L'\0'; Info->FileName[0] = L'\0';
} else { } else {
for (Index = 0; Index < NameSize; Index++) { 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; return EFI_SUCCESS;
} }
@ -467,11 +467,11 @@ GetFilesystemInfo (
EFI_FILE_SYSTEM_INFO *Info = NULL; EFI_FILE_SYSTEM_INFO *Info = NULL;
EFI_STATUS Status; EFI_STATUS Status;
UINTN ResultSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (mSemihostFsLabel); UINTN ResultSize = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize (mSemihostFsLabel);
if (*BufferSize >= ResultSize) { if (*BufferSize >= ResultSize) {
ZeroMem (Buffer, ResultSize); ZeroMem (Buffer, ResultSize);
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
Info = Buffer; Info = Buffer;
Info->Size = ResultSize; Info->Size = ResultSize;
@ -485,7 +485,7 @@ GetFilesystemInfo (
Status = EFI_BUFFER_TOO_SMALL; Status = EFI_BUFFER_TOO_SMALL;
} }
*BufferSize = ResultSize; *BufferSize = ResultSize;
return Status; return Status;
} }
@ -500,9 +500,9 @@ FileGetInfo (
SEMIHOST_FCB *Fcb; SEMIHOST_FCB *Fcb;
EFI_STATUS Status; EFI_STATUS Status;
UINTN ResultSize; UINTN ResultSize;
Fcb = SEMIHOST_FCB_FROM_THIS(File); Fcb = SEMIHOST_FCB_FROM_THIS(File);
if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) != 0) { if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) != 0) {
Status = GetFilesystemInfo (Fcb, BufferSize, Buffer); Status = GetFilesystemInfo (Fcb, BufferSize, Buffer);
} else if (CompareGuid (InformationType, &gEfiFileInfoGuid) != 0) { } else if (CompareGuid (InformationType, &gEfiFileInfoGuid) != 0) {
@ -596,8 +596,8 @@ SemihostFsEntryPoint (
} }
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&gInstallHandle, &gInstallHandle,
&gEfiSimpleFileSystemProtocolGuid, &gSemihostFs, &gEfiSimpleFileSystemProtocolGuid, &gSemihostFs,
&gEfiDevicePathProtocolGuid, &gDevicePath, &gEfiDevicePathProtocolGuid, &gDevicePath,
NULL NULL
); );
@ -606,6 +606,6 @@ SemihostFsEntryPoint (
FreePool (mSemihostFsLabel); FreePool (mSemihostFsLabel);
} }
} }
return Status; return Status;
} }

16
ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
View File

@ -4,13 +4,13 @@
# Copyright (c) 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
# Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved. # Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
@ -25,7 +25,7 @@
[Sources.ARM, Sources.AARCH64] [Sources.ARM, Sources.AARCH64]
Arm/SemihostFs.c Arm/SemihostFs.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec
@ -45,4 +45,4 @@
[Protocols] [Protocols]
gEfiSimpleFileSystemProtocolGuid gEfiSimpleFileSystemProtocolGuid
gEfiDevicePathProtocolGuid gEfiDevicePathProtocolGuid

8
ArmPkg/Include/AsmMacroIoLib.h
View File

@ -159,7 +159,7 @@ _InitializePrimaryStackEnd:
ldr r1, =Address ; \ ldr r1, =Address ; \
ldr r0, =Data ; \ ldr r0, =Data ; \
str r0, [r1] str r0, [r1]
#define MmioOr32(Address, OrData) \ #define MmioOr32(Address, OrData) \
ldr r1, =Address ; \ ldr r1, =Address ; \
ldr r2, =OrData ; \ ldr r2, =OrData ; \
@ -181,7 +181,7 @@ _InitializePrimaryStackEnd:
and r0, r0, r2 ; \ and r0, r0, r2 ; \
ldr r2, =OrData ; \ ldr r2, =OrData ; \
orr r0, r0, r2 ; \ orr r0, r0, r2 ; \
str r0, [r1] str r0, [r1]
#define MmioWriteFromReg32(Address, Reg) \ #define MmioWriteFromReg32(Address, Reg) \
ldr r1, =Address ; \ ldr r1, =Address ; \
@ -235,7 +235,7 @@ _InitializePrimaryStackEnd:
#else #else
// //
// Use ARM assembly macros, form armasam // Use ARM assembly macros, form armasam
// //
// Less magic in the macros if ldr reg, =expr works // 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 // returns Data in R0 and Address in R1, and OrData in r2
#define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData #define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData
// returns _Data in R0 and _Address in R1, and _OrData in r2 // returns _Data in R0 and _Address in R1, and _OrData in r2

114
ArmPkg/Include/AsmMacroIoLib.inc
View File

@ -5,81 +5,81 @@
; Copyright (c) 2009, Apple Inc. All rights reserved.<BR> ; Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
; Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR> ; Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
; ;
; This program and the accompanying materials ; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License ; 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 ; which accompanies this distribution. The full text of the license may be found at
; http://opensource.org/licenses/bsd-license.php ; http://opensource.org/licenses/bsd-license.php
; ;
; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, ; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
; ;
;**/ ;**/
MACRO MACRO
MmioWrite32Macro $Address, $Data MmioWrite32Macro $Address, $Data
ldr r1, = ($Address) ldr r1, = ($Address)
ldr r0, = ($Data) ldr r0, = ($Data)
str r0, [r1] str r0, [r1]
MEND
MACRO
MmioOr32Macro $Address, $OrData
ldr r1, =($Address)
ldr r2, =($OrData)
ldr r0, [r1]
orr r0, r0, r2
str r0, [r1]
MEND MEND
MACRO MACRO
MmioAnd32Macro $Address, $AndData MmioOr32Macro $Address, $OrData
ldr r1, =($Address) ldr r1, =($Address)
ldr r2, =($AndData) ldr r2, =($OrData)
ldr r0, [r1] ldr r0, [r1]
and r0, r0, r2 orr r0, r0, r2
str r0, [r1] str r0, [r1]
MEND MEND
MACRO MACRO
MmioAndThenOr32Macro $Address, $AndData, $OrData MmioAnd32Macro $Address, $AndData
ldr r1, =($Address) ldr r1, =($Address)
ldr r0, [r1] ldr r2, =($AndData)
ldr r2, =($AndData) ldr r0, [r1]
and r0, r0, r2 and r0, r0, r2
ldr r2, =($OrData) str r0, [r1]
orr r0, r0, r2
str r0, [r1]
MEND MEND
MACRO MACRO
MmioWriteFromReg32Macro $Address, $Reg MmioAndThenOr32Macro $Address, $AndData, $OrData
ldr r1, =($Address) ldr r1, =($Address)
str $Reg, [r1] ldr r0, [r1]
ldr r2, =($AndData)
and r0, r0, r2
ldr r2, =($OrData)
orr r0, r0, r2
str r0, [r1]
MEND MEND
MACRO MACRO
MmioRead32Macro $Address MmioWriteFromReg32Macro $Address, $Reg
ldr r1, =($Address) ldr r1, =($Address)
ldr r0, [r1] str $Reg, [r1]
MEND MEND
MACRO MACRO
MmioReadToReg32Macro $Address, $Reg MmioRead32Macro $Address
ldr r1, =($Address) ldr r1, =($Address)
ldr $Reg, [r1] ldr r0, [r1]
MEND MEND
MACRO MACRO
LoadConstantMacro $Data MmioReadToReg32Macro $Address, $Reg
ldr r0, =($Data) ldr r1, =($Address)
ldr $Reg, [r1]
MEND
MACRO
LoadConstantMacro $Data
ldr r0, =($Data)
MEND
MACRO
LoadConstantToRegMacro $Data, $Reg
ldr $Reg, =($Data)
MEND 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 ; The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack
; Note: Global Size will be modified ; Note: Global Size will be modified
MACRO MACRO

2
ArmPkg/Include/Chipset/ARM926EJ-S.h
View File

@ -58,7 +58,7 @@
#define TT_DESCRIPTOR_SECTION_WRITE_BACK (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \ #define TT_DESCRIPTOR_SECTION_WRITE_BACK (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \
TT_DESCRIPTOR_SECTION_DOMAIN(0) | \ TT_DESCRIPTOR_SECTION_DOMAIN(0) | \
TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK | \ 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 | \ #define TT_DESCRIPTOR_SECTION_WRITE_THROUGH (TT_DESCRIPTOR_SECTION_ACCESS_PERMISSION_READ_WRITE | \
TT_DESCRIPTOR_SECTION_DOMAIN(0) | \ TT_DESCRIPTOR_SECTION_DOMAIN(0) | \
TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH | \ TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH | \

14
ArmPkg/Include/Chipset/ArmArchTimer.h
View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Copyright (c) 2011-2013, ARM Limited. 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, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * 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.
* *
**/ **/

2
ArmPkg/Include/Chipset/ArmV7.h
View File

@ -94,7 +94,7 @@ ArmEnableSWPInstruction (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmReadCbar ( ArmReadCbar (
VOID VOID

14
ArmPkg/Include/Chipset/ArmV7Mmu.h
View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Copyright (c) 2011-2013, ARM Limited. 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, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * 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.
* *
**/ **/

14
ArmPkg/Include/Guid/ArmMpCoreInfo.h
View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Copyright (c) 2011, ARM Limited. All rights reserved. * 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, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * 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.
* *
**/ **/

20
ArmPkg/Include/Library/ArmDisassemblerLib.h
View File

@ -16,19 +16,19 @@
#define __ARM_DISASSEBLER_LIB_H__ #define __ARM_DISASSEBLER_LIB_H__
/** /**
Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to
point to next instructin. point to next instructin.
We cheat and only decode instructions that access We cheat and only decode instructions that access
memory. If the instruction is not found we dump the instruction in hex. 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 Thumb TRUE for Thumb(2), FALSE for ARM instruction stream
@param Extended TRUE dump hex for instruction too. @param Extended TRUE dump hex for instruction too.
@param ItBlock Size of IT Block @param ItBlock Size of IT Block
@param Buf Buffer to sprintf disassembly into. @param Buf Buffer to sprintf disassembly into.
@param Size Size of Buf in bytes. @param Size Size of Buf in bytes.
**/ **/
VOID VOID
DisassembleInstruction ( DisassembleInstruction (
@ -39,5 +39,5 @@ DisassembleInstruction (
OUT CHAR8 *Buf, OUT CHAR8 *Buf,
OUT UINTN Size OUT UINTN Size
); );
#endif #endif

30
ArmPkg/Include/Library/ArmLib.h
View File

@ -148,43 +148,43 @@ EFIAPI
ArmDataCachePresent ( ArmDataCachePresent (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheSize ( ArmDataCacheSize (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheAssociativity ( ArmDataCacheAssociativity (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheLineLength ( ArmDataCacheLineLength (
VOID VOID
); );
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmInstructionCachePresent ( ArmInstructionCachePresent (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheSize ( ArmInstructionCacheSize (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheAssociativity ( ArmInstructionCacheAssociativity (
VOID VOID
); );
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheLineLength ( ArmInstructionCacheLineLength (
@ -311,7 +311,7 @@ EFIAPI
ArmDisableInstructionCache ( ArmDisableInstructionCache (
VOID VOID
); );
VOID VOID
EFIAPI EFIAPI
ArmEnableMmu ( ArmEnableMmu (
@ -395,7 +395,7 @@ EFIAPI
ArmDisableFiq ( ArmDisableFiq (
VOID VOID
); );
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmGetFiqState ( ArmGetFiqState (
@ -407,14 +407,14 @@ EFIAPI
ArmInvalidateTlb ( ArmInvalidateTlb (
VOID VOID
); );
VOID VOID
EFIAPI EFIAPI
ArmUpdateTranslationTableEntry ( ArmUpdateTranslationTableEntry (
IN VOID *TranslationTableEntry, IN VOID *TranslationTableEntry,
IN VOID *Mva IN VOID *Mva
); );
VOID VOID
EFIAPI EFIAPI
ArmSetDomainAccessControl ( ArmSetDomainAccessControl (
@ -440,13 +440,13 @@ ArmConfigureMmu (
OUT VOID **TranslationTableBase OPTIONAL, OUT VOID **TranslationTableBase OPTIONAL,
OUT UINTN *TranslationTableSize OPTIONAL OUT UINTN *TranslationTableSize OPTIONAL
); );
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmMmuEnabled ( ArmMmuEnabled (
VOID VOID
); );
VOID VOID
EFIAPI EFIAPI
ArmEnableBranchPrediction ( ArmEnableBranchPrediction (
@ -482,13 +482,13 @@ EFIAPI
ArmDataMemoryBarrier ( ArmDataMemoryBarrier (
VOID VOID
); );
VOID VOID
EFIAPI EFIAPI
ArmDataSyncronizationBarrier ( ArmDataSyncronizationBarrier (
VOID VOID
); );
VOID VOID
EFIAPI EFIAPI
ArmInstructionSynchronizationBarrier ( ArmInstructionSynchronizationBarrier (

4
ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
View File

@ -27,5 +27,5 @@ DefaultExceptionHandler (
IN EFI_EXCEPTION_TYPE ExceptionType, IN EFI_EXCEPTION_TYPE ExceptionType,
IN OUT EFI_SYSTEM_CONTEXT SystemContext IN OUT EFI_SYSTEM_CONTEXT SystemContext
); );
#endif #endif

6
ArmPkg/Include/Library/SemihostLib.h
View File

@ -22,7 +22,7 @@
* about the semihosting interface. * about the semihosting interface.
* *
*/ */
#define SEMIHOST_FILE_MODE_READ (0 << 2) #define SEMIHOST_FILE_MODE_READ (0 << 2)
#define SEMIHOST_FILE_MODE_WRITE (1 << 2) #define SEMIHOST_FILE_MODE_WRITE (1 << 2)
#define SEMIHOST_FILE_MODE_APPEND (2 << 2) #define SEMIHOST_FILE_MODE_APPEND (2 << 2)
@ -92,10 +92,10 @@ VOID
SemihostWriteString ( SemihostWriteString (
IN CHAR8 *String IN CHAR8 *String
); );
UINT32 UINT32
SemihostSystem ( SemihostSystem (
IN CHAR8 *CommandLine IN CHAR8 *CommandLine
); );
#endif // __SEMIHOSTING_H__ #endif // __SEMIHOSTING_H__

12
ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
View File

@ -121,7 +121,7 @@ UncachedAllocateReservedPages (
If Buffer was not allocated with a page allocation function in the Memory Allocation Library, If Buffer was not allocated with a page allocation function in the Memory Allocation Library,
then ASSERT(). then ASSERT().
If Pages is zero, then ASSERT(). If Pages is zero, then ASSERT().
@param Buffer Pointer to the buffer of pages to free. @param Buffer Pointer to the buffer of pages to free.
@param Pages The number of 4 KB 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 If Buffer was not allocated with an aligned page allocation function in the Memory Allocation
Library, then ASSERT(). Library, then ASSERT().
If Pages is zero, then ASSERT(). If Pages is zero, then ASSERT().
@param Buffer Pointer to the buffer of pages to free. @param Buffer Pointer to the buffer of pages to free.
@param Pages The number of 4 KB 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 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. is not enough memory remaining to satisfy the request, then NULL is returned.
If Buffer is NULL, then ASSERT(). 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 AllocationSize The number of bytes to allocate and zero.
@param Buffer The buffer to copy to the allocated buffer. @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 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. is not enough memory remaining to satisfy the request, then NULL is returned.
If Buffer is NULL, then ASSERT(). 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 AllocationSize The number of bytes to allocate and zero.
@param Buffer The buffer to copy to the allocated buffer. @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 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. is not enough memory remaining to satisfy the request, then NULL is returned.
If Buffer is NULL, then ASSERT(). 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 AllocationSize The number of bytes to allocate and zero.
@param Buffer The buffer to copy to the allocated buffer. @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. in the Memory Allocation Library.
Frees the buffer specified by Buffer. Buffer must have been allocated on a previous call to the Frees the buffer specified by Buffer. Buffer must have been allocated on a previous call to the

4
ArmPkg/Include/Protocol/VirtualUncachedPages.h
View File

@ -37,7 +37,7 @@ EFI_STATUS
IN EFI_PHYSICAL_ADDRESS VirtualMask, IN EFI_PHYSICAL_ADDRESS VirtualMask,
OUT UINT64 *Attributes OPTIONAL OUT UINT64 *Attributes OPTIONAL
); );
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *FREE_CONVERTED_PAGES) ( (EFIAPI *FREE_CONVERTED_PAGES) (
@ -57,4 +57,4 @@ struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL {
extern EFI_GUID gVirtualUncachedPagesProtocolGuid; extern EFI_GUID gVirtualUncachedPagesProtocolGuid;
#endif #endif

18
ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
View File

@ -1,14 +1,14 @@
#/** @file #/** @file
# #
# Copyright (c) 2011-2012, ARM Limited. All rights reserved.<BR> # Copyright (c) 2011-2012, ARM Limited. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
[Defines] [Defines]
@ -17,7 +17,7 @@
FILE_GUID = 82da1b44-d2d6-4a7d-bbf0-a0cb67964034 FILE_GUID = 82da1b44-d2d6-4a7d-bbf0-a0cb67964034
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = TimerLib LIBRARY_CLASS = TimerLib
CONSTRUCTOR = TimerConstructor CONSTRUCTOR = TimerConstructor
[Sources.common] [Sources.common]
@ -27,18 +27,18 @@
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec EmbeddedPkg/EmbeddedPkg.dec
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec
[LibraryClasses] [LibraryClasses]
DebugLib DebugLib
IoLib IoLib
ArmLib ArmLib
BaseLib BaseLib
[Protocols] [Protocols]
[Guids] [Guids]
[Pcd] [Pcd]
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz

4
ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -27,7 +27,7 @@ CacheRangeOperation (
UINTN ArmCacheLineLength = ArmDataCacheLineLength(); UINTN ArmCacheLineLength = ArmDataCacheLineLength();
UINTN ArmCacheLineAlignmentMask = ArmCacheLineLength - 1; UINTN ArmCacheLineAlignmentMask = ArmCacheLineLength - 1;
UINTN ArmCacheOperationThreshold = PcdGet32(PcdArmCacheOperationThreshold); UINTN ArmCacheOperationThreshold = PcdGet32(PcdArmCacheOperationThreshold);
if ((CacheOperation != NULL) && (Length >= ArmCacheOperationThreshold)) { if ((CacheOperation != NULL) && (Length >= ArmCacheOperationThreshold)) {
ArmDrainWriteBuffer (); ArmDrainWriteBuffer ();
CacheOperation (); CacheOperation ();

102
ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c
View File

@ -2,7 +2,7 @@
Default exception handler Default exception handler
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -90,7 +90,7 @@ MRegList (
UINTN Index, Start, End; UINTN Index, Start, End;
CHAR8 *Str; CHAR8 *Str;
BOOLEAN First; BOOLEAN First;
Str = mMregListStr; Str = mMregListStr;
*Str = '\0'; *Str = '\0';
AsciiStrCat (Str, "{"); AsciiStrCat (Str, "{");
@ -100,13 +100,13 @@ MRegList (
for (Index++; ((OpCode & (1 << Index)) != 0) && Index <= 15; Index++) { for (Index++; ((OpCode & (1 << Index)) != 0) && Index <= 15; Index++) {
End = Index; End = Index;
} }
if (!First) { if (!First) {
AsciiStrCat (Str, ","); AsciiStrCat (Str, ",");
} else { } else {
First = FALSE; First = FALSE;
} }
if (Start == End) { if (Start == End) {
AsciiStrCat (Str, gReg[Start]); AsciiStrCat (Str, gReg[Start]);
AsciiStrCat (Str, ", "); AsciiStrCat (Str, ", ");
@ -121,7 +121,7 @@ MRegList (
AsciiStrCat (Str, "ERROR"); AsciiStrCat (Str, "ERROR");
} }
AsciiStrCat (Str, "}"); AsciiStrCat (Str, "}");
// BugBug: Make caller pass in buffer it is cleaner // BugBug: Make caller pass in buffer it is cleaner
return mMregListStr; return mMregListStr;
} }
@ -145,17 +145,17 @@ RotateRight (
/** /**
Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to
point to next instructin. point to next instructin.
We cheat and only decode instructions that access We cheat and only decode instructions that access
memory. If the instruction is not found we dump the instruction in hex. 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 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. @param Extended TRUE dump hex for instruction too.
**/ **/
VOID VOID
DisassembleArmInstruction ( DisassembleArmInstruction (
@ -177,7 +177,7 @@ DisassembleArmInstruction (
P = (OpCode & BIT24) == BIT24; P = (OpCode & BIT24) == BIT24;
U = (OpCode & BIT23) == BIT23; U = (OpCode & BIT23) == BIT23;
B = (OpCode & BIT22) == BIT22; // Also called S B = (OpCode & BIT22) == BIT22; // Also called S
W = (OpCode & BIT21) == BIT21; W = (OpCode & BIT21) == BIT21;
L = (OpCode & BIT20) == BIT20; L = (OpCode & BIT20) == BIT20;
S = (OpCode & BIT6) == BIT6; S = (OpCode & BIT6) == BIT6;
H = (OpCode & BIT5) == BIT5; H = (OpCode & BIT5) == BIT5;
@ -195,27 +195,27 @@ DisassembleArmInstruction (
// LDREX, STREX // LDREX, STREX
if ((OpCode & 0x0fe000f0) == 0x01800090) { if ((OpCode & 0x0fe000f0) == 0x01800090) {
if (L) { if (L) {
// A4.1.27 LDREX{<cond>} <Rd>, [<Rn>] // A4.1.27 LDREX{<cond>} <Rd>, [<Rn>]
AsciiSPrint (Buf, Size, "LDREX%a %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn]); AsciiSPrint (Buf, Size, "LDREX%a %a, [%a]", COND (OpCode), gReg[Rd], gReg[Rn]);
} else { } else {
// A4.1.103 STREX{<cond>} <Rd>, <Rm>, [<Rn>] // A4.1.103 STREX{<cond>} <Rd>, <Rm>, [<Rn>]
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; return;
} }
// LDM/STM // LDM/STM
if ((OpCode & 0x0e000000) == 0x08000000) { if ((OpCode & 0x0e000000) == 0x08000000) {
if (L) { if (L) {
// A4.1.20 LDM{<cond>}<addressing_mode> <Rn>{!}, <registers> // A4.1.20 LDM{<cond>}<addressing_mode> <Rn>{!}, <registers>
// A4.1.21 LDM{<cond>}<addressing_mode> <Rn>, <registers_without_pc>^ // A4.1.21 LDM{<cond>}<addressing_mode> <Rn>, <registers_without_pc>^
// A4.1.22 LDM{<cond>}<addressing_mode> <Rn>{!}, <registers_and_pc>^ // A4.1.22 LDM{<cond>}<addressing_mode> <Rn>{!}, <registers_and_pc>^
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 { } else {
// A4.1.97 STM{<cond>}<addressing_mode> <Rn>{!}, <registers> // A4.1.97 STM{<cond>}<addressing_mode> <Rn>{!}, <registers>
// A4.1.98 STM{<cond>}<addressing_mode> <Rn>, <registers>^ // A4.1.98 STM{<cond>}<addressing_mode> <Rn>, <registers>^
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; return;
} }
@ -225,7 +225,7 @@ DisassembleArmInstruction (
if ((OpCode & 0xfd70f000 ) == 0xf550f000) { if ((OpCode & 0xfd70f000 ) == 0xf550f000) {
Index = AsciiSPrint (Buf, Size, "PLD"); Index = AsciiSPrint (Buf, Size, "PLD");
} else { } 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 (P) {
if (!I) { if (!I) {
@ -256,7 +256,7 @@ DisassembleArmInstruction (
} else { } else {
Type = "ROR"; Type = "ROR";
} }
AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a%a, %a, #%d]%a", gReg[Rn], SIGN (U), gReg[Rm], Type, shift_imm, WRITE (W)); AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a%a, %a, #%d]%a", gReg[Rn], SIGN (U), gReg[Rm], Type, shift_imm, WRITE (W));
} }
} else { // !P } else { // !P
@ -287,13 +287,13 @@ DisassembleArmInstruction (
} else { } else {
Type = "ROR"; Type = "ROR";
} }
AsciiSPrint (&Buf[Index], Size - Index, "[%a], #%a%a, %a, #%d", gReg[Rn], SIGN (U), gReg[Rm], Type, shift_imm); 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) { if ((OpCode & 0x0e000000) == 0x00000000) {
// LDR/STR address mode 3 // LDR/STR address mode 3
// LDR|STR{<cond>}H|SH|SB|D <Rd>, <addressing_mode> // LDR|STR{<cond>}H|SH|SB|D <Rd>, <addressing_mode>
@ -314,8 +314,8 @@ DisassembleArmInstruction (
Root = "STR%aD %a "; 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; S = (OpCode & BIT6) == BIT6;
H = (OpCode & BIT5) == BIT5; 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]); AsciiSPrint (Buf, Size, "SWP%a%a %a, %a, [%a]", COND (OpCode), BYTE (B), gReg[Rd], gReg[Rm], gReg[Rn]);
return; return;
} }
if ((OpCode & 0xfe5f0f00) == 0xf84d0500) { if ((OpCode & 0xfe5f0f00) == 0xf84d0500) {
// A4.1.90 SRS SRS<addressing_mode> #<mode>{!} // A4.1.90 SRS SRS<addressing_mode> #<mode>{!}
AsciiSPrint (Buf, Size, "SRS%a #0x%x%a", gLdmStack[(OpCode >> 23) & 3], OpCode & 0x1f, WRITE (W)); 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)); AsciiSPrint (Buf, Size, "RFE%a %a", gLdmStack[(OpCode >> 23) & 3], gReg[Rn], WRITE (W));
return; return;
} }
if ((OpCode & 0xfff000f0) == 0xe1200070) { if ((OpCode & 0xfff000f0) == 0xe1200070) {
// A4.1.7 BKPT <immed_16> // A4.1.7 BKPT <immed_16>
AsciiSPrint (Buf, Size, "BKPT %x", ((OpCode >> 8) | (OpCode & 0xf)) & 0xffff); AsciiSPrint (Buf, Size, "BKPT %x", ((OpCode >> 8) | (OpCode & 0xf)) & 0xffff);
return; return;
} }
if ((OpCode & 0xfff10020) == 0xf1000000) { if ((OpCode & 0xfff10020) == 0xf1000000) {
// A4.1.16 CPS<effect> <iflags> {, #<mode>} // A4.1.16 CPS<effect> <iflags> {, #<mode>}
if (((OpCode >> 6) & 0x7) == 0) { if (((OpCode >> 6) & 0x7) == 0) {
@ -381,19 +381,19 @@ DisassembleArmInstruction (
} }
} }
return; return;
} }
if ((OpCode & 0x0f000000) == 0x0f000000) { if ((OpCode & 0x0f000000) == 0x0f000000) {
// A4.1.107 SWI{<cond>} <immed_24> // A4.1.107 SWI{<cond>} <immed_24>
AsciiSPrint (Buf, Size, "SWI%a %x", COND (OpCode), OpCode & 0x00ffffff); AsciiSPrint (Buf, Size, "SWI%a %x", COND (OpCode), OpCode & 0x00ffffff);
return; return;
} }
if ((OpCode & 0x0fb00000) == 0x01000000) { if ((OpCode & 0x0fb00000) == 0x01000000) {
// A4.1.38 MRS{<cond>} <Rd>, CPSR MRS{<cond>} <Rd>, SPSR // A4.1.38 MRS{<cond>} <Rd>, CPSR MRS{<cond>} <Rd>, SPSR
AsciiSPrint (Buf, Size, "MRS%a %a, %a", COND (OpCode), gReg[Rd], B ? "SPSR" : "CPSR"); AsciiSPrint (Buf, Size, "MRS%a %a, %a", COND (OpCode), gReg[Rd], B ? "SPSR" : "CPSR");
return; return;
} }
if ((OpCode & 0x0db00000) == 0x03200000) { if ((OpCode & 0x0db00000) == 0x03200000) {
@ -406,14 +406,14 @@ DisassembleArmInstruction (
AsciiSPrint (Buf, Size, "MRS%a %a_%a, %a", COND (OpCode), B ? "SPSR" : "CPSR", gReg[Rd]); AsciiSPrint (Buf, Size, "MRS%a %a_%a, %a", COND (OpCode), B ? "SPSR" : "CPSR", gReg[Rd]);
} }
return; return;
} }
if ((OpCode & 0xff000010) == 0xfe000000) { if ((OpCode & 0xff000010) == 0xfe000000) {
// A4.1.13 CDP{<cond>} <coproc>, <opcode_1>, <CRd>, <CRn>, <CRm>, <opcode_2> // A4.1.13 CDP{<cond>} <coproc>, <opcode_1>, <CRd>, <CRn>, <CRm>, <opcode_2>
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); 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; return;
} }
if ((OpCode & 0x0e000000) == 0x0c000000) { if ((OpCode & 0x0e000000) == 0x0c000000) {
// A4.1.19 LDC and A4.1.96 SDC // A4.1.19 LDC and A4.1.96 SDC
if ((OpCode & 0xf0000000) == 0xf0000000) { if ((OpCode & 0xf0000000) == 0xf0000000) {
@ -421,36 +421,36 @@ DisassembleArmInstruction (
} else { } else {
Index = AsciiSPrint (Buf, Size, "%a%a 0x%x, CR%d, ", L ? "LDC":"SDC", COND (OpCode), (OpCode >> 8) & 0xf, Rd); Index = AsciiSPrint (Buf, Size, "%a%a 0x%x, CR%d, ", L ? "LDC":"SDC", COND (OpCode), (OpCode >> 8) & 0xf, Rd);
} }
if (!P) { if (!P) {
if (!W) { if (!W) {
// A5.5.5.5 [<Rn>], <option> // A5.5.5.5 [<Rn>], <option>
AsciiSPrint (&Buf[Index], Size - Index, "[%a], {0x%x}", gReg[Rn], OpCode & 0xff); AsciiSPrint (&Buf[Index], Size - Index, "[%a], {0x%x}", gReg[Rn], OpCode & 0xff);
} else { } else {
// A.5.5.4 [<Rn>], #+/-<offset_8>*4 // A.5.5.4 [<Rn>], #+/-<offset_8>*4
AsciiSPrint (&Buf[Index], Size - Index, "[%a], #%a0x%x*4", gReg[Rn], SIGN (U), OpCode & 0xff); AsciiSPrint (&Buf[Index], Size - Index, "[%a], #%a0x%x*4", gReg[Rn], SIGN (U), OpCode & 0xff);
} }
} else { } else {
// A5.5.5.2 [<Rn>, #+/-<offset_8>*4 ]! // A5.5.5.2 [<Rn>, #+/-<offset_8>*4 ]!
AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a0x%x*4]%a", gReg[Rn], SIGN (U), OpCode & 0xff, WRITE (W)); AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a0x%x*4]%a", gReg[Rn], SIGN (U), OpCode & 0xff, WRITE (W));
} }
} }
if ((OpCode & 0x0f000010) == 0x0e000010) { if ((OpCode & 0x0f000010) == 0x0e000010) {
// A4.1.32 MRC2, MCR2 // A4.1.32 MRC2, MCR2
AsciiSPrint (Buf, Size, "%a%a 0x%x, 0x%x, %a, CR%d, CR%d, 0x%x", L ? "MRC":"MCR", COND (OpCode), (OpCode >> 8) & 0xf, (OpCode >> 20) & 0xf, gReg[Rd], Rn, Rm, (OpCode >> 5) &0x7); AsciiSPrint (Buf, Size, "%a%a 0x%x, 0x%x, %a, CR%d, CR%d, 0x%x", L ? "MRC":"MCR", COND (OpCode), (OpCode >> 8) & 0xf, (OpCode >> 20) & 0xf, gReg[Rd], Rn, Rm, (OpCode >> 5) &0x7);
return; return;
} }
if ((OpCode & 0x0ff00000) == 0x0c400000) { if ((OpCode & 0x0ff00000) == 0x0c400000) {
// A4.1.33 MRRC2, MCRR2 // A4.1.33 MRRC2, MCRR2
AsciiSPrint (Buf, Size, "%a%a 0x%x, 0x%x, %a, %a, CR%d", L ? "MRRC":"MCRR", COND (OpCode), (OpCode >> 4) & 0xf, (OpCode >> 20) & 0xf, gReg[Rd], gReg[Rn], Rm); AsciiSPrint (Buf, Size, "%a%a 0x%x, 0x%x, %a, %a, CR%d", L ? "MRRC":"MCRR", COND (OpCode), (OpCode >> 4) & 0xf, (OpCode >> 20) & 0xf, gReg[Rd], gReg[Rn], Rm);
return; return;
} }
AsciiSPrint (Buf, Size, "Faulting OpCode 0x%08x", OpCode); AsciiSPrint (Buf, Size, "Faulting OpCode 0x%08x", OpCode);
*OpCodePtr += 1; *OpCodePtr += 1;
return; return;
} }

282
ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
View File

@ -1,15 +1,15 @@
/** @file /** @file
Thumb Dissassembler. Still a work in progress. Thumb Dissassembler. Still a work in progress.
Wrong output is a bug, so please fix it. Wrong output is a bug, so please fix it.
Hex output means there is not yet an entry or a decode bug. Hex output means there is not yet an entry or a decode bug.
gOpThumb[] are Thumb 16-bit, and gOpThumb2[] work on the 32-bit gOpThumb[] are Thumb 16-bit, and gOpThumb2[] work on the 32-bit
16-bit stream of Thumb2 instruction. Then there are big case 16-bit stream of Thumb2 instruction. Then there are big case
statements to print everything out. If you are adding instructions statements to print everything out. If you are adding instructions
try to reuse existing case entries if possible. try to reuse existing case entries if possible.
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -32,13 +32,13 @@ extern CHAR8 *gReg[];
// Thumb address modes // Thumb address modes
#define LOAD_STORE_FORMAT1 1 #define LOAD_STORE_FORMAT1 1
#define LOAD_STORE_FORMAT1_H 101 #define LOAD_STORE_FORMAT1_H 101
#define LOAD_STORE_FORMAT1_B 111 #define LOAD_STORE_FORMAT1_B 111
#define LOAD_STORE_FORMAT2 2 #define LOAD_STORE_FORMAT2 2
#define LOAD_STORE_FORMAT3 3 #define LOAD_STORE_FORMAT3 3
#define LOAD_STORE_FORMAT4 4 #define LOAD_STORE_FORMAT4 4
#define LOAD_STORE_MULTIPLE_FORMAT1 5 #define LOAD_STORE_MULTIPLE_FORMAT1 5
#define PUSH_FORMAT 6 #define PUSH_FORMAT 6
#define POP_FORMAT 106 #define POP_FORMAT 106
#define IMMED_8 7 #define IMMED_8 7
#define CONDITIONAL_BRANCH 8 #define CONDITIONAL_BRANCH 8
#define UNCONDITIONAL_BRANCH 9 #define UNCONDITIONAL_BRANCH 9
@ -93,8 +93,8 @@ extern CHAR8 *gReg[];
#define THUMB2_4REGS 230 #define THUMB2_4REGS 230
#define ADD_IMM12_1REG 231 #define ADD_IMM12_1REG 231
#define THUMB2_IMM16 232 #define THUMB2_IMM16 232
#define MRC_THUMB2 233 #define MRC_THUMB2 233
#define MRRC_THUMB2 234 #define MRRC_THUMB2 234
#define THUMB2_MRS 235 #define THUMB2_MRS 235
#define THUMB2_MSR 236 #define THUMB2_MSR 236
@ -118,7 +118,7 @@ THUMB_INSTRUCTIONS gOpThumb[] = {
{ "ADD" , 0x1800, 0xfe00, DATA_FORMAT1 }, { "ADD" , 0x1800, 0xfe00, DATA_FORMAT1 },
{ "ADD" , 0x4400, 0xff00, DATA_FORMAT8 }, // A8.6.9 { "ADD" , 0x4400, 0xff00, DATA_FORMAT8 }, // A8.6.9
{ "ADD" , 0xa000, 0xf100, DATA_FORMAT6_PC }, { "ADD" , 0xa000, 0xf100, DATA_FORMAT6_PC },
{ "ADD" , 0xa800, 0xf800, DATA_FORMAT6_SP }, { "ADD" , 0xa800, 0xf800, DATA_FORMAT6_SP },
{ "ADD" , 0xb000, 0xff80, DATA_FORMAT7 }, { "ADD" , 0xb000, 0xff80, DATA_FORMAT7 },
{ "AND" , 0x4000, 0xffc0, DATA_FORMAT5 }, { "AND" , 0x4000, 0xffc0, DATA_FORMAT5 },
@ -156,7 +156,7 @@ THUMB_INSTRUCTIONS gOpThumb[] = {
{ "LDRH" , 0x7a00, 0xfe00, LOAD_STORE_FORMAT2 }, { "LDRH" , 0x7a00, 0xfe00, LOAD_STORE_FORMAT2 },
{ "LDRSB" , 0x5600, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>] { "LDRSB" , 0x5600, 0xfe00, LOAD_STORE_FORMAT2 }, // STR <Rt>, [<Rn>, <Rm>]
{ "LDRSH" , 0x5e00, 0xfe00, LOAD_STORE_FORMAT2 }, { "LDRSH" , 0x5e00, 0xfe00, LOAD_STORE_FORMAT2 },
{ "MOVS", 0x0000, 0xffc0, DATA_FORMAT5 }, // LSL with imm5 == 0 is a MOVS, so this must go before LSL { "MOVS", 0x0000, 0xffc0, DATA_FORMAT5 }, // LSL with imm5 == 0 is a MOVS, so this must go before LSL
{ "LSL" , 0x0000, 0xf800, DATA_FORMAT4 }, { "LSL" , 0x0000, 0xf800, DATA_FORMAT4 },
{ "LSL" , 0x4080, 0xffc0, DATA_FORMAT5 }, { "LSL" , 0x4080, 0xffc0, DATA_FORMAT5 },
@ -212,8 +212,8 @@ THUMB_INSTRUCTIONS gOpThumb[] = {
THUMB_INSTRUCTIONS gOpThumb2[] = { THUMB_INSTRUCTIONS gOpThumb2[] = {
//Instruct OpCode OpCode Mask Addressig Mode //Instruct OpCode OpCode Mask Addressig Mode
{ "ADR", 0xf2af0000, 0xfbff8000, ADR_THUMB2 }, // ADDR <Rd>, <label> ;Needs to go before ADDW { "ADR", 0xf2af0000, 0xfbff8000, ADR_THUMB2 }, // ADDR <Rd>, <label> ;Needs to go before ADDW
{ "CMN", 0xf1100f00, 0xfff08f00, CMN_THUMB2 }, // CMN <Rn>, #<const> ;Needs to go before ADD { "CMN", 0xf1100f00, 0xfff08f00, CMN_THUMB2 }, // CMN <Rn>, #<const> ;Needs to go before ADD
{ "CMN", 0xeb100f00, 0xfff08f00, ADD_IMM5_2REG }, // CMN <Rn>, <Rm> {,<shift> #<const>} { "CMN", 0xeb100f00, 0xfff08f00, ADD_IMM5_2REG }, // CMN <Rn>, <Rm> {,<shift> #<const>}
{ "CMP", 0xf1a00f00, 0xfff08f00, CMN_THUMB2 }, // CMP <Rn>, #<const> { "CMP", 0xf1a00f00, 0xfff08f00, CMN_THUMB2 }, // CMP <Rn>, #<const>
@ -225,7 +225,7 @@ THUMB_INSTRUCTIONS gOpThumb2[] = {
{ "MOV", 0xf04f0000, 0xfbef8000, ADD_IMM12_1REG }, // MOV <Rd>, #<const> { "MOV", 0xf04f0000, 0xfbef8000, ADD_IMM12_1REG }, // MOV <Rd>, #<const>
{ "MOVW", 0xf2400000, 0xfbe08000, THUMB2_IMM16 }, // MOVW <Rd>, #<const> { "MOVW", 0xf2400000, 0xfbe08000, THUMB2_IMM16 }, // MOVW <Rd>, #<const>
{ "MOVT", 0xf2c00000, 0xfbe08000, THUMB2_IMM16 }, // MOVT <Rd>, #<const> { "MOVT", 0xf2c00000, 0xfbe08000, THUMB2_IMM16 }, // MOVT <Rd>, #<const>
{ "ADC", 0xf1400000, 0xfbe08000, ADD_IMM12 }, // ADC{S} <Rd>, <Rn>, #<const> { "ADC", 0xf1400000, 0xfbe08000, ADD_IMM12 }, // ADC{S} <Rd>, <Rn>, #<const>
{ "ADC", 0xeb400000, 0xffe08000, ADD_IMM5 }, // ADC{S} <Rd>, <Rn>, <Rm> {,<shift> #<const>} { "ADC", 0xeb400000, 0xffe08000, ADD_IMM5 }, // ADC{S} <Rd>, <Rn>, <Rm> {,<shift> #<const>}
{ "ADD", 0xf1000000, 0xfbe08000, ADD_IMM12 }, // ADD{S} <Rd>, <Rn>, #<const> { "ADD", 0xf1000000, 0xfbe08000, ADD_IMM12 }, // ADD{S} <Rd>, <Rn>, #<const>
@ -249,11 +249,11 @@ THUMB_INSTRUCTIONS gOpThumb2[] = {
{ "SUB", 0xeba00000, 0xffe08000, ADD_IMM5 }, // SUB{S} <Rd>, <Rn>, <Rm> {,<shift> #<const>} { "SUB", 0xeba00000, 0xffe08000, ADD_IMM5 }, // SUB{S} <Rd>, <Rn>, <Rm> {,<shift> #<const>}
{ "ASR", 0xea4f0020, 0xffef8030, ASR_IMM5 }, // ARS <Rd>, <Rm> #<const>} imm3:imm2 { "ASR", 0xea4f0020, 0xffef8030, ASR_IMM5 }, // ARS <Rd>, <Rm> #<const>} imm3:imm2
{ "ASR", 0xfa40f000, 0xffe0f0f0, ASR_3REG }, // ARS <Rd>, <Rn>, <Rm> { "ASR", 0xfa40f000, 0xffe0f0f0, ASR_3REG }, // ARS <Rd>, <Rn>, <Rm>
{ "LSR", 0xea4f0010, 0xffef8030, ASR_IMM5 }, // LSR <Rd>, <Rm> #<const>} imm3:imm2 { "LSR", 0xea4f0010, 0xffef8030, ASR_IMM5 }, // LSR <Rd>, <Rm> #<const>} imm3:imm2
{ "LSR", 0xfa20f000, 0xffe0f0f0, ASR_3REG }, // LSR <Rd>, <Rn>, <Rm> { "LSR", 0xfa20f000, 0xffe0f0f0, ASR_3REG }, // LSR <Rd>, <Rn>, <Rm>
{ "ROR", 0xea4f0030, 0xffef8030, ASR_IMM5 }, // ROR <Rd>, <Rm> #<const>} imm3:imm2 { "ROR", 0xea4f0030, 0xffef8030, ASR_IMM5 }, // ROR <Rd>, <Rm> #<const>} imm3:imm2
{ "ROR", 0xfa60f000, 0xffe0f0f0, ASR_3REG }, // ROR <Rd>, <Rn>, <Rm> { "ROR", 0xfa60f000, 0xffe0f0f0, ASR_3REG }, // ROR <Rd>, <Rn>, <Rm>
{ "BFC", 0xf36f0000, 0xffff8010, BFC_THUMB2 }, // BFC <Rd>, #<lsb>, #<width> { "BFC", 0xf36f0000, 0xffff8010, BFC_THUMB2 }, // BFC <Rd>, #<lsb>, #<width>
{ "BIC", 0xf3600000, 0xfff08010, BFC_THUMB2 }, // BIC <Rn>, <Rd>, #<lsb>, #<width> { "BIC", 0xf3600000, 0xfff08010, BFC_THUMB2 }, // BIC <Rn>, <Rd>, #<lsb>, #<width>
@ -317,19 +317,19 @@ THUMB_INSTRUCTIONS gOpThumb2[] = {
{ "STMDB", 0xe9800000, 0xffd0a000, STM_FORMAT }, // STMDB <Rn>{!},<registers> { "STMDB", 0xe9800000, 0xffd0a000, STM_FORMAT }, // STMDB <Rn>{!},<registers>
{ "LDM" , 0xe8900000, 0xffd02000, STM_FORMAT }, // LDM <Rn>{!},<registers> { "LDM" , 0xe8900000, 0xffd02000, STM_FORMAT }, // LDM <Rn>{!},<registers>
{ "LDMDB", 0xe9100000, 0xffd02000, STM_FORMAT }, // LDMDB <Rn>{!},<registers> { "LDMDB", 0xe9100000, 0xffd02000, STM_FORMAT }, // LDMDB <Rn>{!},<registers>
{ "LDR", 0xf8d00000, 0xfff00000, LDM_REG_IMM12 }, // LDR <rt>, [<rn>, {, #<imm12>]} { "LDR", 0xf8d00000, 0xfff00000, LDM_REG_IMM12 }, // LDR <rt>, [<rn>, {, #<imm12>]}
{ "LDRB", 0xf8900000, 0xfff00000, LDM_REG_IMM12 }, // LDRB <rt>, [<rn>, {, #<imm12>]} { "LDRB", 0xf8900000, 0xfff00000, LDM_REG_IMM12 }, // LDRB <rt>, [<rn>, {, #<imm12>]}
{ "LDRH", 0xf8b00000, 0xfff00000, LDM_REG_IMM12 }, // LDRH <rt>, [<rn>, {, #<imm12>]} { "LDRH", 0xf8b00000, 0xfff00000, LDM_REG_IMM12 }, // LDRH <rt>, [<rn>, {, #<imm12>]}
{ "LDRSB", 0xf9900000, 0xfff00000, LDM_REG_IMM12 }, // LDRSB <rt>, [<rn>, {, #<imm12>]} { "LDRSB", 0xf9900000, 0xfff00000, LDM_REG_IMM12 }, // LDRSB <rt>, [<rn>, {, #<imm12>]}
{ "LDRSH", 0xf9b00000, 0xfff00000, LDM_REG_IMM12 }, // LDRSH <rt>, [<rn>, {, #<imm12>]} { "LDRSH", 0xf9b00000, 0xfff00000, LDM_REG_IMM12 }, // LDRSH <rt>, [<rn>, {, #<imm12>]}
{ "LDR", 0xf85f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDR <Rt>, <label> { "LDR", 0xf85f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDR <Rt>, <label>
{ "LDRB", 0xf81f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRB <Rt>, <label> { "LDRB", 0xf81f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRB <Rt>, <label>
{ "LDRH", 0xf83f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRH <Rt>, <label> { "LDRH", 0xf83f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRH <Rt>, <label>
{ "LDRSB", 0xf91f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRSB <Rt>, <label> { "LDRSB", 0xf91f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRSB <Rt>, <label>
{ "LDRSH", 0xf93f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRSB <Rt>, <label> { "LDRSH", 0xf93f0000, 0xff7f0000, LDM_REG_IMM12_SIGNED }, // LDRSB <Rt>, <label>
{ "LDR", 0xf8500000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDR <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "LDR", 0xf8500000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDR <rt>, [<rn>, <rm> {, LSL #<imm2>]}
{ "LDRB", 0xf8100000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDRB <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "LDRB", 0xf8100000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDRB <rt>, [<rn>, <rm> {, LSL #<imm2>]}
{ "LDRH", 0xf8300000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDRH <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "LDRH", 0xf8300000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // LDRH <rt>, [<rn>, <rm> {, LSL #<imm2>]}
@ -339,25 +339,25 @@ THUMB_INSTRUCTIONS gOpThumb2[] = {
{ "LDR", 0xf8500800, 0xfff00800, LDM_REG_IMM8 }, // LDR <rt>, [<rn>, {, #<imm8>]} { "LDR", 0xf8500800, 0xfff00800, LDM_REG_IMM8 }, // LDR <rt>, [<rn>, {, #<imm8>]}
{ "LDRBT", 0xf8100e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRBT <rt>, [<rn>, {, #<imm8>]} { "LDRBT", 0xf8100e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRBT <rt>, [<rn>, {, #<imm8>]}
{ "LDRHT", 0xf8300e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRHT <rt>, [<rn>, {, #<imm8>]} { "LDRHT", 0xf8300e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRHT <rt>, [<rn>, {, #<imm8>]}
{ "LDRSB", 0xf9100800, 0xfff00800, LDM_REG_IMM8 }, // LDRHT <rt>, [<rn>, {, #<imm8>]} {!} form? { "LDRSB", 0xf9100800, 0xfff00800, LDM_REG_IMM8 }, // LDRHT <rt>, [<rn>, {, #<imm8>]} {!} form?
{ "LDRSBT",0xf9100e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRHBT <rt>, [<rn>, {, #<imm8>]} {!} form? { "LDRSBT",0xf9100e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRHBT <rt>, [<rn>, {, #<imm8>]} {!} form?
{ "LDRSH" ,0xf9300800, 0xfff00800, LDM_REG_IMM8 }, // LDRSH <rt>, [<rn>, {, #<imm8>]} { "LDRSH" ,0xf9300800, 0xfff00800, LDM_REG_IMM8 }, // LDRSH <rt>, [<rn>, {, #<imm8>]}
{ "LDRSHT",0xf9300e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRSHT <rt>, [<rn>, {, #<imm8>]} { "LDRSHT",0xf9300e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRSHT <rt>, [<rn>, {, #<imm8>]}
{ "LDRT", 0xf8500e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRT <rt>, [<rn>, {, #<imm8>]} { "LDRT", 0xf8500e00, 0xfff00f00, LDM_REG_IMM8 }, // LDRT <rt>, [<rn>, {, #<imm8>]}
{ "LDRD", 0xe8500000, 0xfe500000, LDRD_REG_IMM8_SIGNED }, // LDRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!} { "LDRD", 0xe8500000, 0xfe500000, LDRD_REG_IMM8_SIGNED }, // LDRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!}
{ "LDRD", 0xe8500000, 0xfe500000, LDRD_REG_IMM8 }, // LDRD <rt>, <rt2>, <label> { "LDRD", 0xe8500000, 0xfe500000, LDRD_REG_IMM8 }, // LDRD <rt>, <rt2>, <label>
{ "LDREX", 0xe8500f00, 0xfff00f00, LDM_REG_IMM8 }, // LDREX <Rt>, [Rn, {#imm8}]]
{ "LDREXB", 0xe8d00f4f, 0xfff00fff, LDREXB }, // LDREXB <Rt>, [<Rn>]
{ "LDREXH", 0xe8d00f5f, 0xfff00fff, LDREXB }, // LDREXH <Rt>, [<Rn>]
{ "LDREXD", 0xe8d00f4f, 0xfff00fff, LDREXD }, // LDREXD <Rt>, <Rt2>, [<Rn>]
{ "STR", 0xf8c00000, 0xfff00000, LDM_REG_IMM12 }, // STR <rt>, [<rn>, {, #<imm12>]} { "LDREX", 0xe8500f00, 0xfff00f00, LDM_REG_IMM8 }, // LDREX <Rt>, [Rn, {#imm8}]]
{ "LDREXB", 0xe8d00f4f, 0xfff00fff, LDREXB }, // LDREXB <Rt>, [<Rn>]
{ "LDREXH", 0xe8d00f5f, 0xfff00fff, LDREXB }, // LDREXH <Rt>, [<Rn>]
{ "LDREXD", 0xe8d00f4f, 0xfff00fff, LDREXD }, // LDREXD <Rt>, <Rt2>, [<Rn>]
{ "STR", 0xf8c00000, 0xfff00000, LDM_REG_IMM12 }, // STR <rt>, [<rn>, {, #<imm12>]}
{ "STRB", 0xf8800000, 0xfff00000, LDM_REG_IMM12 }, // STRB <rt>, [<rn>, {, #<imm12>]} { "STRB", 0xf8800000, 0xfff00000, LDM_REG_IMM12 }, // STRB <rt>, [<rn>, {, #<imm12>]}
{ "STRH", 0xf8a00000, 0xfff00000, LDM_REG_IMM12 }, // STRH <rt>, [<rn>, {, #<imm12>]} { "STRH", 0xf8a00000, 0xfff00000, LDM_REG_IMM12 }, // STRH <rt>, [<rn>, {, #<imm12>]}
{ "STR", 0xf8400000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STR <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "STR", 0xf8400000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STR <rt>, [<rn>, <rm> {, LSL #<imm2>]}
{ "STRB", 0xf8000000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STRB <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "STRB", 0xf8000000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STRB <rt>, [<rn>, <rm> {, LSL #<imm2>]}
{ "STRH", 0xf8200000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STRH <rt>, [<rn>, <rm> {, LSL #<imm2>]} { "STRH", 0xf8200000, 0xfff00fc0, LDM_REG_INDIRECT_LSL }, // STRH <rt>, [<rn>, <rm> {, LSL #<imm2>]}
@ -366,15 +366,15 @@ THUMB_INSTRUCTIONS gOpThumb2[] = {
{ "STRH", 0xf8200800, 0xfff00800, LDM_REG_IMM8 }, // STRH <rt>, [<rn>, {, #<imm8>]} { "STRH", 0xf8200800, 0xfff00800, LDM_REG_IMM8 }, // STRH <rt>, [<rn>, {, #<imm8>]}
{ "STRBT", 0xf8000e00, 0xfff00f00, LDM_REG_IMM8 }, // STRBT <rt>, [<rn>, {, #<imm8>]} { "STRBT", 0xf8000e00, 0xfff00f00, LDM_REG_IMM8 }, // STRBT <rt>, [<rn>, {, #<imm8>]}
{ "STRHT", 0xf8200e00, 0xfff00f00, LDM_REG_IMM8 }, // STRHT <rt>, [<rn>, {, #<imm8>]} { "STRHT", 0xf8200e00, 0xfff00f00, LDM_REG_IMM8 }, // STRHT <rt>, [<rn>, {, #<imm8>]}
{ "STRT", 0xf8400e00, 0xfff00f00, LDM_REG_IMM8 }, // STRT <rt>, [<rn>, {, #<imm8>]} { "STRT", 0xf8400e00, 0xfff00f00, LDM_REG_IMM8 }, // STRT <rt>, [<rn>, {, #<imm8>]}
{ "STRD", 0xe8400000, 0xfe500000, LDRD_REG_IMM8_SIGNED }, // STRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!} { "STRD", 0xe8400000, 0xfe500000, LDRD_REG_IMM8_SIGNED }, // STRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!}
{ "STREX", 0xe8400f00, 0xfff00f00, LDM_REG_IMM8 }, // STREX <Rt>, [Rn, {#imm8}]] { "STREX", 0xe8400f00, 0xfff00f00, LDM_REG_IMM8 }, // STREX <Rt>, [Rn, {#imm8}]]
{ "STREXB", 0xe8c00f4f, 0xfff00fff, LDREXB }, // STREXB <Rd>, <Rt>, [<Rn>] { "STREXB", 0xe8c00f4f, 0xfff00fff, LDREXB }, // STREXB <Rd>, <Rt>, [<Rn>]
{ "STREXH", 0xe8c00f5f, 0xfff00fff, LDREXB }, // STREXH <Rd>, <Rt>, [<Rn>] { "STREXH", 0xe8c00f5f, 0xfff00fff, LDREXB }, // STREXH <Rd>, <Rt>, [<Rn>]
{ "STREXD", 0xe8d00f4f, 0xfff00fff, LDREXD }, // STREXD <Rd>, <Rt>, <Rt2>, [<Rn>] { "STREXD", 0xe8d00f4f, 0xfff00fff, LDREXD }, // STREXD <Rd>, <Rt>, <Rt2>, [<Rn>]
{ "SRSDB", 0xe80dc000, 0xffdffff0, SRS_FORMAT }, // SRSDB<c> SP{!},#<mode> { "SRSDB", 0xe80dc000, 0xffdffff0, SRS_FORMAT }, // SRSDB<c> SP{!},#<mode>
{ "SRS" , 0xe98dc000, 0xffdffff0, SRS_FORMAT }, // SRS{IA}<c> SP{!},#<mode> { "SRS" , 0xe98dc000, 0xffdffff0, SRS_FORMAT }, // SRS{IA}<c> SP{!},#<mode>
@ -399,24 +399,24 @@ ThumbMRegList (
UINTN Index, Start, End; UINTN Index, Start, End;
CHAR8 *Str; CHAR8 *Str;
BOOLEAN First; BOOLEAN First;
Str = mThumbMregListStr; Str = mThumbMregListStr;
*Str = '\0'; *Str = '\0';
AsciiStrCat (Str, "{"); AsciiStrCat (Str, "{");
for (Index = 0, First = TRUE; Index <= 15; Index++) { for (Index = 0, First = TRUE; Index <= 15; Index++) {
if ((RegBitMask & (1 << Index)) != 0) { if ((RegBitMask & (1 << Index)) != 0) {
Start = End = Index; Start = End = Index;
for (Index++; ((RegBitMask & (1 << Index)) != 0) && (Index <= 9); Index++) { for (Index++; ((RegBitMask & (1 << Index)) != 0) && (Index <= 9); Index++) {
End = Index; End = Index;
} }
if (!First) { if (!First) {
AsciiStrCat (Str, ","); AsciiStrCat (Str, ",");
} else { } else {
First = FALSE; First = FALSE;
} }
if (Start == End) { if (Start == End) {
AsciiStrCat (Str, gReg[Start]); AsciiStrCat (Str, gReg[Start]);
} else { } else {
@ -430,7 +430,7 @@ ThumbMRegList (
AsciiStrCat (Str, "ERROR"); AsciiStrCat (Str, "ERROR");
} }
AsciiStrCat (Str, "}"); AsciiStrCat (Str, "}");
// BugBug: Make caller pass in buffer it is cleaner // BugBug: Make caller pass in buffer it is cleaner
return mThumbMregListStr; return mThumbMregListStr;
} }
@ -444,17 +444,17 @@ SignExtend32 (
if (((Data & TopBit) == 0) || (TopBit == BIT31)) { if (((Data & TopBit) == 0) || (TopBit == BIT31)) {
return Data; return Data;
} }
do { do {
TopBit <<= 1; TopBit <<= 1;
Data |= TopBit; Data |= TopBit;
} while ((TopBit & BIT31) != BIT31); } while ((TopBit & BIT31) != BIT31);
return Data; return Data;
} }
// //
// Some instructions specify the PC is always considered aligned // Some instructions specify the PC is always considered aligned
// The PC is after the instruction that is excuting. So you pass // The PC is after the instruction that is excuting. So you pass
// in the instruction address and you get back the aligned answer // in the instruction address and you get back the aligned answer
// //
@ -467,17 +467,17 @@ PCAlign4 (
} }
/** /**
Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to
point to next instructin. point to next instructin.
We cheat and only decode instructions that access We cheat and only decode instructions that access
memory. If the instruction is not found we dump the instruction in hex. 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 Buf Buffer to sprintf disassembly into. @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. @param Extended TRUE dump hex for instruction too.
**/ **/
VOID VOID
DisassembleThumbInstruction ( DisassembleThumbInstruction (
@ -499,12 +499,12 @@ DisassembleThumbInstruction (
UINT32 PC, Target, msbit, lsbit; UINT32 PC, Target, msbit, lsbit;
CHAR8 *Cond; CHAR8 *Cond;
BOOLEAN S, J1, J2, P, U, W; BOOLEAN S, J1, J2, P, U, W;
UINT32 coproc, opc1, opc2, CRd, CRn, CRm; UINT32 coproc, opc1, opc2, CRd, CRn, CRm;
UINT32 Mask; UINT32 Mask;
OpCodePtr = *OpCodePtrPtr; OpCodePtr = *OpCodePtrPtr;
OpCode = **OpCodePtrPtr; OpCode = **OpCodePtrPtr;
// Thumb2 is a stream of 16-bit instructions not a 32-bit instruction. // Thumb2 is a stream of 16-bit instructions not a 32-bit instruction.
OpCode32 = (((UINT32)OpCode) << 16) | *(OpCodePtr + 1); OpCode32 = (((UINT32)OpCode) << 16) | *(OpCodePtr + 1);
@ -519,7 +519,7 @@ DisassembleThumbInstruction (
// Increment by the minimum instruction size, Thumb2 could be bigger // Increment by the minimum instruction size, Thumb2 could be bigger
*OpCodePtrPtr += 1; *OpCodePtrPtr += 1;
// Manage IT Block ItFlag TRUE means we are in an IT block // Manage IT Block ItFlag TRUE means we are in an IT block
/*if (*ItBlock != 0) { /*if (*ItBlock != 0) {
ItFlag = TRUE; ItFlag = TRUE;
@ -531,58 +531,58 @@ DisassembleThumbInstruction (
for (Index = 0; Index < sizeof (gOpThumb)/sizeof (THUMB_INSTRUCTIONS); Index++) { for (Index = 0; Index < sizeof (gOpThumb)/sizeof (THUMB_INSTRUCTIONS); Index++) {
if ((OpCode & gOpThumb[Index].Mask) == gOpThumb[Index].OpCode) { if ((OpCode & gOpThumb[Index].Mask) == gOpThumb[Index].OpCode) {
if (Extended) { if (Extended) {
Offset = AsciiSPrint (Buf, Size, "0x%04x %-6a", OpCode, gOpThumb[Index].Start); Offset = AsciiSPrint (Buf, Size, "0x%04x %-6a", OpCode, gOpThumb[Index].Start);
} else { } else {
Offset = AsciiSPrint (Buf, Size, "%-6a", gOpThumb[Index].Start); Offset = AsciiSPrint (Buf, Size, "%-6a", gOpThumb[Index].Start);
} }
switch (gOpThumb[Index].AddressMode) { switch (gOpThumb[Index].AddressMode) {
case LOAD_STORE_FORMAT1: case LOAD_STORE_FORMAT1:
// A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>] // A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>]
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 4) & 0x7c); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 4) & 0x7c);
return; return;
case LOAD_STORE_FORMAT1_H: case LOAD_STORE_FORMAT1_H:
// A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>] // A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>]
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 5) & 0x3e); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 5) & 0x3e);
return; return;
case LOAD_STORE_FORMAT1_B: case LOAD_STORE_FORMAT1_B:
// A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>] // A6.5.1 <Rd>, [<Rn>, #<5_bit_offset>]
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 6) & 0x1f); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d #0x%x]", Rd, Rn, (OpCode >> 6) & 0x1f);
return; return;
case LOAD_STORE_FORMAT2: case LOAD_STORE_FORMAT2:
// A6.5.1 <Rd>, [<Rn>, <Rm>] // A6.5.1 <Rd>, [<Rn>, <Rm>]
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d, r%d]", Rd, Rn, Rm); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [r%d, r%d]", Rd, Rn, Rm);
return; return;
case LOAD_STORE_FORMAT3: case LOAD_STORE_FORMAT3:
// A6.5.1 <Rd>, [PC, #<8_bit_offset>] // A6.5.1 <Rd>, [PC, #<8_bit_offset>]
Target = (OpCode & 0xff) << 2; Target = (OpCode & 0xff) << 2;
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [pc, #0x%x] ;0x%08x", (OpCode >> 8) & 7, Target, PCAlign4 (PC) + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [pc, #0x%x] ;0x%08x", (OpCode >> 8) & 7, Target, PCAlign4 (PC) + Target);
return; return;
case LOAD_STORE_FORMAT4: case LOAD_STORE_FORMAT4:
// Rt, [SP, #imm8] // Rt, [SP, #imm8]
Target = (OpCode & 0xff) << 2; Target = (OpCode & 0xff) << 2;
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [sp, #0x%x]", (OpCode >> 8) & 7, Target); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, [sp, #0x%x]", (OpCode >> 8) & 7, Target);
return; return;
case LOAD_STORE_MULTIPLE_FORMAT1: case LOAD_STORE_MULTIPLE_FORMAT1:
// <Rn>!, {r0-r7} // <Rn>!, {r0-r7}
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d!, %a", (OpCode >> 8) & 7, ThumbMRegList (OpCode & 0xff)); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d!, %a", (OpCode >> 8) & 7, ThumbMRegList (OpCode & 0xff));
return; return;
case POP_FORMAT: case POP_FORMAT:
// POP {r0-r7,pc} // POP {r0-r7,pc}
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", ThumbMRegList ((OpCode & 0xff) | ((OpCode & BIT8) == BIT8 ? BIT15 : 0))); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", ThumbMRegList ((OpCode & 0xff) | ((OpCode & BIT8) == BIT8 ? BIT15 : 0)));
return; return;
case PUSH_FORMAT: case PUSH_FORMAT:
// PUSH {r0-r7,lr} // PUSH {r0-r7,lr}
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", ThumbMRegList ((OpCode & 0xff) | ((OpCode & BIT8) == BIT8 ? BIT14 : 0))); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", ThumbMRegList ((OpCode & 0xff) | ((OpCode & BIT8) == BIT8 ? BIT14 : 0)));
return; return;
case IMMED_8: case IMMED_8:
// A6.7 <immed_8> // A6.7 <immed_8>
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%x", OpCode & 0xff); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%x", OpCode & 0xff);
return; return;
case CONDITIONAL_BRANCH: case CONDITIONAL_BRANCH:
@ -591,83 +591,83 @@ DisassembleThumbInstruction (
Cond = gCondition[(OpCode >> 8) & 0xf]; Cond = gCondition[(OpCode >> 8) & 0xf];
Buf[Offset-5] = *Cond++; Buf[Offset-5] = *Cond++;
Buf[Offset-4] = *Cond; Buf[Offset-4] = *Cond;
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%04x", PC + 4 + SignExtend32 ((OpCode & 0xff) << 1, BIT8)); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%04x", PC + 4 + SignExtend32 ((OpCode & 0xff) << 1, BIT8));
return; return;
case UNCONDITIONAL_BRANCH_SHORT: case UNCONDITIONAL_BRANCH_SHORT:
// A6.3.2 B <target_address> // A6.3.2 B <target_address>
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%04x", PC + 4 + SignExtend32 ((OpCode & 0x3ff) << 1, BIT11)); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%04x", PC + 4 + SignExtend32 ((OpCode & 0x3ff) << 1, BIT11));
return; return;
case BRANCH_EXCHANGE: case BRANCH_EXCHANGE:
// A6.3.3 BX|BLX <Rm> // A6.3.3 BX|BLX <Rm>
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gReg[Rn | (H2 ? 8:0)]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gReg[Rn | (H2 ? 8:0)]);
return; return;
case DATA_FORMAT1: case DATA_FORMAT1:
// A6.4.3 <Rd>, <Rn>, <Rm> // A6.4.3 <Rd>, <Rn>, <Rm>
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, r%d", Rd, Rn, Rm); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, r%d", Rd, Rn, Rm);
return; return;
case DATA_FORMAT2: case DATA_FORMAT2:
// A6.4.3 <Rd>, <Rn>, #3_bit_immed // A6.4.3 <Rd>, <Rn>, #3_bit_immed
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, 0x%x", Rd, Rn, Rm); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, 0x%x", Rd, Rn, Rm);
return; return;
case DATA_FORMAT3: case DATA_FORMAT3:
// A6.4.3 <Rd>|<Rn>, #imm8 // A6.4.3 <Rd>|<Rn>, #imm8
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, #0x%x", (OpCode >> 8) & 7, OpCode & 0xff); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, #0x%x", (OpCode >> 8) & 7, OpCode & 0xff);
return; return;
case DATA_FORMAT4: case DATA_FORMAT4:
// A6.4.3 <Rd>|<Rm>, #immed_5 // A6.4.3 <Rd>|<Rm>, #immed_5
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, 0x%x", Rn, Rd, (OpCode >> 6) & 0x1f); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d, 0x%x", Rn, Rd, (OpCode >> 6) & 0x1f);
return; return;
case DATA_FORMAT5: case DATA_FORMAT5:
// A6.4.3 <Rd>|<Rm>, <Rm>|<Rs> // A6.4.3 <Rd>|<Rm>, <Rm>|<Rs>
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d", Rd, Rn); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, r%d", Rd, Rn);
return; return;
case DATA_FORMAT6_SP: case DATA_FORMAT6_SP:
// A6.4.3 <Rd>, <reg>, #<8_Bit_immed> // A6.4.3 <Rd>, <reg>, #<8_Bit_immed>
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, sp, 0x%x", (OpCode >> 8) & 7, (OpCode & 0xff) << 2); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, sp, 0x%x", (OpCode >> 8) & 7, (OpCode & 0xff) << 2);
return; return;
case DATA_FORMAT6_PC: case DATA_FORMAT6_PC:
// A6.4.3 <Rd>, <reg>, #<8_Bit_immed> // A6.4.3 <Rd>, <reg>, #<8_Bit_immed>
AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, pc, 0x%x", (OpCode >> 8) & 7, (OpCode & 0xff) << 2); AsciiSPrint (&Buf[Offset], Size - Offset, " r%d, pc, 0x%x", (OpCode >> 8) & 7, (OpCode & 0xff) << 2);
return; return;
case DATA_FORMAT7: case DATA_FORMAT7:
// A6.4.3 SP, SP, #<7_Bit_immed> // A6.4.3 SP, SP, #<7_Bit_immed>
AsciiSPrint (&Buf[Offset], Size - Offset, " sp, sp, 0x%x", (OpCode & 0x7f)*4); AsciiSPrint (&Buf[Offset], Size - Offset, " sp, sp, 0x%x", (OpCode & 0x7f)*4);
return; return;
case DATA_FORMAT8: case DATA_FORMAT8:
// A6.4.3 <Rd>|<Rn>, <Rm> // A6.4.3 <Rd>|<Rn>, <Rm>
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a", gReg[Rd | (H1 ? 8:0)], gReg[Rn | (H2 ? 8:0)]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a", gReg[Rd | (H1 ? 8:0)], gReg[Rn | (H2 ? 8:0)]);
return; return;
case CPS_FORMAT: case CPS_FORMAT:
// A7.1.24 // A7.1.24
AsciiSPrint (&Buf[Offset], Size - Offset, "%a %a%a%a", imod ? "ID":"IE", ((OpCode & BIT2) == 0) ? "":"a", ((OpCode & BIT1) == 0) ? "":"i", ((OpCode & BIT0) == 0) ? "":"f"); AsciiSPrint (&Buf[Offset], Size - Offset, "%a %a%a%a", imod ? "ID":"IE", ((OpCode & BIT2) == 0) ? "":"a", ((OpCode & BIT1) == 0) ? "":"i", ((OpCode & BIT0) == 0) ? "":"f");
return; return;
case ENDIAN_FORMAT: case ENDIAN_FORMAT:
// A7.1.24 // A7.1.24
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", (OpCode & BIT3) == 0 ? "LE":"BE"); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", (OpCode & BIT3) == 0 ? "LE":"BE");
return; return;
case DATA_CBZ: case DATA_CBZ:
// CB{N}Z <Rn>, <Lable> // CB{N}Z <Rn>, <Lable>
Target = ((OpCode >> 2) & 0x3e) | (((OpCode & BIT9) == BIT9) ? BIT6 : 0); Target = ((OpCode >> 2) & 0x3e) | (((OpCode & BIT9) == BIT9) ? BIT6 : 0);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %08x", gReg[Rd], PC + 4 + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %08x", gReg[Rd], PC + 4 + Target);
return; return;
case ADR_FORMAT: case ADR_FORMAT:
// ADR <Rd>, <Label> // ADR <Rd>, <Label>
Target = (OpCode & 0xff) << 2; Target = (OpCode & 0xff) << 2;
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %08x", gReg[(OpCode >> 8) & 7], PCAlign4 (PC) + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %08x", gReg[(OpCode >> 8) & 7], PCAlign4 (PC) + Target);
return; return;
case IT_BLOCK: case IT_BLOCK:
// ITSTATE = cond:mask OpCode[7:4]:OpCode[3:0] // ITSTATE = cond:mask OpCode[7:4]:OpCode[3:0]
// ITSTATE[7:5] == cond[3:1] // ITSTATE[7:5] == cond[3:1]
// ITSTATE[4] == 1st Instruction cond[0] // ITSTATE[4] == 1st Instruction cond[0]
// ITSTATE[3] == 2st Instruction cond[0] // ITSTATE[3] == 2st Instruction cond[0]
// ITSTATE[2] == 3st Instruction cond[0] // ITSTATE[2] == 3st Instruction cond[0]
// ITSTATE[1] == 4st Instruction cond[0] // ITSTATE[1] == 4st Instruction cond[0]
// ITSTATE[0] == 1 4 instruction IT block. 0 means 0,1,2 or 3 instructions // ITSTATE[0] == 1 4 instruction IT block. 0 means 0,1,2 or 3 instructions
// 1st one in ITSTATE low bits defines the number of instructions // 1st one in ITSTATE low bits defines the number of instructions
@ -684,13 +684,13 @@ DisassembleThumbInstruction (
} else if ((OpCode & 0xf) == 0x8) { } else if ((OpCode & 0xf) == 0x8) {
*ItBlock = 1; *ItBlock = 1;
} }
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gCondition[(OpCode >> 4) & 0xf]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gCondition[(OpCode >> 4) & 0xf]);
return; return;
} }
} }
} }
// Thumb2 are 32-bit instructions // Thumb2 are 32-bit instructions
*OpCodePtrPtr += 1; *OpCodePtrPtr += 1;
Rt = (OpCode32 >> 12) & 0xf; Rt = (OpCode32 >> 12) & 0xf;
@ -701,9 +701,9 @@ DisassembleThumbInstruction (
for (Index = 0; Index < sizeof (gOpThumb2)/sizeof (THUMB_INSTRUCTIONS); Index++) { for (Index = 0; Index < sizeof (gOpThumb2)/sizeof (THUMB_INSTRUCTIONS); Index++) {
if ((OpCode32 & gOpThumb2[Index].Mask) == gOpThumb2[Index].OpCode) { if ((OpCode32 & gOpThumb2[Index].Mask) == gOpThumb2[Index].OpCode) {
if (Extended) { if (Extended) {
Offset = AsciiSPrint (Buf, Size, "0x%04x %-6a", OpCode32, gOpThumb2[Index].Start); Offset = AsciiSPrint (Buf, Size, "0x%04x %-6a", OpCode32, gOpThumb2[Index].Start);
} else { } else {
Offset = AsciiSPrint (Buf, Size, " %-6a", gOpThumb2[Index].Start); Offset = AsciiSPrint (Buf, Size, " %-6a", gOpThumb2[Index].Start);
} }
switch (gOpThumb2[Index].AddressMode) { switch (gOpThumb2[Index].AddressMode) {
case B_T3: case B_T3:
@ -716,7 +716,7 @@ DisassembleThumbInstruction (
Target |= ((OpCode32 & BIT13) == BIT13)? BIT18 : 0; // J1 Target |= ((OpCode32 & BIT13) == BIT13)? BIT18 : 0; // J1
Target |= ((OpCode32 & BIT26) == BIT26)? BIT20 : 0; // S Target |= ((OpCode32 & BIT26) == BIT26)? BIT20 : 0; // S
Target = SignExtend32 (Target, BIT20); Target = SignExtend32 (Target, BIT20);
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PC + 4 + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PC + 4 + Target);
return; return;
case B_T4: case B_T4:
// S:I1:I2:imm10:imm11:0 // S:I1:I2:imm10:imm11:0
@ -728,7 +728,7 @@ DisassembleThumbInstruction (
Target |= (!(J1 ^ S) ? BIT23 : 0); // I1 Target |= (!(J1 ^ S) ? BIT23 : 0); // I1
Target |= (S ? BIT24 : 0); // S Target |= (S ? BIT24 : 0); // S
Target = SignExtend32 (Target, BIT24); Target = SignExtend32 (Target, BIT24);
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PC + 4 + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PC + 4 + Target);
return; return;
case BL_T2: case BL_T2:
@ -741,7 +741,7 @@ DisassembleThumbInstruction (
Target |= (!(J1 ^ S) ? BIT24 : 0); // I1 Target |= (!(J1 ^ S) ? BIT24 : 0); // I1
Target |= (S ? BIT25 : 0); // S Target |= (S ? BIT25 : 0); // S
Target = SignExtend32 (Target, BIT25); Target = SignExtend32 (Target, BIT25);
AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PCAlign4 (PC) + Target); AsciiSPrint (&Buf[Offset], Size - Offset, " 0x%08x", PCAlign4 (PC) + Target);
return; return;
case POP_T2: case POP_T2:
@ -750,7 +750,7 @@ DisassembleThumbInstruction (
return; return;
case POP_T3: case POP_T3:
// <register> // <register>
AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gReg[(OpCode32 >> 12) & 0xf]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a", gReg[(OpCode32 >> 12) & 0xf]);
return; return;
@ -762,7 +762,7 @@ DisassembleThumbInstruction (
case LDM_REG_IMM12_SIGNED: case LDM_REG_IMM12_SIGNED:
// <rt>, <label> // <rt>, <label>
Target = OpCode32 & 0xfff; Target = OpCode32 & 0xfff;
if ((OpCode32 & BIT23) == 0) { if ((OpCode32 & BIT23) == 0) {
// U == 0 means subtrack, U == 1 means add // U == 0 means subtrack, U == 1 means add
Target = -Target; Target = -Target;
@ -779,7 +779,7 @@ DisassembleThumbInstruction (
AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL #%d]", (OpCode32 >> 4) & 3); AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL #%d]", (OpCode32 >> 4) & 3);
} }
return; return;
case LDM_REG_IMM12: case LDM_REG_IMM12:
// <rt>, [<rn>, {, #<imm12>]} // <rt>, [<rn>, {, #<imm12>]}
Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, [%a", gReg[Rt], gReg[Rn]); Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, [%a", gReg[Rt], gReg[Rn]);
@ -810,7 +810,7 @@ DisassembleThumbInstruction (
case LDRD_REG_IMM8_SIGNED: case LDRD_REG_IMM8_SIGNED:
// LDRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!} // LDRD <rt>, <rt2>, [<rn>, {, #<imm8>]}{!}
P = (OpCode32 & BIT24) == BIT24; // index = P P = (OpCode32 & BIT24) == BIT24; // index = P
U = (OpCode32 & BIT23) == BIT23; U = (OpCode32 & BIT23) == BIT23;
W = (OpCode32 & BIT21) == BIT21; W = (OpCode32 & BIT21) == BIT21;
Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, [%a", gReg[Rt], gReg[Rt2], gReg[Rn]); Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, [%a", gReg[Rt], gReg[Rt2], gReg[Rn]);
if (P) { if (P) {
@ -826,9 +826,9 @@ DisassembleThumbInstruction (
} }
return; return;
case LDRD_REG_IMM8: case LDRD_REG_IMM8:
// LDRD <rt>, <rt2>, <label> // LDRD <rt>, <rt2>, <label>
Target = (OpCode32 & 0xff) << 2; Target = (OpCode32 & 0xff) << 2;
if ((OpCode32 & BIT23) == 0) { if ((OpCode32 & BIT23) == 0) {
// U == 0 means subtrack, U == 1 means add // U == 0 means subtrack, U == 1 means add
Target = -Target; Target = -Target;
@ -845,7 +845,7 @@ DisassembleThumbInstruction (
// LDREXD <Rt>, <Rt2>, [<Rn>] // LDREXD <Rt>, <Rt2>, [<Rn>]
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, ,%a, [%a]", gReg[Rt], gReg[Rt2], gReg[Rn]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, ,%a, [%a]", gReg[Rt], gReg[Rt2], gReg[Rn]);
return; return;
case SRS_FORMAT: case SRS_FORMAT:
// SP{!}, #<mode> // SP{!}, #<mode>
W = (OpCode32 & BIT21) == BIT21; W = (OpCode32 & BIT21) == BIT21;
@ -857,14 +857,14 @@ DisassembleThumbInstruction (
W = (OpCode32 & BIT21) == BIT21; W = (OpCode32 & BIT21) == BIT21;
AsciiSPrint (&Buf[Offset], Size - Offset, " %a%a, #0x%x", gReg[Rn], W?"!":""); AsciiSPrint (&Buf[Offset], Size - Offset, " %a%a, #0x%x", gReg[Rn], W?"!":"");
return; return;
case ADD_IMM12: case ADD_IMM12:
// ADD{S} <Rd>, <Rn>, #<const> i:imm3:imm8 // ADD{S} <Rd>, <Rn>, #<const> i:imm3:imm8
if ((OpCode32 & BIT20) == BIT20) { if ((OpCode32 & BIT20) == BIT20) {
Buf[Offset - 3] = 'S'; // assume %-6a Buf[Offset - 3] = 'S'; // assume %-6a
} }
Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0); Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #0x%x", gReg[Rd], gReg[Rn], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #0x%x", gReg[Rd], gReg[Rn], Target);
return; return;
case ADD_IMM12_1REG: case ADD_IMM12_1REG:
@ -873,14 +873,14 @@ DisassembleThumbInstruction (
Buf[Offset - 3] = 'S'; // assume %-6a Buf[Offset - 3] = 'S'; // assume %-6a
} }
Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0); Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rd], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rd], Target);
return; return;
case THUMB2_IMM16: case THUMB2_IMM16:
// MOVW <Rd>, #<const> i:imm3:imm8 // MOVW <Rd>, #<const> i:imm3:imm8
Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0); Target = (OpCode32 & 0xff) | ((OpCode32 >> 4) & 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0);
Target |= ((OpCode32 >> 4) & 0xf0000); Target |= ((OpCode32 >> 4) & 0xf0000);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rd], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rd], Target);
return; return;
case ADD_IMM5: case ADD_IMM5:
@ -889,18 +889,18 @@ DisassembleThumbInstruction (
Buf[Offset - 3] = 'S'; // assume %-6a Buf[Offset - 3] = 'S'; // assume %-6a
} }
Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0); Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0);
Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, %a", gReg[Rd], gReg[Rn], gReg[Rm]); Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, %a", gReg[Rd], gReg[Rn], gReg[Rm]);
if (Target != 0) { if (Target != 0) {
AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL %d", gShiftType[(OpCode >> 5) & 3], Target); AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL %d", gShiftType[(OpCode >> 5) & 3], Target);
} }
return; return;
case ADD_IMM5_2REG: case ADD_IMM5_2REG:
// CMP <Rn>, <Rm> {,LSL #<const>} imm3:imm2 // CMP <Rn>, <Rm> {,LSL #<const>} imm3:imm2
Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0); Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0);
Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a", gReg[Rn], gReg[Rm]); Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a", gReg[Rn], gReg[Rm]);
if (Target != 0) { if (Target != 0) {
AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL %d", gShiftType[(OpCode >> 5) & 3], Target); AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL %d", gShiftType[(OpCode >> 5) & 3], Target);
} }
@ -910,7 +910,7 @@ DisassembleThumbInstruction (
Buf[Offset - 3] = 'S'; // assume %-6a Buf[Offset - 3] = 'S'; // assume %-6a
} }
Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0); Target = ((OpCode32 >> 6) & 3) | ((OpCode32 >> 10) & 0x1c0);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a #%d", gReg[Rd], gReg[Rm], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a #%d", gReg[Rd], gReg[Rm], Target);
return; return;
case ASR_3REG: case ASR_3REG:
@ -918,7 +918,7 @@ DisassembleThumbInstruction (
if ((OpCode32 & BIT20) == BIT20) { if ((OpCode32 & BIT20) == BIT20) {
Buf[Offset - 3] = 'S'; // assume %-6a Buf[Offset - 3] = 'S'; // assume %-6a
} }
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a %a", gReg[Rd], gReg[Rn], gReg[Rm]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a %a", gReg[Rd], gReg[Rn], gReg[Rm]);
return; return;
case ADR_THUMB2: case ADR_THUMB2:
@ -929,13 +929,13 @@ DisassembleThumbInstruction (
} else { } else {
Target = PCAlign4 (PC) + Target; Target = PCAlign4 (PC) + Target;
} }
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, 0x%08x", gReg[Rd], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, 0x%08x", gReg[Rd], Target);
return; return;
case CMN_THUMB2: case CMN_THUMB2:
// CMN <Rn>, #<const>} // CMN <Rn>, #<const>}
Target = (OpCode32 & 0xff) | ((OpCode >> 4) && 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0); Target = (OpCode32 & 0xff) | ((OpCode >> 4) && 0x700) | ((OpCode & BIT26) == BIT26 ? BIT11 : 0);
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rn], Target); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #0x%x", gReg[Rn], Target);
return; return;
case BFC_THUMB2: case BFC_THUMB2:
@ -944,11 +944,11 @@ DisassembleThumbInstruction (
lsbit = ((OpCode32 >> 6) & 3) | ((OpCode >> 10) & 0x1c); lsbit = ((OpCode32 >> 6) & 3) | ((OpCode >> 10) & 0x1c);
if ((Rn == 0xf) & (AsciiStrCmp (gOpThumb2[Index].Start, "BFC") == 0)){ if ((Rn == 0xf) & (AsciiStrCmp (gOpThumb2[Index].Start, "BFC") == 0)){
// BFC <Rd>, #<lsb>, #<width> // BFC <Rd>, #<lsb>, #<width>
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #%d, #%d", gReg[Rd], lsbit, msbit - lsbit + 1); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, #%d, #%d", gReg[Rd], lsbit, msbit - lsbit + 1);
} else if (AsciiStrCmp (gOpThumb2[Index].Start, "BFI") == 0) { } else if (AsciiStrCmp (gOpThumb2[Index].Start, "BFI") == 0) {
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #%d, #%d", gReg[Rd], gReg[Rn], lsbit, msbit - lsbit + 1); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #%d, #%d", gReg[Rd], gReg[Rn], lsbit, msbit - lsbit + 1);
} else { } else {
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #%d, #%d", gReg[Rd], gReg[Rn], lsbit, msbit + 1); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, #%d, #%d", gReg[Rd], gReg[Rn], lsbit, msbit + 1);
} }
return; return;
@ -977,7 +977,7 @@ DisassembleThumbInstruction (
if (opc2 != 0) { if (opc2 != 0) {
AsciiSPrint (&Buf[Offset], Size - Offset, ",#%d,", opc2); AsciiSPrint (&Buf[Offset], Size - Offset, ",#%d,", opc2);
} }
return; return;
case MRRC_THUMB2: case MRRC_THUMB2:
// MRC <coproc>,<opc1>,<Rt>,<Rt2>,<CRm>,<opc2> // MRC <coproc>,<opc1>,<Rt>,<Rt2>,<CRm>,<opc2>
@ -986,7 +986,7 @@ DisassembleThumbInstruction (
CRn = (OpCode32 >> 16) & 0xf; CRn = (OpCode32 >> 16) & 0xf;
CRm = OpCode32 & 0xf; CRm = OpCode32 & 0xf;
Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " p%d,#%d,%a,%a,c%d", coproc, opc1, gReg[Rt], gReg[Rt2], CRm); Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " p%d,#%d,%a,%a,c%d", coproc, opc1, gReg[Rt], gReg[Rt2], CRm);
return; return;
case THUMB2_2REGS: case THUMB2_2REGS:
// <Rd>, <Rm> // <Rd>, <Rm>
@ -1002,7 +1002,7 @@ DisassembleThumbInstruction (
// MRS <Rd>, CPSR // MRS <Rd>, CPSR
AsciiSPrint (&Buf[Offset], Size - Offset, " %a, CPSR", gReg[Rd]); AsciiSPrint (&Buf[Offset], Size - Offset, " %a, CPSR", gReg[Rd]);
return; return;
case THUMB2_MSR: case THUMB2_MSR:
// MRS CPSR_<fields>, <Rd> // MRS CPSR_<fields>, <Rd>
Target = (OpCode32 >> 10) & 3; Target = (OpCode32 >> 10) & 3;
@ -1031,19 +1031,19 @@ DisassembleArmInstruction (
/** /**
Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to Place a dissasembly of of **OpCodePtr into buffer, and update OpCodePtr to
point to next instructin. point to next instructin.
We cheat and only decode instructions that access We cheat and only decode instructions that access
memory. If the instruction is not found we dump the instruction in hex. 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 Thumb TRUE for Thumb(2), FALSE for ARM instruction stream
@param Extended TRUE dump hex for instruction too. @param Extended TRUE dump hex for instruction too.
@param ItBlock Size of IT Block @param ItBlock Size of IT Block
@param Buf Buffer to sprintf disassembly into. @param Buf Buffer to sprintf disassembly into.
@param Size Size of Buf in bytes. @param Size Size of Buf in bytes.
**/ **/
VOID VOID
DisassembleInstruction ( DisassembleInstruction (
@ -1061,4 +1061,4 @@ DisassembleInstruction (
DisassembleArmInstruction ((UINT32 **)OpCodePtr, Buf, Size, Extended); DisassembleArmInstruction ((UINT32 **)OpCodePtr, Buf, Size, Extended);
} }
} }

76
ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
View File

@ -2,7 +2,7 @@
Generic ARM implementation of DmaLib.h Generic ARM implementation of DmaLib.h
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -39,25 +39,25 @@ typedef struct {
EFI_CPU_ARCH_PROTOCOL *gCpu; EFI_CPU_ARCH_PROTOCOL *gCpu;
UINTN gCacheAlignment = 0; UINTN gCacheAlignment = 0;
/** /**
Provides the DMA controller-specific addresses needed to access system memory. Provides the DMA controller-specific addresses needed to access system memory.
Operation is relative to the DMA bus master. Operation is relative to the DMA bus master.
@param Operation Indicates if the bus master is going to read or write to system memory. @param Operation Indicates if the bus master is going to read or write to system memory.
@param HostAddress The system memory address to map to the DMA controller. @param HostAddress The system memory address to map to the DMA controller.
@param NumberOfBytes On input the number of bytes to map. On output the number of bytes @param NumberOfBytes On input the number of bytes to map. On output the number of bytes
that were mapped. that were mapped.
@param DeviceAddress The resulting map address for the bus master controller to use to @param DeviceAddress The resulting map address for the bus master controller to use to
access the hosts HostAddress. access the hosts HostAddress.
@param Mapping A resulting value to pass to Unmap(). @param Mapping A resulting value to pass to Unmap().
@retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes. @retval EFI_SUCCESS The range was mapped for the returned NumberOfBytes.
@retval EFI_UNSUPPORTED The HostAddress cannot be mapped as a common buffer. @retval EFI_UNSUPPORTED The HostAddress cannot be mapped as a common buffer.
@retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
@retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources. @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
@retval EFI_DEVICE_ERROR The system hardware could not map the requested address. @retval EFI_DEVICE_ERROR The system hardware could not map the requested address.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -89,7 +89,7 @@ DmaMap (
if (Map == NULL) { if (Map == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
*Mapping = Map; *Mapping = Map;
if ((((UINTN)HostAddress & (gCacheAlignment - 1)) != 0) || if ((((UINTN)HostAddress & (gCacheAlignment - 1)) != 0) ||
@ -145,15 +145,15 @@ DmaMap (
} }
/** /**
Completes the DmaMapBusMasterRead(), DmaMapBusMasterWrite(), or DmaMapBusMasterCommonBuffer() Completes the DmaMapBusMasterRead(), DmaMapBusMasterWrite(), or DmaMapBusMasterCommonBuffer()
operation and releases any corresponding resources. operation and releases any corresponding resources.
@param Mapping The mapping value returned from DmaMap*(). @param Mapping The mapping value returned from DmaMap*().
@retval EFI_SUCCESS The range was unmapped. @retval EFI_SUCCESS The range was unmapped.
@retval EFI_DEVICE_ERROR The data was not committed to the target system memory. @retval EFI_DEVICE_ERROR The data was not committed to the target system memory.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -162,21 +162,21 @@ DmaUnmap (
) )
{ {
MAP_INFO_INSTANCE *Map; MAP_INFO_INSTANCE *Map;
if (Mapping == NULL) { if (Mapping == NULL) {
ASSERT (FALSE); ASSERT (FALSE);
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
Map = (MAP_INFO_INSTANCE *)Mapping; Map = (MAP_INFO_INSTANCE *)Mapping;
if (Map->DoubleBuffer) { if (Map->DoubleBuffer) {
if ((Map->Operation == MapOperationBusMasterWrite) || (Map->Operation == MapOperationBusMasterCommonBuffer)) { if ((Map->Operation == MapOperationBusMasterWrite) || (Map->Operation == MapOperationBusMasterCommonBuffer)) {
CopyMem ((VOID *)(UINTN)Map->HostAddress, (VOID *)(UINTN)Map->DeviceAddress, Map->NumberOfBytes); CopyMem ((VOID *)(UINTN)Map->HostAddress, (VOID *)(UINTN)Map->DeviceAddress, Map->NumberOfBytes);
} }
DmaFreeBuffer (EFI_SIZE_TO_PAGES (Map->NumberOfBytes), (VOID *)(UINTN)Map->DeviceAddress); DmaFreeBuffer (EFI_SIZE_TO_PAGES (Map->NumberOfBytes), (VOID *)(UINTN)Map->DeviceAddress);
} else { } else {
if (Map->Operation == MapOperationBusMasterWrite) { if (Map->Operation == MapOperationBusMasterWrite) {
// //
@ -185,28 +185,28 @@ DmaUnmap (
gCpu->FlushDataCache (gCpu, Map->HostAddress, Map->NumberOfBytes, EfiCpuFlushTypeInvalidate); gCpu->FlushDataCache (gCpu, Map->HostAddress, Map->NumberOfBytes, EfiCpuFlushTypeInvalidate);
} }
} }
FreePool (Map); FreePool (Map);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/** /**
Allocates pages that are suitable for an DmaMap() of type MapOperationBusMasterCommonBuffer. Allocates pages that are suitable for an DmaMap() of type MapOperationBusMasterCommonBuffer.
mapping. mapping.
@param MemoryType The type of memory to allocate, EfiBootServicesData or @param MemoryType The type of memory to allocate, EfiBootServicesData or
EfiRuntimeServicesData. EfiRuntimeServicesData.
@param Pages The number of pages to allocate. @param Pages The number of pages to allocate.
@param HostAddress A pointer to store the base system memory address of the @param HostAddress A pointer to store the base system memory address of the
allocated range. allocated range.
@retval EFI_SUCCESS The requested memory pages were allocated. @retval EFI_SUCCESS The requested memory pages were allocated.
@retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are
MEMORY_WRITE_COMBINE and MEMORY_CACHED. MEMORY_WRITE_COMBINE and MEMORY_CACHED.
@retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
@retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -237,16 +237,16 @@ DmaAllocateBuffer (
} }
/** /**
Frees memory that was allocated with DmaAllocateBuffer(). Frees memory that was allocated with DmaAllocateBuffer().
@param Pages The number of pages to free. @param Pages The number of pages to free.
@param HostAddress The base system memory address of the allocated range. @param HostAddress The base system memory address of the allocated range.
@retval EFI_SUCCESS The requested memory pages were freed. @retval EFI_SUCCESS The requested memory pages were freed.
@retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages
was not allocated with DmaAllocateBuffer(). was not allocated with DmaAllocateBuffer().
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -257,8 +257,8 @@ DmaFreeBuffer (
{ {
if (HostAddress == NULL) { if (HostAddress == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
UncachedFreePages (HostAddress, Pages); UncachedFreePages (HostAddress, Pages);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -278,7 +278,7 @@ ArmDmaLibConstructor (
ASSERT_EFI_ERROR(Status); ASSERT_EFI_ERROR(Status);
gCacheAlignment = ArmDataCacheLineLength (); gCacheAlignment = ArmDataCacheLineLength ();
return Status; return Status;
} }

20
ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
View File

@ -1,14 +1,14 @@
#/** @file #/** @file
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
[Defines] [Defines]
@ -17,7 +17,7 @@
FILE_GUID = F1BD6B36-B705-43aa-8A28-33F58ED85EFB FILE_GUID = F1BD6B36-B705-43aa-8A28-33F58ED85EFB
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = DmaLib LIBRARY_CLASS = DmaLib
CONSTRUCTOR = ArmDmaLibConstructor CONSTRUCTOR = ArmDmaLibConstructor
[Sources.common] [Sources.common]
@ -27,7 +27,7 @@
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
EmbeddedPkg/EmbeddedPkg.dec EmbeddedPkg/EmbeddedPkg.dec
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec
[LibraryClasses] [LibraryClasses]
DebugLib DebugLib
@ -37,14 +37,14 @@
IoLib IoLib
BaseMemoryLib BaseMemoryLib
ArmLib ArmLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid
[Guids] [Guids]
[Pcd] [Pcd]
[Depex] [Depex]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

2
ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at

6
ArmPkg/Library/ArmLib/Arm11/Arm11Lib.inf
View File

@ -25,11 +25,11 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
Arm11Support.S | GCC Arm11Support.S | GCC
Arm11Support.asm | RVCT Arm11Support.asm | RVCT
Arm11Lib.c Arm11Lib.c
Arm11LibMem.c Arm11LibMem.c
../Arm9/Arm9CacheInformation.c ../Arm9/Arm9CacheInformation.c
@ -39,7 +39,7 @@
[LibraryClasses] [LibraryClasses]
MemoryAllocationLib MemoryAllocationLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

14
ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2013, ARM Limited. All rights reserved. Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -29,7 +29,7 @@ FillTranslationTable (
UINTN Index; UINTN Index;
UINT32 Attributes; UINT32 Attributes;
UINT32 PhysicalBase = MemoryRegion->PhysicalBase; UINT32 PhysicalBase = MemoryRegion->PhysicalBase;
switch (MemoryRegion->Attributes) { switch (MemoryRegion->Attributes) {
case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK: case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:
Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK(0); Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK(0);
@ -53,10 +53,10 @@ FillTranslationTable (
Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0); Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0);
break; break;
} }
Entry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase); Entry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase);
Sections = ((( MemoryRegion->Length - 1 ) / TT_DESCRIPTOR_SECTION_SIZE ) + 1 ); Sections = ((( MemoryRegion->Length - 1 ) / TT_DESCRIPTOR_SECTION_SIZE ) + 1 );
for (Index = 0; Index < Sections; Index++) for (Index = 0; Index < Sections; Index++)
{ {
*Entry++ = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes; *Entry++ = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes;
@ -84,7 +84,7 @@ ArmConfigureMmu (
if (TranslationTableBase != NULL) { if (TranslationTableBase != NULL) {
*TranslationTableBase = TranslationTable; *TranslationTableBase = TranslationTable;
} }
if (TranslationTableBase != NULL) { if (TranslationTableBase != NULL) {
*TranslationTableSize = TRANSLATION_TABLE_SIZE; *TranslationTableSize = TRANSLATION_TABLE_SIZE;
} }
@ -109,7 +109,7 @@ ArmConfigureMmu (
} }
ArmSetTTBR0(TranslationTable); ArmSetTTBR0(TranslationTable);
ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) | ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) |
DOMAIN_ACCESS_CONTROL_NONE(14) | DOMAIN_ACCESS_CONTROL_NONE(14) |
DOMAIN_ACCESS_CONTROL_NONE(13) | DOMAIN_ACCESS_CONTROL_NONE(13) |
@ -126,7 +126,7 @@ ArmConfigureMmu (
DOMAIN_ACCESS_CONTROL_NONE( 2) | DOMAIN_ACCESS_CONTROL_NONE( 2) |
DOMAIN_ACCESS_CONTROL_NONE( 1) | DOMAIN_ACCESS_CONTROL_NONE( 1) |
DOMAIN_ACCESS_CONTROL_MANAGER(0)); DOMAIN_ACCESS_CONTROL_MANAGER(0));
ArmEnableInstructionCache(); ArmEnableInstructionCache();
ArmEnableDataCache(); ArmEnableDataCache();
ArmEnableMmu(); ArmEnableMmu();

6
ArmPkg/Library/ArmLib/Arm11/Arm11LibPrePi.inf
View File

@ -25,11 +25,11 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
Arm11Support.S | GCC Arm11Support.S | GCC
Arm11Support.asm | RVCT Arm11Support.asm | RVCT
Arm11Lib.c Arm11Lib.c
Arm11LibMem.c Arm11LibMem.c
../Arm9/Arm9CacheInformation.c ../Arm9/Arm9CacheInformation.c
@ -39,7 +39,7 @@
[LibraryClasses] [LibraryClasses]
PrePiLib PrePiLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

4
ArmPkg/Library/ArmLib/Arm11/Arm11LibSec.inf
View File

@ -25,10 +25,10 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
Arm11Support.S | GCC Arm11Support.S | GCC
Arm11Support.asm | RVCT Arm11Support.asm | RVCT
Arm11Lib.c Arm11Lib.c
../Arm9/Arm9CacheInformation.c ../Arm9/Arm9CacheInformation.c

22
ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011, ARM Limited. All rights reserved. # Copyright (c) 2011, ARM Limited. All rights reserved.
@ -73,12 +73,12 @@ ASM_PFX(ArmInvalidateInstructionAndDataTlb):
bx lr bx lr
ASM_PFX(ArmInvalidateDataCacheEntryByMVA): ASM_PFX(ArmInvalidateDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c6, 1 @invalidate single data cache line mcr p15, 0, r0, c7, c6, 1 @invalidate single data cache line
bx lr bx lr
ASM_PFX(ArmCleanDataCacheEntryByMVA): ASM_PFX(ArmCleanDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c10, 1 @clean single data cache line mcr p15, 0, r0, c7, c10, 1 @clean single data cache line
bx lr bx lr
@ -135,7 +135,7 @@ ASM_PFX(ArmEnableDataCache):
orr R0,R0,R1 @Set C bit orr R0,R0,R1 @Set C bit
mcr p15,0,r0,c1,c0,0 @Write control register configuration data mcr p15,0,r0,c1,c0,0 @Write control register configuration data
bx LR bx LR
ASM_PFX(ArmDisableDataCache): ASM_PFX(ArmDisableDataCache):
LoadConstantToReg(DC_ON, R1) @ldr R1,=DC_ON LoadConstantToReg(DC_ON, R1) @ldr R1,=DC_ON
mrc p15,0,R0,c1,c0,0 @Read control register configuration data mrc p15,0,R0,c1,c0,0 @Read control register configuration data
@ -149,7 +149,7 @@ ASM_PFX(ArmEnableInstructionCache):
orr R0,R0,R1 @Set I bit orr R0,R0,R1 @Set I bit
mcr p15,0,r0,c1,c0,0 @Write control register configuration data mcr p15,0,r0,c1,c0,0 @Write control register configuration data
bx LR bx LR
ASM_PFX(ArmDisableInstructionCache): ASM_PFX(ArmDisableInstructionCache):
ldr R1,=IC_ON ldr R1,=IC_ON
mrc p15,0,R0,c1,c0,0 @Read control register configuration data mrc p15,0,R0,c1,c0,0 @Read control register configuration data
@ -171,17 +171,17 @@ ASM_PFX(ArmDisableBranchPrediction):
ASM_PFX(ArmDataMemoryBarrier): ASM_PFX(ArmDataMemoryBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #5 mcr P15, #0, R0, C7, C10, #5
bx LR bx LR
ASM_PFX(ArmDataSyncronizationBarrier): ASM_PFX(ArmDataSyncronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #4 mcr P15, #0, R0, C7, C10, #4
bx LR bx LR
ASM_PFX(ArmInstructionSynchronizationBarrier): ASM_PFX(ArmInstructionSynchronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C5, #4 mcr P15, #0, R0, C7, C5, #4
bx LR bx LR
ASM_PFX(ArmSetLowVectors): ASM_PFX(ArmSetLowVectors):
@ -206,7 +206,7 @@ ASM_PFX(ArmIsMpCore):
cmp r0, r1 cmp r0, r1
movne r0, #0 movne r0, #0
pop { r1 } pop { r1 }
bx lr bx lr
ASM_PFX(ArmCallWFI): ASM_PFX(ArmCallWFI):
wfi wfi

20
ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
// //
@ -43,12 +43,12 @@ XP_ON EQU ( 0x1:SHL:23 )
ArmInvalidateDataCacheEntryByMVA ArmInvalidateDataCacheEntryByMVA
mcr p15, 0, r0, c7, c6, 1 ; invalidate single data cache line mcr p15, 0, r0, c7, c6, 1 ; invalidate single data cache line
bx lr bx lr
ArmCleanDataCacheEntryByMVA ArmCleanDataCacheEntryByMVA
mcr p15, 0, r0, c7, c10, 1 ; clean single data cache line mcr p15, 0, r0, c7, c10, 1 ; clean single data cache line
bx lr bx lr
@ -105,7 +105,7 @@ ArmEnableDataCache
ORR R0,R0,R1 ;Set C bit ORR R0,R0,R1 ;Set C bit
MCR p15,0,r0,c1,c0,0 ;Write control register configuration data MCR p15,0,r0,c1,c0,0 ;Write control register configuration data
BX LR BX LR
ArmDisableDataCache ArmDisableDataCache
LDR R1,=DC_ON LDR R1,=DC_ON
MRC p15,0,R0,c1,c0,0 ;Read control register configuration data MRC p15,0,R0,c1,c0,0 ;Read control register configuration data
@ -119,7 +119,7 @@ ArmEnableInstructionCache
ORR R0,R0,R1 ;Set I bit ORR R0,R0,R1 ;Set I bit
MCR p15,0,r0,c1,c0,0 ;Write control register configuration data MCR p15,0,r0,c1,c0,0 ;Write control register configuration data
BX LR BX LR
ArmDisableInstructionCache ArmDisableInstructionCache
LDR R1,=IC_ON LDR R1,=IC_ON
MRC p15,0,R0,c1,c0,0 ;Read control register configuration data MRC p15,0,R0,c1,c0,0 ;Read control register configuration data
@ -141,17 +141,17 @@ ArmDisableBranchPrediction
ASM_PFX(ArmDataMemoryBarrier): ASM_PFX(ArmDataMemoryBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #5 mcr P15, #0, R0, C7, C10, #5
bx LR bx LR
ASM_PFX(ArmDataSyncronizationBarrier): ASM_PFX(ArmDataSyncronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #4 mcr P15, #0, R0, C7, C10, #4
bx LR bx LR
ASM_PFX(ArmInstructionSynchronizationBarrier): ASM_PFX(ArmInstructionSynchronizationBarrier):
MOV R0, #0 MOV R0, #0
MCR P15, #0, R0, C7, C5, #4 MCR P15, #0, R0, C7, C5, #4
bx LR bx LR
END END

4
ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
View File

@ -28,7 +28,7 @@
Arm9Support.S | GCC Arm9Support.S | GCC
Arm9Support.asm | RVCT Arm9Support.asm | RVCT
Arm9Lib.c Arm9Lib.c
Arm9CacheInformation.c Arm9CacheInformation.c
@ -38,7 +38,7 @@
[LibraryClasses] [LibraryClasses]
MemoryAllocationLib MemoryAllocationLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

2
ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
View File

@ -28,7 +28,7 @@
Arm9Support.S | GCC Arm9Support.S | GCC
Arm9Support.asm | RVCT Arm9Support.asm | RVCT
Arm9Lib.c Arm9Lib.c
Arm9CacheInformation.c Arm9CacheInformation.c

22
ArmPkg/Library/ArmLib/Arm9/Arm9CacheInformation.c
View File

@ -56,7 +56,7 @@ ArmDataCachePresent (
default: return FALSE; default: return FALSE;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheSize ( ArmDataCacheSize (
@ -65,16 +65,16 @@ ArmDataCacheSize (
{ {
switch (DATA_CACHE_SIZE (ArmCacheInfo ())) switch (DATA_CACHE_SIZE (ArmCacheInfo ()))
{ {
case CACHE_SIZE_4_KB: return 4 * 1024; case CACHE_SIZE_4_KB: return 4 * 1024;
case CACHE_SIZE_8_KB: return 8 * 1024; case CACHE_SIZE_8_KB: return 8 * 1024;
case CACHE_SIZE_16_KB: return 16 * 1024; case CACHE_SIZE_16_KB: return 16 * 1024;
case CACHE_SIZE_32_KB: return 32 * 1024; case CACHE_SIZE_32_KB: return 32 * 1024;
case CACHE_SIZE_64_KB: return 64 * 1024; case CACHE_SIZE_64_KB: return 64 * 1024;
case CACHE_SIZE_128_KB: return 128 * 1024; case CACHE_SIZE_128_KB: return 128 * 1024;
default: return 0; default: return 0;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheAssociativity ( ArmDataCacheAssociativity (
@ -88,7 +88,7 @@ ArmDataCacheAssociativity (
default: return 0; default: return 0;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheLineLength ( ArmDataCacheLineLength (
@ -101,7 +101,7 @@ ArmDataCacheLineLength (
default: return 0; default: return 0;
} }
} }
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmInstructionCachePresent ( ArmInstructionCachePresent (
@ -115,7 +115,7 @@ ArmInstructionCachePresent (
default: return FALSE; default: return FALSE;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheSize ( ArmInstructionCacheSize (
@ -124,16 +124,16 @@ ArmInstructionCacheSize (
{ {
switch (INSTRUCTION_CACHE_SIZE (ArmCacheInfo ())) switch (INSTRUCTION_CACHE_SIZE (ArmCacheInfo ()))
{ {
case CACHE_SIZE_4_KB: return 4 * 1024; case CACHE_SIZE_4_KB: return 4 * 1024;
case CACHE_SIZE_8_KB: return 8 * 1024; case CACHE_SIZE_8_KB: return 8 * 1024;
case CACHE_SIZE_16_KB: return 16 * 1024; case CACHE_SIZE_16_KB: return 16 * 1024;
case CACHE_SIZE_32_KB: return 32 * 1024; case CACHE_SIZE_32_KB: return 32 * 1024;
case CACHE_SIZE_64_KB: return 64 * 1024; case CACHE_SIZE_64_KB: return 64 * 1024;
case CACHE_SIZE_128_KB: return 128 * 1024; case CACHE_SIZE_128_KB: return 128 * 1024;
default: return 0; default: return 0;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheAssociativity ( ArmInstructionCacheAssociativity (
@ -148,7 +148,7 @@ ArmInstructionCacheAssociativity (
default: return 0; default: return 0;
} }
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheLineLength ( ArmInstructionCacheLineLength (

16
ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2013, ARM Limited. All rights reserved. Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -30,7 +30,7 @@ FillTranslationTable (
UINTN Index; UINTN Index;
UINT32 Attributes; UINT32 Attributes;
UINT32 PhysicalBase = MemoryRegion->PhysicalBase; UINT32 PhysicalBase = MemoryRegion->PhysicalBase;
switch (MemoryRegion->Attributes) { switch (MemoryRegion->Attributes) {
case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK: case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:
Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK; Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK;
@ -49,13 +49,13 @@ FillTranslationTable (
Attributes = TT_DESCRIPTOR_SECTION_UNCACHED_UNBUFFERED; Attributes = TT_DESCRIPTOR_SECTION_UNCACHED_UNBUFFERED;
break; break;
} }
Entry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase); Entry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase);
Sections = MemoryRegion->Length / TT_DESCRIPTOR_SECTION_SIZE; Sections = MemoryRegion->Length / TT_DESCRIPTOR_SECTION_SIZE;
// The current code does not support memory region size that is not aligned on TT_DESCRIPTOR_SECTION_SIZE boundary // The current code does not support memory region size that is not aligned on TT_DESCRIPTOR_SECTION_SIZE boundary
ASSERT (MemoryRegion->Length % TT_DESCRIPTOR_SECTION_SIZE == 0); ASSERT (MemoryRegion->Length % TT_DESCRIPTOR_SECTION_SIZE == 0);
for (Index = 0; Index < Sections; Index++) for (Index = 0; Index < Sections; Index++)
{ {
*Entry++ = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes; *Entry++ = TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes;
@ -83,7 +83,7 @@ ArmConfigureMmu (
if (TranslationTableBase != NULL) { if (TranslationTableBase != NULL) {
*TranslationTableBase = TranslationTable; *TranslationTableBase = TranslationTable;
} }
if (TranslationTableBase != NULL) { if (TranslationTableBase != NULL) {
*TranslationTableSize = TRANSLATION_TABLE_SIZE; *TranslationTableSize = TRANSLATION_TABLE_SIZE;
} }
@ -108,7 +108,7 @@ ArmConfigureMmu (
} }
ArmSetTTBR0(TranslationTable); ArmSetTTBR0(TranslationTable);
ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) | ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) |
DOMAIN_ACCESS_CONTROL_NONE(14) | DOMAIN_ACCESS_CONTROL_NONE(14) |
DOMAIN_ACCESS_CONTROL_NONE(13) | DOMAIN_ACCESS_CONTROL_NONE(13) |
@ -125,7 +125,7 @@ ArmConfigureMmu (
DOMAIN_ACCESS_CONTROL_NONE( 2) | DOMAIN_ACCESS_CONTROL_NONE( 2) |
DOMAIN_ACCESS_CONTROL_NONE( 1) | DOMAIN_ACCESS_CONTROL_NONE( 1) |
DOMAIN_ACCESS_CONTROL_MANAGER(0)); DOMAIN_ACCESS_CONTROL_MANAGER(0));
ArmEnableInstructionCache(); ArmEnableInstructionCache();
ArmEnableDataCache(); ArmEnableDataCache();
ArmEnableMmu(); ArmEnableMmu();

20
ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
# #
@ -41,11 +41,11 @@ GCC_ASM_EXPORT(ArmInstructionSynchronizationBarrier)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
ASM_PFX(ArmInvalidateDataCacheEntryByMVA): ASM_PFX(ArmInvalidateDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c6, 1 @ invalidate single data cache line mcr p15, 0, r0, c7, c6, 1 @ invalidate single data cache line
bx lr bx lr
ASM_PFX(ArmCleanDataCacheEntryByMVA): ASM_PFX(ArmCleanDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c10, 1 @ clean single data cache line mcr p15, 0, r0, c7, c10, 1 @ clean single data cache line
bx lr bx lr
ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA): ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA):
@ -58,17 +58,17 @@ ASM_PFX(ArmEnableInstructionCache):
orr r0,r0,r1 @Set I bit orr r0,r0,r1 @Set I bit
mcr p15,0,r0,c1,c0,0 @Write control register configuration data mcr p15,0,r0,c1,c0,0 @Write control register configuration data
bx LR bx LR
ASM_PFX(ArmDisableInstructionCache): ASM_PFX(ArmDisableInstructionCache):
ldr r1,=IC_ON ldr r1,=IC_ON
mrc p15,0,r0,c1,c0,0 @Read control register configuration data mrc p15,0,r0,c1,c0,0 @Read control register configuration data
bic r0,r0,r1 @Clear I bit. bic r0,r0,r1 @Clear I bit.
mcr p15,0,r0,c1,c0,0 @Write control register configuration data mcr p15,0,r0,c1,c0,0 @Write control register configuration data
bx LR bx LR
ASM_PFX(ArmInvalidateInstructionCache): ASM_PFX(ArmInvalidateInstructionCache):
mov r0,#0 mov r0,#0
mcr p15,0,r0,c7,c5,0 @Invalidate entire Instruction cache. mcr p15,0,r0,c7,c5,0 @Invalidate entire Instruction cache.
@Also flushes the branch target cache. @Also flushes the branch target cache.
mov r0,#0 mov r0,#0
mcr p15,0,r0,c7,c10,4 @Data write buffer mcr p15,0,r0,c7,c10,4 @Data write buffer
@ -99,7 +99,7 @@ ASM_PFX(ArmEnableDataCache):
orr R0,R0,R1 @Set C bit orr R0,R0,R1 @Set C bit
mcr p15,0,r0,c1,c0,0 @Write control register configuration data mcr p15,0,r0,c1,c0,0 @Write control register configuration data
bx LR bx LR
ASM_PFX(ArmDisableDataCache): ASM_PFX(ArmDisableDataCache):
ldr R1,=DC_ON ldr R1,=DC_ON
mrc p15,0,R0,c1,c0,0 @Read control register configuration data mrc p15,0,R0,c1,c0,0 @Read control register configuration data
@ -113,7 +113,7 @@ ASM_PFX(ArmCleanDataCache):
mov R0,#0 mov R0,#0
mcr p15,0,R0,c7,c10,4 @Drain write buffer mcr p15,0,R0,c7,c10,4 @Drain write buffer
bx LR bx LR
ASM_PFX(ArmInvalidateDataCache): ASM_PFX(ArmInvalidateDataCache):
mov R0,#0 mov R0,#0
mcr p15,0,R0,c7,c6,0 @Invalidate entire data cache mcr p15,0,R0,c7,c6,0 @Invalidate entire data cache
@ -138,12 +138,12 @@ ASM_PFX(ArmDataMemoryBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #5 @ check if this is OK? mcr P15, #0, R0, C7, C10, #5 @ check if this is OK?
bx LR bx LR
ASM_PFX(ArmDataSyncronizationBarrier): ASM_PFX(ArmDataSyncronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #4 @ check if this is OK? mcr P15, #0, R0, C7, C10, #4 @ check if this is OK?
bx LR bx LR
ASM_PFX(ArmInstructionSynchronizationBarrier): ASM_PFX(ArmInstructionSynchronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C5, #4 @ check if this is OK? mcr P15, #0, R0, C7, C5, #4 @ check if this is OK?

16
ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
// //
@ -41,12 +41,12 @@ IC_ON EQU ( 0x1:SHL:12 )
ArmInvalidateDataCacheEntryByMVA ArmInvalidateDataCacheEntryByMVA
MCR p15, 0, r0, c7, c6, 1 ; invalidate single data cache line MCR p15, 0, r0, c7, c6, 1 ; invalidate single data cache line
BX lr BX lr
ArmCleanDataCacheEntryByMVA ArmCleanDataCacheEntryByMVA
MCR p15, 0, r0, c7, c10, 1 ; clean single data cache line MCR p15, 0, r0, c7, c10, 1 ; clean single data cache line
BX lr BX lr
@ -60,7 +60,7 @@ ArmEnableInstructionCache
ORR R0,R0,R1 ;Set I bit ORR R0,R0,R1 ;Set I bit
MCR p15,0,r0,c1,c0,0 ;Write control register configuration data MCR p15,0,r0,c1,c0,0 ;Write control register configuration data
BX LR BX LR
ArmDisableInstructionCache ArmDisableInstructionCache
LDR R1,=IC_ON LDR R1,=IC_ON
MRC p15,0,R0,c1,c0,0 ;Read control register configuration data MRC p15,0,R0,c1,c0,0 ;Read control register configuration data
@ -100,7 +100,7 @@ ArmEnableDataCache
ORR R0,R0,R1 ;Set C bit ORR R0,R0,R1 ;Set C bit
MCR p15,0,r0,c1,c0,0 ;Write control register configuration data MCR p15,0,r0,c1,c0,0 ;Write control register configuration data
BX LR BX LR
ArmDisableDataCache ArmDisableDataCache
LDR R1,=DC_ON LDR R1,=DC_ON
MRC p15,0,R0,c1,c0,0 ;Read control register configuration data MRC p15,0,R0,c1,c0,0 ;Read control register configuration data
@ -121,7 +121,7 @@ ArmInvalidateDataCache
MOV R0,#0 MOV R0,#0
MCR p15,0,R0,c7,c10,4 ;Drain write buffer MCR p15,0,R0,c7,c10,4 ;Drain write buffer
BX LR BX LR
ArmCleanInvalidateDataCache ArmCleanInvalidateDataCache
MRC p15,0,r15,c7,c14,3 MRC p15,0,r15,c7,c14,3
BNE ArmCleanInvalidateDataCache BNE ArmCleanInvalidateDataCache
@ -139,12 +139,12 @@ ASM_PFX(ArmDataMemoryBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #5 ; Check to see if this is correct mcr P15, #0, R0, C7, C10, #5 ; Check to see if this is correct
bx LR bx LR
ASM_PFX(ArmDataSyncronizationBarrier): ASM_PFX(ArmDataSyncronizationBarrier):
mov R0, #0 mov R0, #0
mcr P15, #0, R0, C7, C10, #4 ; Check to see if this is correct mcr P15, #0, R0, C7, C10, #4 ; Check to see if this is correct
bx LR bx LR
ASM_PFX(ArmInstructionSynchronizationBarrier): ASM_PFX(ArmInstructionSynchronizationBarrier):
MOV R0, #0 MOV R0, #0
MCR P15, #0, R0, C7, C5, #4 ; Check to see if this is correct MCR P15, #0, R0, C7, C5, #4 ; Check to see if this is correct

14
ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011-2013, ARM Limited. All rights reserved. # Copyright (c) 2011-2013, ARM Limited. All rights reserved.
@ -81,21 +81,21 @@ ASM_PFX(ArmDisableInterrupts):
cpsid if cpsid if
isb isb
bx LR bx LR
// UINT32 // UINT32
// ReadCCSIDR ( // ReadCCSIDR (
// IN UINT32 CSSELR // IN UINT32 CSSELR
// ) // )
ASM_PFX(ReadCCSIDR): ASM_PFX(ReadCCSIDR):
mcr p15,2,r0,c0,c0,0 @ Write Cache Size Selection Register (CSSELR) mcr p15,2,r0,c0,c0,0 @ Write Cache Size Selection Register (CSSELR)
isb isb
mrc p15,1,r0,c0,c0,0 @ Read current CP15 Cache Size ID Register (CCSIDR) mrc p15,1,r0,c0,c0,0 @ Read current CP15 Cache Size ID Register (CCSIDR)
bx lr bx lr
// UINT32 // UINT32
// ReadCLIDR ( // ReadCLIDR (
// IN UINT32 CSSELR // IN UINT32 CSSELR
// ) // )
ASM_PFX(ReadCLIDR): ASM_PFX(ReadCLIDR):
mrc p15,1,r0,c0,c0,1 @ Read CP15 Cache Level ID Register mrc p15,1,r0,c0,c0,1 @ Read CP15 Cache Level ID Register
bx lr bx lr

14
ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
// Copyright (c) 2011-2013, ARM Limited. All rights reserved. // Copyright (c) 2011-2013, ARM Limited. All rights reserved.
@ -80,21 +80,21 @@ ArmDisableInterrupts
cpsid if cpsid if
isb isb
bx LR bx LR
// UINT32 // UINT32
// ReadCCSIDR ( // ReadCCSIDR (
// IN UINT32 CSSELR // IN UINT32 CSSELR
// ) // )
ReadCCSIDR ReadCCSIDR
mcr p15,2,r0,c0,c0,0 ; Write Cache Size Selection Register (CSSELR) mcr p15,2,r0,c0,c0,0 ; Write Cache Size Selection Register (CSSELR)
isb isb
mrc p15,1,r0,c0,c0,0 ; Read current CP15 Cache Size ID Register (CCSIDR) mrc p15,1,r0,c0,c0,0 ; Read current CP15 Cache Size ID Register (CCSIDR)
bx lr bx lr
// UINT32 // UINT32
// ReadCLIDR ( // ReadCLIDR (
// IN UINT32 CSSELR // IN UINT32 CSSELR
// ) // )
ReadCLIDR ReadCLIDR
mrc p15,1,r0,c0,c0,1 ; Read CP15 Cache Level ID Register mrc p15,1,r0,c0,c0,1 ; Read CP15 Cache Level ID Register
bx lr bx lr

14
ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c
View File

@ -1,14 +1,14 @@
/** @file /** @file
* *
* Copyright (c) 2011 - 2014, ARM Limited. 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
* http://opensource.org/licenses/bsd-license.php
* *
* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * 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.
* *
**/ **/

2
ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2011, ARM Limited. All rights reserved. # Copyright (c) 2011, ARM Limited. All rights reserved.
# #

2
ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2011, ARM Limited. All rights reserved. // Copyright (c) 2011, ARM Limited. All rights reserved.
// //

48
ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -47,7 +47,7 @@ ArmDataCachePresent (
) )
{ {
UINT32 CLIDR = ReadCLIDR (); UINT32 CLIDR = ReadCLIDR ();
if ((CLIDR & 0x2) == 0x2) { if ((CLIDR & 0x2) == 0x2) {
// Instruction cache exists // Instruction cache exists
return TRUE; return TRUE;
@ -56,10 +56,10 @@ ArmDataCachePresent (
// Unified cache // Unified cache
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheSize ( ArmDataCacheSize (
@ -70,15 +70,15 @@ ArmDataCacheSize (
UINT32 Associativity; UINT32 Associativity;
UINT32 LineSize; UINT32 LineSize;
UINT32 CCSIDR = ReadCCSIDR (0); UINT32 CCSIDR = ReadCCSIDR (0);
LineSize = (1 << ((CCSIDR & 0x7) + 2)); LineSize = (1 << ((CCSIDR & 0x7) + 2));
Associativity = ((CCSIDR >> 3) & 0x3ff) + 1; Associativity = ((CCSIDR >> 3) & 0x3ff) + 1;
NumSets = ((CCSIDR >> 13) & 0x7fff) + 1; NumSets = ((CCSIDR >> 13) & 0x7fff) + 1;
// LineSize is in words (4 byte chunks) // LineSize is in words (4 byte chunks)
return NumSets * Associativity * LineSize * 4; return NumSets * Associativity * LineSize * 4;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheAssociativity ( ArmDataCacheAssociativity (
@ -89,14 +89,14 @@ ArmDataCacheAssociativity (
return ((CCSIDR >> 3) & 0x3ff) + 1; return ((CCSIDR >> 3) & 0x3ff) + 1;
} }
UINTN UINTN
ArmDataCacheSets ( ArmDataCacheSets (
VOID VOID
) )
{ {
UINT32 CCSIDR = ReadCCSIDR (0); UINT32 CCSIDR = ReadCCSIDR (0);
return ((CCSIDR >> 13) & 0x7fff) + 1; return ((CCSIDR >> 13) & 0x7fff) + 1;
} }
@ -111,7 +111,7 @@ ArmDataCacheLineLength (
// * 4 converts to bytes // * 4 converts to bytes
return (1 << (CCSIDR + 2)) * 4; return (1 << (CCSIDR + 2)) * 4;
} }
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmInstructionCachePresent ( ArmInstructionCachePresent (
@ -119,7 +119,7 @@ ArmInstructionCachePresent (
) )
{ {
UINT32 CLIDR = ReadCLIDR (); UINT32 CLIDR = ReadCLIDR ();
if ((CLIDR & 1) == 1) { if ((CLIDR & 1) == 1) {
// Instruction cache exists // Instruction cache exists
return TRUE; return TRUE;
@ -128,10 +128,10 @@ ArmInstructionCachePresent (
// Unified cache // Unified cache
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheSize ( ArmInstructionCacheSize (
@ -142,15 +142,15 @@ ArmInstructionCacheSize (
UINT32 Associativity; UINT32 Associativity;
UINT32 LineSize; UINT32 LineSize;
UINT32 CCSIDR = ReadCCSIDR (1); UINT32 CCSIDR = ReadCCSIDR (1);
LineSize = (1 << ((CCSIDR & 0x7) + 2)); LineSize = (1 << ((CCSIDR & 0x7) + 2));
Associativity = ((CCSIDR >> 3) & 0x3ff) + 1; Associativity = ((CCSIDR >> 3) & 0x3ff) + 1;
NumSets = ((CCSIDR >> 13) & 0x7fff) + 1; NumSets = ((CCSIDR >> 13) & 0x7fff) + 1;
// LineSize is in words (4 byte chunks) // LineSize is in words (4 byte chunks)
return NumSets * Associativity * LineSize * 4; return NumSets * Associativity * LineSize * 4;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheAssociativity ( ArmInstructionCacheAssociativity (
@ -162,7 +162,7 @@ ArmInstructionCacheAssociativity (
return ((CCSIDR >> 3) & 0x3ff) + 1; return ((CCSIDR >> 3) & 0x3ff) + 1;
// return 4; // return 4;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheSets ( ArmInstructionCacheSets (
@ -170,7 +170,7 @@ ArmInstructionCacheSets (
) )
{ {
UINT32 CCSIDR = ReadCCSIDR (1); UINT32 CCSIDR = ReadCCSIDR (1);
return ((CCSIDR >> 13) & 0x7fff) + 1; return ((CCSIDR >> 13) & 0x7fff) + 1;
} }
@ -198,11 +198,11 @@ ArmV7DataCacheOperation (
SavedInterruptState = ArmGetInterruptState (); SavedInterruptState = ArmGetInterruptState ();
ArmDisableInterrupts (); ArmDisableInterrupts ();
ArmV7AllDataCachesOperation (DataCacheOperation); ArmV7AllDataCachesOperation (DataCacheOperation);
ArmDrainWriteBuffer (); ArmDrainWriteBuffer ();
if (SavedInterruptState) { if (SavedInterruptState) {
ArmEnableInterrupts (); ArmEnableInterrupts ();
} }
@ -218,11 +218,11 @@ ArmV7PoUDataCacheOperation (
SavedInterruptState = ArmGetInterruptState (); SavedInterruptState = ArmGetInterruptState ();
ArmDisableInterrupts (); ArmDisableInterrupts ();
ArmV7PerformPoUDataCacheOperation (DataCacheOperation); ArmV7PerformPoUDataCacheOperation (DataCacheOperation);
ArmDrainWriteBuffer (); ArmDrainWriteBuffer ();
if (SavedInterruptState) { if (SavedInterruptState) {
ArmEnableInterrupts (); ArmEnableInterrupts ();
} }

2
ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
View File

@ -27,6 +27,6 @@ VOID
ArmV7AllDataCachesOperation ( ArmV7AllDataCachesOperation (
IN ARM_V7_CACHE_OPERATION DataCacheOperation IN ARM_V7_CACHE_OPERATION DataCacheOperation
); );
#endif // __ARM_V7_LIB_H__ #endif // __ARM_V7_LIB_H__

6
ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
View File

@ -28,10 +28,10 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
ArmV7Support.S | GCC ArmV7Support.S | GCC
ArmV7Support.asm | RVCT ArmV7Support.asm | RVCT
ArmV7Lib.c ArmV7Lib.c
ArmV7Mmu.c ArmV7Mmu.c
@ -45,7 +45,7 @@
[LibraryClasses] [LibraryClasses]
MemoryAllocationLib MemoryAllocationLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

8
ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
View File

@ -28,13 +28,13 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
ArmV7Support.S | GCC ArmV7Support.S | GCC
ArmV7Support.asm | RVCT ArmV7Support.asm | RVCT
ArmV7Lib.c ArmV7Lib.c
ArmV7Mmu.c ArmV7Mmu.c
ArmV7ArchTimer.c ArmV7ArchTimer.c
ArmV7ArchTimerSupport.S | GCC ArmV7ArchTimerSupport.S | GCC
ArmV7ArchTimerSupport.asm | RVCT ArmV7ArchTimerSupport.asm | RVCT
@ -45,7 +45,7 @@
[LibraryClasses] [LibraryClasses]
PrePiLib PrePiLib
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid gEfiCpuArchProtocolGuid

18
ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
View File

@ -1,13 +1,13 @@
#/* @file #/* @file
# Copyright (c) 2011, ARM Limited. All rights reserved. # 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, # This program and the accompanying materials
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # 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.
# #
#*/ #*/
@ -26,12 +26,12 @@
../Common/Arm/ArmLibSupport.S | GCC ../Common/Arm/ArmLibSupport.S | GCC
../Common/Arm/ArmLibSupport.asm | RVCT ../Common/Arm/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
ArmV7Support.S | GCC ArmV7Support.S | GCC
ArmV7Support.asm | RVCT ArmV7Support.asm | RVCT
ArmV7Lib.c ArmV7Lib.c
ArmV7ArchTimer.c ArmV7ArchTimer.c
ArmV7ArchTimerSupport.S | GCC ArmV7ArchTimerSupport.S | GCC
ArmV7ArchTimerSupport.asm | RVCT ArmV7ArchTimerSupport.asm | RVCT

32
ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
View File

@ -2,18 +2,18 @@
* File managing the MMU for ARMv7 architecture * File managing the MMU for ARMv7 architecture
* *
* Copyright (c) 2011-2013, ARM Limited. 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, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * 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.
* *
**/ **/
#include <Uefi.h> #include <Uefi.h>
#include <Chipset/ArmV7.h> #include <Chipset/ArmV7.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
@ -145,7 +145,7 @@ FillTranslationTable (
UINT32 Attributes; UINT32 Attributes;
UINT32 PhysicalBase = MemoryRegion->PhysicalBase; UINT32 PhysicalBase = MemoryRegion->PhysicalBase;
UINT32 RemainLength = MemoryRegion->Length; UINT32 RemainLength = MemoryRegion->Length;
ASSERT(MemoryRegion->Length > 0); ASSERT(MemoryRegion->Length > 0);
switch (MemoryRegion->Attributes) { switch (MemoryRegion->Attributes) {
@ -177,7 +177,7 @@ FillTranslationTable (
Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0); Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0);
break; break;
} }
// Get the first section entry for this mapping // Get the first section entry for this mapping
SectionEntry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase); SectionEntry = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase);
@ -231,7 +231,7 @@ ArmConfigureMmu (
if (TranslationTableBase != NULL) { if (TranslationTableBase != NULL) {
*TranslationTableBase = TranslationTable; *TranslationTableBase = TranslationTable;
} }
if (TranslationTableSize != NULL) { if (TranslationTableSize != NULL) {
*TranslationTableSize = TRANSLATION_TABLE_SECTION_SIZE; *TranslationTableSize = TRANSLATION_TABLE_SECTION_SIZE;
} }
@ -251,13 +251,13 @@ ArmConfigureMmu (
} }
// Translate the Memory Attributes into Translation Table Register Attributes // Translate the Memory Attributes into Translation Table Register Attributes
if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED) || if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED) ||
(TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_UNCACHED_UNBUFFERED)) { (TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_UNCACHED_UNBUFFERED)) {
TTBRAttributes = TTBR_NON_CACHEABLE; TTBRAttributes = TTBR_NON_CACHEABLE;
} else if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK) || } else if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK) ||
(TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK)) { (TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK)) {
TTBRAttributes = TTBR_WRITE_BACK_ALLOC; TTBRAttributes = TTBR_WRITE_BACK_ALLOC;
} else if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH) || } else if ((TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH) ||
(TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_THROUGH)) { (TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_THROUGH)) {
TTBRAttributes = TTBR_WRITE_THROUGH_NO_ALLOC; TTBRAttributes = TTBR_WRITE_THROUGH_NO_ALLOC;
} else { } else {
@ -278,7 +278,7 @@ ArmConfigureMmu (
ArmInvalidateInstructionCache (); ArmInvalidateInstructionCache ();
ArmSetTTBR0 ((VOID *)(UINTN)(((UINTN)TranslationTable & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) | (TTBRAttributes & 0x7F))); ArmSetTTBR0 ((VOID *)(UINTN)(((UINTN)TranslationTable & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) | (TTBRAttributes & 0x7F)));
ArmSetDomainAccessControl (DOMAIN_ACCESS_CONTROL_NONE(15) | ArmSetDomainAccessControl (DOMAIN_ACCESS_CONTROL_NONE(15) |
DOMAIN_ACCESS_CONTROL_NONE(14) | DOMAIN_ACCESS_CONTROL_NONE(14) |
DOMAIN_ACCESS_CONTROL_NONE(13) | DOMAIN_ACCESS_CONTROL_NONE(13) |
@ -295,7 +295,7 @@ ArmConfigureMmu (
DOMAIN_ACCESS_CONTROL_NONE( 2) | DOMAIN_ACCESS_CONTROL_NONE( 2) |
DOMAIN_ACCESS_CONTROL_NONE( 1) | DOMAIN_ACCESS_CONTROL_NONE( 1) |
DOMAIN_ACCESS_CONTROL_MANAGER(0)); DOMAIN_ACCESS_CONTROL_MANAGER(0));
ArmEnableInstructionCache(); ArmEnableInstructionCache();
ArmEnableDataCache(); ArmEnableDataCache();
ArmEnableMmu(); ArmEnableMmu();

42
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. # Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
@ -63,13 +63,13 @@ GCC_ASM_EXPORT (ArmReadIdPfr1)
ASM_PFX(ArmInvalidateDataCacheEntryByMVA): ASM_PFX(ArmInvalidateDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c6, 1 @invalidate single data cache line mcr p15, 0, r0, c7, c6, 1 @invalidate single data cache line
dsb dsb
isb isb
bx lr bx lr
ASM_PFX(ArmCleanDataCacheEntryByMVA): ASM_PFX(ArmCleanDataCacheEntryByMVA):
mcr p15, 0, r0, c7, c10, 1 @clean single data cache line mcr p15, 0, r0, c7, c10, 1 @clean single data cache line
dsb dsb
isb isb
bx lr bx lr
@ -83,21 +83,21 @@ ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA):
ASM_PFX(ArmInvalidateDataCacheEntryBySetWay): ASM_PFX(ArmInvalidateDataCacheEntryBySetWay):
mcr p15, 0, r0, c7, c6, 2 @ Invalidate this line mcr p15, 0, r0, c7, c6, 2 @ Invalidate this line
dsb dsb
isb isb
bx lr bx lr
ASM_PFX(ArmCleanInvalidateDataCacheEntryBySetWay): ASM_PFX(ArmCleanInvalidateDataCacheEntryBySetWay):
mcr p15, 0, r0, c7, c14, 2 @ Clean and Invalidate this line mcr p15, 0, r0, c7, c14, 2 @ Clean and Invalidate this line
dsb dsb
isb isb
bx lr bx lr
ASM_PFX(ArmCleanDataCacheEntryBySetWay): ASM_PFX(ArmCleanDataCacheEntryBySetWay):
mcr p15, 0, r0, c7, c10, 2 @ Clean this line mcr p15, 0, r0, c7, c10, 2 @ Clean this line
dsb dsb
isb isb
bx lr bx lr
@ -141,7 +141,7 @@ ASM_PFX(ArmDisableCachesAndMmu):
ASM_PFX(ArmMmuEnabled): ASM_PFX(ArmMmuEnabled):
mrc p15,0,R0,c1,c0,0 mrc p15,0,R0,c1,c0,0
and R0,R0,#1 and R0,R0,#1
bx LR bx LR
ASM_PFX(ArmEnableDataCache): ASM_PFX(ArmEnableDataCache):
ldr R1,=DC_ON ldr R1,=DC_ON
@ -151,7 +151,7 @@ ASM_PFX(ArmEnableDataCache):
dsb dsb
isb isb
bx LR bx LR
ASM_PFX(ArmDisableDataCache): ASM_PFX(ArmDisableDataCache):
ldr R1,=DC_ON ldr R1,=DC_ON
mrc p15,0,R0,c1,c0,0 @Read control register configuration data mrc p15,0,R0,c1,c0,0 @Read control register configuration data
@ -169,7 +169,7 @@ ASM_PFX(ArmEnableInstructionCache):
dsb dsb
isb isb
bx LR bx LR
ASM_PFX(ArmDisableInstructionCache): ASM_PFX(ArmDisableInstructionCache):
ldr R1,=IC_ON ldr R1,=IC_ON
mrc p15,0,R0,c1,c0,0 @Read control register configuration data mrc p15,0,R0,c1,c0,0 @Read control register configuration data
@ -225,14 +225,14 @@ ASM_PFX(ArmV7AllDataCachesOperation):
beq L_Finished beq L_Finished
mov R10, #0 mov R10, #0
Loop1: Loop1:
add R2, R10, R10, LSR #1 @ Work out 3xcachelevel add R2, R10, R10, LSR #1 @ Work out 3xcachelevel
mov R12, R6, LSR R2 @ bottom 3 bits are the Cache type for this level mov R12, R6, LSR R2 @ bottom 3 bits are the Cache type for this level
and R12, R12, #7 @ get those 3 bits alone and R12, R12, #7 @ get those 3 bits alone
cmp R12, #2 cmp R12, #2
blt L_Skip @ no cache or only instruction cache at this level blt L_Skip @ no cache or only instruction cache at this level
mcr p15, 2, R10, c0, c0, 0 @ write the Cache Size selection register (CSSELR) // OR in 1 for Instruction mcr p15, 2, R10, c0, c0, 0 @ write the Cache Size selection register (CSSELR) // OR in 1 for Instruction
isb @ isb to sync the change to the CacheSizeID reg isb @ isb to sync the change to the CacheSizeID reg
mrc p15, 1, R12, c0, c0, 0 @ reads current Cache Size ID register (CCSIDR) mrc p15, 1, R12, c0, c0, 0 @ reads current Cache Size ID register (CCSIDR)
and R2, R12, #0x7 @ extract the line length field and R2, R12, #0x7 @ extract the line length field
add R2, R2, #4 @ add 4 for the line length offset (log2 16 bytes) add R2, R2, #4 @ add 4 for the line length offset (log2 16 bytes)
@ -246,10 +246,10 @@ Loop1:
sub R7, R7, #1 sub R7, R7, #1
ands R7, R7, R12, LSR #13 @ R7 is the max number of the index size (right aligned) ands R7, R7, R12, LSR #13 @ R7 is the max number of the index size (right aligned)
Loop2: Loop2:
mov R9, R4 @ R9 working copy of the max way size (right aligned) mov R9, R4 @ R9 working copy of the max way size (right aligned)
Loop3: Loop3:
orr R0, R10, R9, LSL R5 @ factor in the way number and cache number into R11 orr R0, R10, R9, LSL R5 @ factor in the way number and cache number into R11
orr R0, R0, R7, LSL R2 @ factor in the index number orr R0, R0, R7, LSL R2 @ factor in the index number
@ -259,11 +259,11 @@ Loop3:
bge Loop3 bge Loop3
subs R7, R7, #1 @ decrement the index subs R7, R7, #1 @ decrement the index
bge Loop2 bge Loop2
L_Skip: L_Skip:
add R10, R10, #2 @ increment the cache number add R10, R10, #2 @ increment the cache number
cmp R3, R10 cmp R3, R10
bgt Loop1 bgt Loop1
L_Finished: L_Finished:
dsb dsb
ldmfd SP!, {r4-r12, lr} ldmfd SP!, {r4-r12, lr}
@ -285,7 +285,7 @@ Loop4:
cmp R12, #2 cmp R12, #2
blt Skip2 @ no cache or only instruction cache at this level blt Skip2 @ no cache or only instruction cache at this level
mcr p15, 2, R10, c0, c0, 0 @ write the Cache Size selection register (CSSELR) // OR in 1 for Instruction mcr p15, 2, R10, c0, c0, 0 @ write the Cache Size selection register (CSSELR) // OR in 1 for Instruction
isb @ isb to sync the change to the CacheSizeID reg isb @ isb to sync the change to the CacheSizeID reg
mrc p15, 1, R12, c0, c0, 0 @ reads current Cache Size ID register (CCSIDR) mrc p15, 1, R12, c0, c0, 0 @ reads current Cache Size ID register (CCSIDR)
and R2, R12, #0x7 @ extract the line length field and R2, R12, #0x7 @ extract the line length field
add R2, R2, #4 @ add 4 for the line length offset (log2 16 bytes) add R2, R2, #4 @ add 4 for the line length offset (log2 16 bytes)
@ -312,7 +312,7 @@ Skip2:
add R10, R10, #2 @ increment the cache number add R10, R10, #2 @ increment the cache number
cmp R3, R10 cmp R3, R10
bgt Loop4 bgt Loop4
Finished2: Finished2:
dsb dsb
ldmfd SP!, {r4-r12, lr} ldmfd SP!, {r4-r12, lr}
@ -321,12 +321,12 @@ Finished2:
ASM_PFX(ArmDataMemoryBarrier): ASM_PFX(ArmDataMemoryBarrier):
dmb dmb
bx LR bx LR
ASM_PFX(ArmDataSyncronizationBarrier): ASM_PFX(ArmDataSyncronizationBarrier):
ASM_PFX(ArmDrainWriteBuffer): ASM_PFX(ArmDrainWriteBuffer):
dsb dsb
bx LR bx LR
ASM_PFX(ArmInstructionSynchronizationBarrier): ASM_PFX(ArmInstructionSynchronizationBarrier):
isb isb
bx LR bx LR
@ -338,7 +338,7 @@ ASM_PFX(ArmReadVBar):
ASM_PFX(ArmWriteVBar): ASM_PFX(ArmWriteVBar):
# Set the Address of the Vector Table in the VBAR register # Set the Address of the Vector Table in the VBAR register
mcr p15, 0, r0, c12, c0, 0 mcr p15, 0, r0, c12, c0, 0
# Ensure the SCTLR.V bit is clear # Ensure the SCTLR.V bit is clear
mrc p15, 0, r0, c1, c0, 0 @ Read SCTLR into R0 (Read control register configuration data) mrc p15, 0, r0, c1, c0, 0 @ Read SCTLR into R0 (Read control register configuration data)
bic r0, r0, #0x00002000 @ clear V bit bic r0, r0, #0x00002000 @ clear V bit
@ -376,7 +376,7 @@ ASM_PFX(ArmInvalidateInstructionAndDataTlb):
ASM_PFX(ArmReadMpidr): ASM_PFX(ArmReadMpidr):
mrc p15, 0, r0, c0, c0, 5 @ read MPIDR mrc p15, 0, r0, c0, c0, 5 @ read MPIDR
bx lr bx lr
ASM_PFX(ArmReadTpidrurw): ASM_PFX(ArmReadTpidrurw):
mrc p15, 0, r0, c13, c0, 2 @ read TPIDRURW mrc p15, 0, r0, c13, c0, 2 @ read TPIDRURW
bx lr bx lr

46
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
// Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. // Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
@ -63,13 +63,13 @@ CTRL_I_BIT EQU (1 << 12)
ArmInvalidateDataCacheEntryByMVA ArmInvalidateDataCacheEntryByMVA
mcr p15, 0, r0, c7, c6, 1 ; invalidate single data cache line mcr p15, 0, r0, c7, c6, 1 ; invalidate single data cache line
dsb dsb
isb isb
bx lr bx lr
ArmCleanDataCacheEntryByMVA ArmCleanDataCacheEntryByMVA
mcr p15, 0, r0, c7, c10, 1 ; clean single data cache line mcr p15, 0, r0, c7, c10, 1 ; clean single data cache line
dsb dsb
isb isb
bx lr bx lr
@ -83,21 +83,21 @@ ArmCleanInvalidateDataCacheEntryByMVA
ArmInvalidateDataCacheEntryBySetWay ArmInvalidateDataCacheEntryBySetWay
mcr p15, 0, r0, c7, c6, 2 ; Invalidate this line mcr p15, 0, r0, c7, c6, 2 ; Invalidate this line
dsb dsb
isb isb
bx lr bx lr
ArmCleanInvalidateDataCacheEntryBySetWay ArmCleanInvalidateDataCacheEntryBySetWay
mcr p15, 0, r0, c7, c14, 2 ; Clean and Invalidate this line mcr p15, 0, r0, c7, c14, 2 ; Clean and Invalidate this line
dsb dsb
isb isb
bx lr bx lr
ArmCleanDataCacheEntryBySetWay ArmCleanDataCacheEntryBySetWay
mcr p15, 0, r0, c7, c10, 2 ; Clean this line mcr p15, 0, r0, c7, c10, 2 ; Clean this line
dsb dsb
isb isb
bx lr bx lr
@ -150,7 +150,7 @@ ArmEnableDataCache
dsb dsb
isb isb
bx LR bx LR
ArmDisableDataCache ArmDisableDataCache
ldr R1,=DC_ON ; Specify SCTLR.C bit : (Data) Cache enable bit ldr R1,=DC_ON ; Specify SCTLR.C bit : (Data) Cache enable bit
mrc p15,0,R0,c1,c0,0 ; Read SCTLR into R0 (Read control register configuration data) mrc p15,0,R0,c1,c0,0 ; Read SCTLR into R0 (Read control register configuration data)
@ -168,7 +168,7 @@ ArmEnableInstructionCache
dsb dsb
isb isb
bx LR bx LR
ArmDisableInstructionCache ArmDisableInstructionCache
ldr R1,=IC_ON ; Specify SCTLR.I bit : Instruction cache enable bit ldr R1,=IC_ON ; Specify SCTLR.I bit : Instruction cache enable bit
mrc p15,0,R0,c1,c0,0 ; Read SCTLR into R0 (Read control register configuration data) mrc p15,0,R0,c1,c0,0 ; Read SCTLR into R0 (Read control register configuration data)
@ -223,14 +223,14 @@ ArmV7AllDataCachesOperation
beq Finished beq Finished
mov R10, #0 mov R10, #0
Loop1 Loop1
add R2, R10, R10, LSR #1 ; Work out 3xcachelevel add R2, R10, R10, LSR #1 ; Work out 3xcachelevel
mov R12, R6, LSR R2 ; bottom 3 bits are the Cache type for this level mov R12, R6, LSR R2 ; bottom 3 bits are the Cache type for this level
and R12, R12, #7 ; get those 3 bits alone and R12, R12, #7 ; get those 3 bits alone
cmp R12, #2 cmp R12, #2
blt Skip ; no cache or only instruction cache at this level blt Skip ; no cache or only instruction cache at this level
mcr p15, 2, R10, c0, c0, 0 ; write the Cache Size selection register (CSSELR) // OR in 1 for Instruction mcr p15, 2, R10, c0, c0, 0 ; write the Cache Size selection register (CSSELR) // OR in 1 for Instruction
isb ; isb to sync the change to the CacheSizeID reg isb ; isb to sync the change to the CacheSizeID reg
mrc p15, 1, R12, c0, c0, 0 ; reads current Cache Size ID register (CCSIDR) mrc p15, 1, R12, c0, c0, 0 ; reads current Cache Size ID register (CCSIDR)
and R2, R12, #&7 ; extract the line length field and R2, R12, #&7 ; extract the line length field
add R2, R2, #4 ; add 4 for the line length offset (log2 16 bytes) add R2, R2, #4 ; add 4 for the line length offset (log2 16 bytes)
@ -240,10 +240,10 @@ Loop1
ldr R7, =0x00007FFF ldr R7, =0x00007FFF
ands R7, R7, R12, LSR #13 ; R7 is the max number of the index size (right aligned) ands R7, R7, R12, LSR #13 ; R7 is the max number of the index size (right aligned)
Loop2 Loop2
mov R9, R4 ; R9 working copy of the max way size (right aligned) mov R9, R4 ; R9 working copy of the max way size (right aligned)
Loop3 Loop3
orr R0, R10, R9, LSL R5 ; factor in the way number and cache number into R11 orr R0, R10, R9, LSL R5 ; factor in the way number and cache number into R11
orr R0, R0, R7, LSL R2 ; factor in the index number orr R0, R0, R7, LSL R2 ; factor in the index number
@ -253,11 +253,11 @@ Loop3
bge Loop3 bge Loop3
subs R7, R7, #1 ; decrement the index subs R7, R7, #1 ; decrement the index
bge Loop2 bge Loop2
Skip Skip
add R10, R10, #2 ; increment the cache number add R10, R10, #2 ; increment the cache number
cmp R3, R10 cmp R3, R10
bgt Loop1 bgt Loop1
Finished Finished
dsb dsb
ldmfd SP!, {r4-r12, lr} ldmfd SP!, {r4-r12, lr}
@ -272,14 +272,14 @@ ArmV7PerformPoUDataCacheOperation
beq Finished2 beq Finished2
mov R10, #0 mov R10, #0
Loop4 Loop4
add R2, R10, R10, LSR #1 ; Work out 3xcachelevel add R2, R10, R10, LSR #1 ; Work out 3xcachelevel
mov R12, R6, LSR R2 ; bottom 3 bits are the Cache type for this level mov R12, R6, LSR R2 ; bottom 3 bits are the Cache type for this level
and R12, R12, #7 ; get those 3 bits alone and R12, R12, #7 ; get those 3 bits alone
cmp R12, #2 cmp R12, #2
blt Skip2 ; no cache or only instruction cache at this level blt Skip2 ; no cache or only instruction cache at this level
mcr p15, 2, R10, c0, c0, 0 ; write the Cache Size selection register (CSSELR) // OR in 1 for Instruction mcr p15, 2, R10, c0, c0, 0 ; write the Cache Size selection register (CSSELR) // OR in 1 for Instruction
isb ; isb to sync the change to the CacheSizeID reg isb ; isb to sync the change to the CacheSizeID reg
mrc p15, 1, R12, c0, c0, 0 ; reads current Cache Size ID register (CCSIDR) mrc p15, 1, R12, c0, c0, 0 ; reads current Cache Size ID register (CCSIDR)
and R2, R12, #&7 ; extract the line length field and R2, R12, #&7 ; extract the line length field
add R2, R2, #4 ; add 4 for the line length offset (log2 16 bytes) add R2, R2, #4 ; add 4 for the line length offset (log2 16 bytes)
@ -289,10 +289,10 @@ Loop4
ldr R7, =0x00007FFF ldr R7, =0x00007FFF
ands R7, R7, R12, LSR #13 ; R7 is the max number of the index size (right aligned) ands R7, R7, R12, LSR #13 ; R7 is the max number of the index size (right aligned)
Loop5 Loop5
mov R9, R4 ; R9 working copy of the max way size (right aligned) mov R9, R4 ; R9 working copy of the max way size (right aligned)
Loop6 Loop6
orr R0, R10, R9, LSL R5 ; factor in the way number and cache number into R11 orr R0, R10, R9, LSL R5 ; factor in the way number and cache number into R11
orr R0, R0, R7, LSL R2 ; factor in the index number orr R0, R0, R7, LSL R2 ; factor in the index number
@ -302,11 +302,11 @@ Loop6
bge Loop6 bge Loop6
subs R7, R7, #1 ; decrement the index subs R7, R7, #1 ; decrement the index
bge Loop5 bge Loop5
Skip2 Skip2
add R10, R10, #2 ; increment the cache number add R10, R10, #2 ; increment the cache number
cmp R3, R10 cmp R3, R10
bgt Loop4 bgt Loop4
Finished2 Finished2
dsb dsb
ldmfd SP!, {r4-r12, lr} ldmfd SP!, {r4-r12, lr}
@ -315,12 +315,12 @@ Finished2
ArmDataMemoryBarrier ArmDataMemoryBarrier
dmb dmb
bx LR bx LR
ArmDataSyncronizationBarrier ArmDataSyncronizationBarrier
ArmDrainWriteBuffer ArmDrainWriteBuffer
dsb dsb
bx LR bx LR
ArmInstructionSynchronizationBarrier ArmInstructionSynchronizationBarrier
isb isb
bx LR bx LR
@ -332,7 +332,7 @@ ArmReadVBar
ArmWriteVBar ArmWriteVBar
// Set the Address of the Vector Table in the VBAR register // Set the Address of the Vector Table in the VBAR register
mcr p15, 0, r0, c12, c0, 0 mcr p15, 0, r0, c12, c0, 0
// Ensure the SCTLR.V bit is clear // Ensure the SCTLR.V bit is clear
mrc p15, 0, r0, c1, c0, 0 ; Read SCTLR into R0 (Read control register configuration data) mrc p15, 0, r0, c1, c0, 0 ; Read SCTLR into R0 (Read control register configuration data)
bic r0, r0, #0x00002000 ; clear V bit bic r0, r0, #0x00002000 ; clear V bit

6
ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. # Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
@ -110,7 +110,7 @@ ASM_PFX(ArmWriteAuxCr):
ASM_PFX(ArmReadAuxCr): ASM_PFX(ArmReadAuxCr):
mrc p15, 0, r0, c1, c0, 1 mrc p15, 0, r0, c1, c0, 1
bx lr bx lr
ASM_PFX(ArmSetTTBR0): ASM_PFX(ArmSetTTBR0):
mcr p15,0,r0,c2,c0,0 mcr p15,0,r0,c2,c0,0
@ -133,7 +133,7 @@ ASM_PFX(ArmGetTTBR0BaseAddress):
ASM_PFX(ArmUpdateTranslationTableEntry): ASM_PFX(ArmUpdateTranslationTableEntry):
mcr p15,0,R0,c7,c14,1 @ DCCIMVAC Clean data cache by MVA mcr p15,0,R0,c7,c14,1 @ DCCIMVAC Clean data cache by MVA
dsb dsb
mcr p15,0,R1,c8,c7,1 @ TLBIMVA TLB Invalidate MVA mcr p15,0,R1,c8,c7,1 @ TLBIMVA TLB Invalidate MVA
mcr p15,0,R9,c7,c5,6 @ BPIALL Invalidate Branch predictor array. R9 == NoOp mcr p15,0,R9,c7,c5,6 @ BPIALL Invalidate Branch predictor array. R9 == NoOp
dsb dsb
isb isb

8
ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
View File

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
// Copyright (c) 2011 - 2014, ARM Limited. All rights reserved. // Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
@ -14,7 +14,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <AsmMacroIoLib.h> #include <AsmMacroIoLib.h>
INCLUDE AsmMacroIoLib.inc INCLUDE AsmMacroIoLib.inc
#ifdef ARM_CPU_ARMv6 #ifdef ARM_CPU_ARMv6
@ -110,7 +110,7 @@ ArmWriteAuxCr
ArmReadAuxCr ArmReadAuxCr
mrc p15, 0, r0, c1, c0, 1 mrc p15, 0, r0, c1, c0, 1
bx lr bx lr
ArmSetTTBR0 ArmSetTTBR0
mcr p15,0,r0,c2,c0,0 mcr p15,0,r0,c2,c0,0
@ -170,7 +170,7 @@ ArmReadMVBar
ArmWriteMVBar ArmWriteMVBar
mcr p15, 0, r0, c12, c0, 1 mcr p15, 0, r0, c12, c0, 1
bx lr bx lr
ArmCallWFE ArmCallWFE
wfe wfe
bx lr bx lr

2
ArmPkg/Library/ArmLib/Common/ArmLib.c
View File

@ -2,7 +2,7 @@
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at

6
ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h
View File

@ -67,11 +67,11 @@ CPSRRead (
VOID VOID
); );
UINT32 UINT32
ReadCCSIDR ( ReadCCSIDR (
IN UINT32 CSSELR IN UINT32 CSSELR
); );
UINT32 UINT32
ReadCLIDR ( ReadCLIDR (
VOID VOID

20
ArmPkg/Library/ArmLib/Null/NullArmCacheInformation.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -41,16 +41,16 @@ ArmDataCachePresent (
{ {
return FALSE; return FALSE;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheSize ( ArmDataCacheSize (
VOID VOID
) )
{ {
return 0; return 0;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheAssociativity ( ArmDataCacheAssociativity (
@ -59,7 +59,7 @@ ArmDataCacheAssociativity (
{ {
return 0; return 0;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmDataCacheLineLength ( ArmDataCacheLineLength (
@ -68,7 +68,7 @@ ArmDataCacheLineLength (
{ {
return 0; return 0;
} }
BOOLEAN BOOLEAN
EFIAPI EFIAPI
ArmInstructionCachePresent ( ArmInstructionCachePresent (
@ -77,16 +77,16 @@ ArmInstructionCachePresent (
{ {
return FALSE; return FALSE;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheSize ( ArmInstructionCacheSize (
VOID VOID
) )
{ {
return 0; return 0;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheAssociativity ( ArmInstructionCacheAssociativity (
@ -95,7 +95,7 @@ ArmInstructionCacheAssociativity (
{ {
return 0; return 0;
} }
UINTN UINTN
EFIAPI EFIAPI
ArmInstructionCacheLineLength ( ArmInstructionCacheLineLength (

2
ArmPkg/Library/ArmLib/Null/NullArmLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at

10
ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
View File

@ -1,24 +1,24 @@
#/** @file #/** @file
# #
# Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR> # Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
#**/ #**/
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmSmcLib BASE_NAME = ArmSmcLib
FILE_GUID = eb3f17d5-a3cc-4eac-8912-84162d0f79da FILE_GUID = eb3f17d5-a3cc-4eac-8912-84162d0f79da
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ArmSmcLib LIBRARY_CLASS = ArmSmcLib
[Sources.ARM] [Sources.ARM]
Arm/ArmSmc.asm | RVCT Arm/ArmSmc.asm | RVCT
Arm/ArmSmc.S | GCC Arm/ArmSmc.S | GCC

6
ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
View File

@ -1,5 +1,5 @@
#/** @file #/** @file
# #
# ArmSmcLib when no SMC support is desired (might be the case for CPU without the # ArmSmcLib when no SMC support is desired (might be the case for CPU without the
# Trustzone support / ARM Security Extension) # Trustzone support / ARM Security Extension)
# #
@ -8,7 +8,7 @@
# are licensed and made available under the terms and conditions of the BSD License # 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 # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
@ -21,7 +21,7 @@
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ArmSmcLib LIBRARY_CLASS = ArmSmcLib
[Sources.ARM] [Sources.ARM]
Arm/ArmSmcNull.asm | RVCT Arm/ArmSmcNull.asm | RVCT
Arm/ArmSmcNull.S | GCC Arm/ArmSmcNull.S | GCC

50
ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
View File

@ -1,10 +1,10 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# CopyMem() worker for ARM # CopyMem() worker for ARM
# #
# This file started out as C code that did 64 bit moves if the buffer was # This file started out as C code that did 64 bit moves if the buffer was
# 32-bit aligned, else it does a byte copy. It also does a byte copy for # 32-bit aligned, else it does a byte copy. It also does a byte copy for
# any trailing bytes. It was updated to do 32-byte copies using stm/ldm. # any trailing bytes. It was updated to do 32-byte copies using stm/ldm.
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
@ -20,7 +20,7 @@
/** /**
Copy Length bytes from Source to Destination. Overlap is OK. Copy Length bytes from Source to Destination. Overlap is OK.
This implementation This implementation
@param Destination Target of copy @param Destination Target of copy
@param Source Place to copy from @param Source Place to copy from
@ -48,7 +48,7 @@ ASM_PFX(InternalMemCopyMem):
mov r10, r0 mov r10, r0
mov r12, r2 mov r12, r2
mov r14, r1 mov r14, r1
memcopy_check_overlapped: memcopy_check_overlapped:
cmp r11, r1 cmp r11, r1
// If (dest < source) // If (dest < source)
@ -61,10 +61,10 @@ memcopy_check_overlapped:
cmp r12, r3 cmp r12, r3
bcc memcopy_check_optim_default bcc memcopy_check_optim_default
// If (length == 0) // If (length == 0)
cmp r12, #0 cmp r12, #0
beq memcopy_end beq memcopy_end
b memcopy_check_optim_overlap b memcopy_check_optim_overlap
memcopy_check_optim_default: memcopy_check_optim_default:
@ -79,7 +79,7 @@ memcopy_check_optim_default:
movls r0, #0 movls r0, #0
andhi r0, r3, #1 andhi r0, r3, #1
b memcopy_default b memcopy_default
memcopy_check_optim_overlap: memcopy_check_optim_overlap:
// r10 = dest_end, r14 = source_end // r10 = dest_end, r14 = source_end
add r10, r11, r12 add r10, r11, r12
@ -94,12 +94,12 @@ memcopy_check_optim_overlap:
tst r14, #0xF tst r14, #0xF
movne r0, #0 movne r0, #0
b memcopy_overlapped b memcopy_overlapped
memcopy_overlapped_non_optim: memcopy_overlapped_non_optim:
// We read 1 byte from the end of the source buffer // We read 1 byte from the end of the source buffer
sub r3, r14, #1 sub r3, r14, #1
sub r12, r12, #1 sub r12, r12, #1
ldrb r3, [r3, #0] ldrb r3, [r3, #0]
sub r2, r10, #1 sub r2, r10, #1
cmp r12, #0 cmp r12, #0
// We write 1 byte at the end of the dest buffer // We write 1 byte at the end of the dest buffer
@ -114,58 +114,58 @@ memcopy_overlapped:
// Are we in the optimized case ? // Are we in the optimized case ?
cmp r0, #0 cmp r0, #0
beq memcopy_overlapped_non_optim beq memcopy_overlapped_non_optim
// Optimized Overlapped - Read 32 bytes // Optimized Overlapped - Read 32 bytes
sub r14, r14, #32 sub r14, r14, #32
sub r12, r12, #32 sub r12, r12, #32
cmp r12, #31 cmp r12, #31
ldmia r14, {r2-r9} ldmia r14, {r2-r9}
// If length is less than 32 then disable optim // If length is less than 32 then disable optim
movls r0, #0 movls r0, #0
cmp r12, #0 cmp r12, #0
// Optimized Overlapped - Write 32 bytes // Optimized Overlapped - Write 32 bytes
sub r10, r10, #32 sub r10, r10, #32
stmia r10, {r2-r9} stmia r10, {r2-r9}
// while (length != 0) // while (length != 0)
bne memcopy_overlapped bne memcopy_overlapped
b memcopy_end b memcopy_end
memcopy_default_non_optim: memcopy_default_non_optim:
// Byte copy // Byte copy
ldrb r3, [r14], #1 ldrb r3, [r14], #1
sub r12, r12, #1 sub r12, r12, #1
strb r3, [r10], #1 strb r3, [r10], #1
memcopy_default: memcopy_default:
cmp r12, #0 cmp r12, #0
beq memcopy_end beq memcopy_end
// r10 = dest, r14 = source // r10 = dest, r14 = source
memcopy_default_loop: memcopy_default_loop:
cmp r0, #0 cmp r0, #0
beq memcopy_default_non_optim beq memcopy_default_non_optim
// Optimized memcopy - Read 32 Bytes // Optimized memcopy - Read 32 Bytes
sub r12, r12, #32 sub r12, r12, #32
cmp r12, #31 cmp r12, #31
ldmia r14!, {r2-r9} ldmia r14!, {r2-r9}
// If length is less than 32 then disable optim // If length is less than 32 then disable optim
movls r0, #0 movls r0, #0
cmp r12, #0 cmp r12, #0
// Optimized memcopy - Write 32 Bytes // Optimized memcopy - Write 32 Bytes
stmia r10!, {r2-r9} stmia r10!, {r2-r9}
// while (length != 0) // while (length != 0)
bne memcopy_default_loop bne memcopy_default_loop
memcopy_end: memcopy_end:
mov r0, r11 mov r0, r11
ldmfd sp!, {r4-r11, pc} ldmfd sp!, {r4-r11, pc}

50
ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
View File

@ -1,4 +1,4 @@
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;
; CopyMem() worker for ARM ; CopyMem() worker for ARM
; ;
@ -20,7 +20,7 @@
/** /**
Copy Length bytes from Source to Destination. Overlap is OK. Copy Length bytes from Source to Destination. Overlap is OK.
This implementation This implementation
@param Destination Target of copy @param Destination Target of copy
@param Source Place to copy from @param Source Place to copy from
@ -48,7 +48,7 @@ InternalMemCopyMem
mov r10, r0 mov r10, r0
mov r12, r2 mov r12, r2
mov r14, r1 mov r14, r1
memcopy_check_overlapped memcopy_check_overlapped
cmp r11, r1 cmp r11, r1
// If (dest < source) // If (dest < source)
@ -61,10 +61,10 @@ memcopy_check_overlapped
cmp r12, r3 cmp r12, r3
bcc memcopy_check_optim_default bcc memcopy_check_optim_default
// If (length == 0) // If (length == 0)
cmp r12, #0 cmp r12, #0
beq memcopy_end beq memcopy_end
b memcopy_check_optim_overlap b memcopy_check_optim_overlap
memcopy_check_optim_default memcopy_check_optim_default
@ -79,7 +79,7 @@ memcopy_check_optim_default
movls r0, #0 movls r0, #0
andhi r0, r3, #1 andhi r0, r3, #1
b memcopy_default b memcopy_default
memcopy_check_optim_overlap memcopy_check_optim_overlap
// r10 = dest_end, r14 = source_end // r10 = dest_end, r14 = source_end
add r10, r11, r12 add r10, r11, r12
@ -94,12 +94,12 @@ memcopy_check_optim_overlap
tst r14, #0xF tst r14, #0xF
movne r0, #0 movne r0, #0
b memcopy_overlapped b memcopy_overlapped
memcopy_overlapped_non_optim memcopy_overlapped_non_optim
// We read 1 byte from the end of the source buffer // We read 1 byte from the end of the source buffer
sub r3, r14, #1 sub r3, r14, #1
sub r12, r12, #1 sub r12, r12, #1
ldrb r3, [r3, #0] ldrb r3, [r3, #0]
sub r2, r10, #1 sub r2, r10, #1
cmp r12, #0 cmp r12, #0
// We write 1 byte at the end of the dest buffer // We write 1 byte at the end of the dest buffer
@ -114,60 +114,60 @@ memcopy_overlapped
// Are we in the optimized case ? // Are we in the optimized case ?
cmp r0, #0 cmp r0, #0
beq memcopy_overlapped_non_optim beq memcopy_overlapped_non_optim
// Optimized Overlapped - Read 32 bytes // Optimized Overlapped - Read 32 bytes
sub r14, r14, #32 sub r14, r14, #32
sub r12, r12, #32 sub r12, r12, #32
cmp r12, #31 cmp r12, #31
ldmia r14, {r2-r9} ldmia r14, {r2-r9}
// If length is less than 32 then disable optim // If length is less than 32 then disable optim
movls r0, #0 movls r0, #0
cmp r12, #0 cmp r12, #0
// Optimized Overlapped - Write 32 bytes // Optimized Overlapped - Write 32 bytes
sub r10, r10, #32 sub r10, r10, #32
stmia r10, {r2-r9} stmia r10, {r2-r9}
// while (length != 0) // while (length != 0)
bne memcopy_overlapped bne memcopy_overlapped
b memcopy_end b memcopy_end
memcopy_default_non_optim memcopy_default_non_optim
// Byte copy // Byte copy
ldrb r3, [r14], #1 ldrb r3, [r14], #1
sub r12, r12, #1 sub r12, r12, #1
strb r3, [r10], #1 strb r3, [r10], #1
memcopy_default memcopy_default
cmp r12, #0 cmp r12, #0
beq memcopy_end beq memcopy_end
// r10 = dest, r14 = source // r10 = dest, r14 = source
memcopy_default_loop memcopy_default_loop
cmp r0, #0 cmp r0, #0
beq memcopy_default_non_optim beq memcopy_default_non_optim
// Optimized memcopy - Read 32 Bytes // Optimized memcopy - Read 32 Bytes
sub r12, r12, #32 sub r12, r12, #32
cmp r12, #31 cmp r12, #31
ldmia r14!, {r2-r9} ldmia r14!, {r2-r9}
// If length is less than 32 then disable optim // If length is less than 32 then disable optim
movls r0, #0 movls r0, #0
cmp r12, #0 cmp r12, #0
// Optimized memcopy - Write 32 Bytes // Optimized memcopy - Write 32 Bytes
stmia r10!, {r2-r9} stmia r10!, {r2-r9}
// while (length != 0) // while (length != 0)
bne memcopy_default_loop bne memcopy_default_loop
memcopy_end memcopy_end
mov r0, r11 mov r0, r11
ldmfd sp!, {r4-r11, pc} ldmfd sp!, {r4-r11, pc}
END END

20
ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
View File

@ -1,10 +1,10 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# SemMem() worker for ARM # SemMem() worker for ARM
# #
# This file started out as C code that did 64 bit moves if the buffer was # This file started out as C code that did 64 bit moves if the buffer was
# 32-bit aligned, else it does a byte copy. It also does a byte copy for # 32-bit aligned, else it does a byte copy. It also does a byte copy for
# any trailing bytes. It was updated to do 32-byte at a time. # any trailing bytes. It was updated to do 32-byte at a time.
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
@ -34,7 +34,7 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
.text .text
.align 2 .align 2
GCC_ASM_EXPORT(InternalMemSetMem) GCC_ASM_EXPORT(InternalMemSetMem)
@ -56,14 +56,14 @@ L32:
L31: L31:
and r4, r2, #0xff and r4, r2, #0xff
orr r4, r4, r4, LSL #8 orr r4, r4, r4, LSL #8
orr r4, r4, r4, LSL #16 orr r4, r4, r4, LSL #16
mov r5, r4 mov r5, r4
mov r6, r4 mov r6, r4
mov r7, r4 mov r7, r4
mov r8, r4 mov r8, r4
mov r9, r4 mov r9, r4
mov r10, r4 mov r10, r4
mov r11, r4 mov r11, r4
b L32 b L32
L34: L34:
cmp lr, #0 cmp lr, #0
@ -78,4 +78,4 @@ L43:
cmp r1, #0 cmp r1, #0
bne L34 bne L34
ldmfd sp!, {r4-r11, pc} ldmfd sp!, {r4-r11, pc}

20
ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
View File

@ -1,4 +1,4 @@
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;
; SetMem() worker for ARM ; SetMem() worker for ARM
; ;
@ -33,9 +33,9 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
EXPORT InternalMemSetMem EXPORT InternalMemSetMem
AREA AsmMemStuff, CODE, READONLY AREA AsmMemStuff, CODE, READONLY
InternalMemSetMem InternalMemSetMem
@ -55,14 +55,14 @@ L32
L31 L31
and r4, r2, #0xff and r4, r2, #0xff
orr r4, r4, r4, LSL #8 orr r4, r4, r4, LSL #8
orr r4, r4, r4, LSL #16 orr r4, r4, r4, LSL #16
mov r5, r4 mov r5, r4
mov r6, r4 mov r6, r4
mov r7, r4 mov r7, r4
mov r8, r4 mov r8, r4
mov r9, r4 mov r9, r4
mov r10, r4 mov r10, r4
mov r11, r4 mov r11, r4
b L32 b L32
L34 L34
cmp lr, #0 cmp lr, #0
@ -77,5 +77,5 @@ L43
cmp r1, #0 cmp r1, #0
bne L34 bne L34
ldmfd sp!, {r4-r11, pc} ldmfd sp!, {r4-r11, pc}
END END

8
ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
View File

@ -1,8 +1,8 @@
## @file ## @file
# Instance of Base Memory Library with some ARM ldm/stm assembly. # Instance of Base Memory Library with some ARM ldm/stm assembly.
# #
# This is a copy of the MdePkg BaseMemoryLib with the CopyMem and # This is a copy of the MdePkg BaseMemoryLib with the CopyMem and
# SetMem worker functions replaced with assembler that uses # SetMem worker functions replaced with assembler that uses
# ldm/stm. # ldm/stm.
# #
# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
@ -25,7 +25,7 @@
FILE_GUID = 4D466AF3-2380-448D-A337-E4033F29F3F7 FILE_GUID = 4D466AF3-2380-448D-A337-E4033F29F3F7
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = BaseMemoryLib LIBRARY_CLASS = BaseMemoryLib
# #
@ -46,7 +46,7 @@
SetMemWrapper.c SetMemWrapper.c
CopyMemWrapper.c CopyMemWrapper.c
MemLibGeneric.c MemLibGeneric.c
MemLibGuid.c MemLibGuid.c
MemLibInternals.h MemLibInternals.h
[Sources.ARM] [Sources.ARM]

4
ArmPkg/Library/BaseMemoryLibStm/CompareMemWrapper.c
View File

@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
If all Length bytes of the two buffers are identical, then 0 is returned. Otherwise, the If all Length bytes of the two buffers are identical, then 0 is returned. Otherwise, the
value returned is the first mismatched byte in SourceBuffer subtracted from the first value returned is the first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer. mismatched byte in DestinationBuffer.
If Length > 0 and DestinationBuffer is NULL, then ASSERT(). If Length > 0 and DestinationBuffer is NULL, then ASSERT().
If Length > 0 and SourceBuffer is NULL, then ASSERT(). If Length > 0 and SourceBuffer is NULL, then ASSERT().
If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@return 0 All Length bytes of the two buffers are identical. @return 0 All Length bytes of the two buffers are identical.
@retval Non-zero The first mismatched byte in SourceBuffer subtracted from the first @retval Non-zero The first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer. mismatched byte in DestinationBuffer.
**/ **/
INTN INTN
EFIAPI EFIAPI

4
ArmPkg/Library/BaseMemoryLibStm/CopyMemWrapper.c
View File

@ -2,7 +2,7 @@
CopyMem() implementation. CopyMem() implementation.
The following BaseMemoryLib instances contain the same copy of this file: The following BaseMemoryLib instances contain the same copy of this file:
BaseMemoryLib BaseMemoryLib
BaseMemoryLibMmx BaseMemoryLibMmx
BaseMemoryLibSse2 BaseMemoryLibSse2
@ -31,7 +31,7 @@
This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns
DestinationBuffer. The implementation must be reentrant, and it must handle the case DestinationBuffer. The implementation must be reentrant, and it must handle the case
where SourceBuffer overlaps DestinationBuffer. where SourceBuffer overlaps DestinationBuffer.
If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().

8
ArmPkg/Library/BaseMemoryLibStm/MemLibGuid.c
View File

@ -2,7 +2,7 @@
Implementation of GUID functions. Implementation of GUID functions.
The following BaseMemoryLib instances contain the same copy of this file: The following BaseMemoryLib instances contain the same copy of this file:
BaseMemoryLib BaseMemoryLib
BaseMemoryLibMmx BaseMemoryLibMmx
BaseMemoryLibSse2 BaseMemoryLibSse2
@ -30,7 +30,7 @@
This function copies the contents of the 128-bit GUID specified by SourceGuid to This function copies the contents of the 128-bit GUID specified by SourceGuid to
DestinationGuid, and returns DestinationGuid. DestinationGuid, and returns DestinationGuid.
If DestinationGuid is NULL, then ASSERT(). If DestinationGuid is NULL, then ASSERT().
If SourceGuid is NULL, then ASSERT(). If SourceGuid is NULL, then ASSERT().
@ -63,7 +63,7 @@ CopyGuid (
This function compares Guid1 to Guid2. If the GUIDs are identical then TRUE is returned. This function compares Guid1 to Guid2. If the GUIDs are identical then TRUE is returned.
If there are any bit differences in the two GUIDs, then FALSE is returned. If there are any bit differences in the two GUIDs, then FALSE is returned.
If Guid1 is NULL, then ASSERT(). If Guid1 is NULL, then ASSERT().
If Guid2 is NULL, then ASSERT(). If Guid2 is NULL, then ASSERT().
@ -93,7 +93,7 @@ CompareGuid (
GUID value that matches Guid. If a match is found, then a pointer to the matching GUID value that matches Guid. If a match is found, then a pointer to the matching
GUID in the target buffer is returned. If no match is found, then NULL is returned. GUID in the target buffer is returned. If no match is found, then NULL is returned.
If Length is 0, then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 32-bit boundary, then ASSERT(). If Buffer is not aligned on a 32-bit boundary, then ASSERT().
If Length is not aligned on a 128-bit boundary, then ASSERT(). If Length is not aligned on a 128-bit boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibStm/ScanMem16Wrapper.c
View File

@ -33,7 +33,7 @@
address to the highest address for a 16-bit value that matches Value. If a match is found, address to the highest address for a 16-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 16-bit boundary, then ASSERT(). If Buffer is not aligned on a 16-bit boundary, then ASSERT().
If Length is not aligned on a 16-bit boundary, then ASSERT(). If Length is not aligned on a 16-bit boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibStm/ScanMem32Wrapper.c
View File

@ -32,7 +32,7 @@
address to the highest address for a 32-bit value that matches Value. If a match is found, address to the highest address for a 32-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 32-bit boundary, then ASSERT(). If Buffer is not aligned on a 32-bit boundary, then ASSERT().
If Length is not aligned on a 32-bit boundary, then ASSERT(). If Length is not aligned on a 32-bit boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibStm/ScanMem64Wrapper.c
View File

@ -33,7 +33,7 @@
address to the highest address for a 64-bit value that matches Value. If a match is found, address to the highest address for a 64-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 64-bit boundary, then ASSERT(). If Buffer is not aligned on a 64-bit boundary, then ASSERT().
If Length is not aligned on a 64-bit boundary, then ASSERT(). If Length is not aligned on a 64-bit boundary, then ASSERT().

8
ArmPkg/Library/BaseMemoryLibStm/ScanMem8Wrapper.c
View File

@ -33,7 +33,7 @@
address to the highest address for an 8-bit value that matches Value. If a match is found, address to the highest address for an 8-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
@ -57,19 +57,19 @@ ScanMem8 (
} }
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer)); ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
return (VOID*)InternalMemScanMem8 (Buffer, Length, Value); return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);
} }
/** /**
Scans a target buffer for a UINTN sized value, and returns a pointer to the matching Scans a target buffer for a UINTN sized value, and returns a pointer to the matching
UINTN sized value in the target buffer. UINTN sized value in the target buffer.
This function searches the target buffer specified by Buffer and Length from the lowest This function searches the target buffer specified by Buffer and Length from the lowest
address to the highest address for a UINTN sized value that matches Value. If a match is found, address to the highest address for a UINTN sized value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a UINTN boundary, then ASSERT(). If Buffer is not aligned on a UINTN boundary, then ASSERT().
If Length is not aligned on a UINTN boundary, then ASSERT(). If Length is not aligned on a UINTN boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibStm/SetMemWrapper.c
View File

@ -29,7 +29,7 @@
Fills a target buffer with a byte value, and returns the target buffer. Fills a target buffer with a byte value, and returns the target buffer.
This function fills Length bytes of Buffer with Value, and returns Buffer. This function fills Length bytes of Buffer with Value, and returns Buffer.
If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
@param Buffer Memory to set. @param Buffer Memory to set.

4
ArmPkg/Library/BaseMemoryLibStm/ZeroMemWrapper.c
View File

@ -11,7 +11,7 @@
BaseMemoryLibOptPei BaseMemoryLibOptPei
PeiMemoryLib PeiMemoryLib
UefiMemoryLib UefiMemoryLib
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -29,7 +29,7 @@
Fills a target buffer with zeros, and returns the target buffer. Fills a target buffer with zeros, and returns the target buffer.
This function fills Length bytes of Buffer with zeros, and returns Buffer. This function fills Length bytes of Buffer with zeros, and returns Buffer.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

10
ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# CopyMem() worker for ARM # CopyMem() worker for ARM
# #
@ -20,7 +20,7 @@
/** /**
Copy Length bytes from Source to Destination. Overlap is OK. Copy Length bytes from Source to Destination. Overlap is OK.
This implementation This implementation
@param Destination Target of copy @param Destination Target of copy
@param Source Place to copy from @param Source Place to copy from
@ -81,7 +81,7 @@ L16:
bne L29 bne L29
sub r3, lr, #1 sub r3, lr, #1
sub ip, ip, #1 sub ip, ip, #1
ldrb r3, [r3, #0] ldrb r3, [r3, #0]
sub r2, r9, #1 sub r2, r9, #1
cmp ip, #0 cmp ip, #0
sub r9, r9, #1 sub r9, r9, #1
@ -90,7 +90,7 @@ L16:
bne L16 bne L16
b L7 b L7
L11: L11:
ldrb r3, [lr], #1 ldrb r3, [lr], #1
sub ip, ip, #1 sub ip, ip, #1
strb r3, [r9], #1 strb r3, [r9], #1
L26: L26:
@ -111,4 +111,4 @@ L7:
mov r0, r4 mov r0, r4
ldmfd sp!, {r4, r9, pc} ldmfd sp!, {r4, r9, pc}

10
ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm
View File

@ -1,4 +1,4 @@
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;
; CopyMem() worker for ARM ; CopyMem() worker for ARM
; ;
@ -20,7 +20,7 @@
/** /**
Copy Length bytes from Source to Destination. Overlap is OK. Copy Length bytes from Source to Destination. Overlap is OK.
This implementation This implementation
@param Destination Target of copy @param Destination Target of copy
@param Source Place to copy from @param Source Place to copy from
@ -81,7 +81,7 @@ L16
bne L29 bne L29
sub r3, lr, #1 sub r3, lr, #1
sub ip, ip, #1 sub ip, ip, #1
ldrb r3, [r3, #0] ldrb r3, [r3, #0]
sub r2, r9, #1 sub r2, r9, #1
cmp ip, #0 cmp ip, #0
sub r9, r9, #1 sub r9, r9, #1
@ -90,7 +90,7 @@ L16
bne L16 bne L16
b L7 b L7
L11 L11
ldrb r3, [lr], #1 ldrb r3, [lr], #1
sub ip, ip, #1 sub ip, ip, #1
strb r3, [r9], #1 strb r3, [r9], #1
L26 L26
@ -112,4 +112,4 @@ L7
ldmfd sp!, {r4, r9, pc} ldmfd sp!, {r4, r9, pc}
END END

5
ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# SemMem() worker for ARM # SemMem() worker for ARM
# #
@ -34,7 +34,7 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
.text .text
.align 2 .align 2
GCC_ASM_EXPORT(InternalMemSetMem) GCC_ASM_EXPORT(InternalMemSetMem)
@ -77,4 +77,3 @@ L43:
cmp r1, #0 cmp r1, #0
bne L34 bne L34
ldmfd sp!, {pc} ldmfd sp!, {pc}

9
ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm
View File

@ -1,4 +1,4 @@
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;
; SetMem() worker for ARM ; SetMem() worker for ARM
; ;
@ -33,9 +33,9 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
EXPORT InternalMemSetMem EXPORT InternalMemSetMem
AREA AsmMemStuff, CODE, READONLY AREA AsmMemStuff, CODE, READONLY
InternalMemSetMem InternalMemSetMem
@ -75,6 +75,5 @@ L43
cmp r1, #0 cmp r1, #0
bne L34 bne L34
ldmfd sp!, {pc} ldmfd sp!, {pc}
END END

8
ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf
View File

@ -1,8 +1,8 @@
## @file ## @file
# Instance of Base Memory Library with some ARM vldm/vstm assembly. # Instance of Base Memory Library with some ARM vldm/vstm assembly.
# #
# This is a copy of the MdePkg BaseMemoryLib with the CopyMem and # This is a copy of the MdePkg BaseMemoryLib with the CopyMem and
# SetMem worker functions replaced with assembler that uses # SetMem worker functions replaced with assembler that uses
# vldm/vstm (part of NEON SIMD, optional in ARMv7-A). # vldm/vstm (part of NEON SIMD, optional in ARMv7-A).
# #
# Note: You need to enable NEON in SEC to use this library # Note: You need to enable NEON in SEC to use this library
@ -32,7 +32,7 @@
FILE_GUID = 09EE1E8D-7A2E-4573-8117-68A18569C1F5 FILE_GUID = 09EE1E8D-7A2E-4573-8117-68A18569C1F5
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = BaseMemoryLib LIBRARY_CLASS = BaseMemoryLib
# #
@ -52,7 +52,7 @@
SetMemWrapper.c SetMemWrapper.c
CopyMemWrapper.c CopyMemWrapper.c
MemLibGeneric.c MemLibGeneric.c
MemLibGuid.c MemLibGuid.c
MemLibInternals.h MemLibInternals.h
Arm/CopyMem.asm Arm/CopyMem.asm
Arm/CopyMem.S Arm/CopyMem.S

4
ArmPkg/Library/BaseMemoryLibVstm/CompareMemWrapper.c
View File

@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
If all Length bytes of the two buffers are identical, then 0 is returned. Otherwise, the If all Length bytes of the two buffers are identical, then 0 is returned. Otherwise, the
value returned is the first mismatched byte in SourceBuffer subtracted from the first value returned is the first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer. mismatched byte in DestinationBuffer.
If Length > 0 and DestinationBuffer is NULL, then ASSERT(). If Length > 0 and DestinationBuffer is NULL, then ASSERT().
If Length > 0 and SourceBuffer is NULL, then ASSERT(). If Length > 0 and SourceBuffer is NULL, then ASSERT().
If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@return 0 All Length bytes of the two buffers are identical. @return 0 All Length bytes of the two buffers are identical.
@retval Non-zero The first mismatched byte in SourceBuffer subtracted from the first @retval Non-zero The first mismatched byte in SourceBuffer subtracted from the first
mismatched byte in DestinationBuffer. mismatched byte in DestinationBuffer.
**/ **/
INTN INTN
EFIAPI EFIAPI

4
ArmPkg/Library/BaseMemoryLibVstm/CopyMemWrapper.c
View File

@ -2,7 +2,7 @@
CopyMem() implementation. CopyMem() implementation.
The following BaseMemoryLib instances contain the same copy of this file: The following BaseMemoryLib instances contain the same copy of this file:
BaseMemoryLib BaseMemoryLib
BaseMemoryLibMmx BaseMemoryLibMmx
BaseMemoryLibSse2 BaseMemoryLibSse2
@ -31,7 +31,7 @@
This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns
DestinationBuffer. The implementation must be reentrant, and it must handle the case DestinationBuffer. The implementation must be reentrant, and it must handle the case
where SourceBuffer overlaps DestinationBuffer. where SourceBuffer overlaps DestinationBuffer.
If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().

8
ArmPkg/Library/BaseMemoryLibVstm/MemLibGuid.c
View File

@ -2,7 +2,7 @@
Implementation of GUID functions. Implementation of GUID functions.
The following BaseMemoryLib instances contain the same copy of this file: The following BaseMemoryLib instances contain the same copy of this file:
BaseMemoryLib BaseMemoryLib
BaseMemoryLibMmx BaseMemoryLibMmx
BaseMemoryLibSse2 BaseMemoryLibSse2
@ -30,7 +30,7 @@
This function copies the contents of the 128-bit GUID specified by SourceGuid to This function copies the contents of the 128-bit GUID specified by SourceGuid to
DestinationGuid, and returns DestinationGuid. DestinationGuid, and returns DestinationGuid.
If DestinationGuid is NULL, then ASSERT(). If DestinationGuid is NULL, then ASSERT().
If SourceGuid is NULL, then ASSERT(). If SourceGuid is NULL, then ASSERT().
@ -63,7 +63,7 @@ CopyGuid (
This function compares Guid1 to Guid2. If the GUIDs are identical then TRUE is returned. This function compares Guid1 to Guid2. If the GUIDs are identical then TRUE is returned.
If there are any bit differences in the two GUIDs, then FALSE is returned. If there are any bit differences in the two GUIDs, then FALSE is returned.
If Guid1 is NULL, then ASSERT(). If Guid1 is NULL, then ASSERT().
If Guid2 is NULL, then ASSERT(). If Guid2 is NULL, then ASSERT().
@ -93,7 +93,7 @@ CompareGuid (
GUID value that matches Guid. If a match is found, then a pointer to the matching GUID value that matches Guid. If a match is found, then a pointer to the matching
GUID in the target buffer is returned. If no match is found, then NULL is returned. GUID in the target buffer is returned. If no match is found, then NULL is returned.
If Length is 0, then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 32-bit boundary, then ASSERT(). If Buffer is not aligned on a 32-bit boundary, then ASSERT().
If Length is not aligned on a 128-bit boundary, then ASSERT(). If Length is not aligned on a 128-bit boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibVstm/ScanMem16Wrapper.c
View File

@ -33,7 +33,7 @@
address to the highest address for a 16-bit value that matches Value. If a match is found, address to the highest address for a 16-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 16-bit boundary, then ASSERT(). If Buffer is not aligned on a 16-bit boundary, then ASSERT().
If Length is not aligned on a 16-bit boundary, then ASSERT(). If Length is not aligned on a 16-bit boundary, then ASSERT().

2
ArmPkg/Library/BaseMemoryLibVstm/ScanMem32Wrapper.c
View File

@ -32,7 +32,7 @@
address to the highest address for a 32-bit value that matches Value. If a match is found, address to the highest address for a 32-bit value that matches Value. If a match is found,
then a pointer to the matching byte in the target buffer is returned. If no match is found, then a pointer to the matching byte in the target buffer is returned. If no match is found,
then NULL is returned. If Length is 0, then NULL is returned. then NULL is returned. If Length is 0, then NULL is returned.
If Length > 0 and Buffer is NULL, then ASSERT(). If Length > 0 and Buffer is NULL, then ASSERT().
If Buffer is not aligned on a 32-bit boundary, then ASSERT(). If Buffer is not aligned on a 32-bit boundary, then ASSERT().
If Length is not aligned on a 32-bit boundary, then ASSERT(). If Length is not aligned on a 32-bit boundary, then ASSERT().

Some files were not shown because too many files have changed in this diff Show More