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

Remove tabs from all text files in the package.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11295 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish
2011-02-02 22:52:07 +00:00
parent 6111eb8555
commit 58b5d037b4
51 changed files with 1286 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,8 +111,8 @@ CpuSetMemoryAttributes (
EFI_STATUS EFI_STATUS
InitializeExceptions ( InitializeExceptions (
IN EFI_CPU_ARCH_PROTOCOL *Cpu \s\sIN EFI_CPU_ARCH_PROTOCOL *Cpu
); \s\s);
EFI_STATUS EFI_STATUS
SyncCacheConfig ( SyncCacheConfig (

16
ArmPkg/Drivers/CpuDxe/Mmu.c
View File

@@ -338,11 +338,11 @@ UpdatePageEntries (
// modify cacheability attributes // modify cacheability attributes
EntryMask |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK; EntryMask |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK;
if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) { if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {
// map to strongly ordered \s\s\s\s // map to strongly ordered
EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0 \s\s\s\s EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
} else { } else {
// map to normal non-cachable \s\s // map to normal non-cachable
EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0 \s\s EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0
} }
break; break;
@@ -486,11 +486,11 @@ UpdateSectionEntries (
// modify cacheability attributes // modify cacheability attributes
EntryMask |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK; EntryMask |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK;
if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) { if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {
// map to strongly ordered \s\s\s\s // map to strongly ordered
EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0 \s\s\s\s EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
} else { } else {
// map to normal non-cachable \s\s // map to normal non-cachable
EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0 \s\s EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0
} }
break; break;

234
ArmPkg/Drivers/PL34xDmc/PL341Dmc.c
View File

@@ -64,7 +64,7 @@
#define DMC_DIRECT_CMD_MEMCMD_NOP (0x3 << 18) #define DMC_DIRECT_CMD_MEMCMD_NOP (0x3 << 18)
#define DMC_DIRECT_CMD_MEMCMD_DPD (0x1 << 22) #define DMC_DIRECT_CMD_MEMCMD_DPD (0x1 << 22)
#define DMC_DIRECT_CMD_BANKADDR(n) ((n & 0x3) << 16) #define DMC_DIRECT_CMD_BANKADDR(n) ((n & 0x3) << 16)
#define DMC_DIRECT_CMD_CHIP_ADDR(n) ((n & 0x3) << 20) #define DMC_DIRECT_CMD_CHIP_ADDR(n)\s\s\s\s((n & 0x3) << 20)
// //
@@ -163,25 +163,25 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
// //
if (config->has_qos) { if (config->has_qos) {
// CLCD AXIID = 000 \s\s// CLCD AXIID = 000
DmcWriteReg(DMC_ID_0_CFG_REG, DMC_ID_CFG_QOS_ENABLE | DMC_ID_CFG_QOS_MIN); \s\sDmcWriteReg(DMC_ID_0_CFG_REG, DMC_ID_CFG_QOS_ENABLE | DMC_ID_CFG_QOS_MIN);
// Default disable QoS \s\s// Default disable QoS
DmcWriteReg(DMC_ID_1_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_1_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_2_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_2_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_3_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_3_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_4_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_4_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_5_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_5_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_6_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_6_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_7_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_7_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_8_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_8_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_9_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_9_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_10_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_10_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_11_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_11_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_12_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_12_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_13_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_13_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_14_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_14_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
DmcWriteReg(DMC_ID_15_CFG_REG, DMC_ID_CFG_QOS_DISABLE); \s\sDmcWriteReg(DMC_ID_15_CFG_REG, DMC_ID_CFG_QOS_DISABLE);
} }
// //
@@ -231,104 +231,104 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
// |====================================== // |======================================
DmcWriteReg(DMC_MEMORY_CFG3_REG, config->memory_cfg3); DmcWriteReg(DMC_MEMORY_CFG3_REG, config->memory_cfg3);
// |======================================================== \s\s// |========================================================
// |Set Test Chip PHY Registers via PL341 User Config Reg \s\s// |Set Test Chip PHY Registers via PL341 User Config Reg
// |Note that user_cfgX registers are Write Only \s\s// |Note that user_cfgX registers are Write Only
// | \s\s// |
// |DLL Freq set = 250MHz - 266MHz \s\s// |DLL Freq set = 250MHz - 266MHz
// |======================================================== \s\s// |========================================================
DmcWriteReg(DMC_USER_0_CFG_REG, 0x7C924924); \s\sDmcWriteReg(DMC_USER_0_CFG_REG, 0x7C924924);
// user_config2 \s\s// user_config2
// ------------ \s\s// ------------
// Set defaults before calibrating the DDR2 buffer impendence \s\s// Set defaults before calibrating the DDR2 buffer impendence
// -Disable ODT \s\s// -Disable ODT
// -Default drive strengths \s\s// -Default drive strengths
DmcWriteReg(DMC_USER_2_CFG_REG, 0x40000198); \s\sDmcWriteReg(DMC_USER_2_CFG_REG, 0x40000198);
// |======================================================= \s\s// |=======================================================
// |Auto calibrate the DDR2 buffers impendence \s\s// |Auto calibrate the DDR2 buffers impendence
// |======================================================= \s\s// |=======================================================
val32 = DmcReadReg(DMC_USER_STATUS_REG); \s\sval32 = DmcReadReg(DMC_USER_STATUS_REG);
while (!(val32 & 0x100)) { \s\swhile (!(val32 & 0x100)) {
val32 = DmcReadReg(DMC_USER_STATUS_REG); \s\s val32 = DmcReadReg(DMC_USER_STATUS_REG);
} \s\s}
// Set the output driven strength \s\s// Set the output driven strength
DmcWriteReg(DMC_USER_2_CFG_REG, 0x40800000 | \s\sDmcWriteReg(DMC_USER_2_CFG_REG, 0x40800000 |
(TC_UIOLHXC_VALUE << TC_UIOLHNC_SHIFT) | \s\s\s\s (TC_UIOLHXC_VALUE << TC_UIOLHNC_SHIFT) |
(TC_UIOLHXC_VALUE << TC_UIOLHPC_SHIFT) | \s\s\s\s (TC_UIOLHXC_VALUE << TC_UIOLHPC_SHIFT) |
(0x1 << TC_UIOHOCT_SHIFT) | \s\s\s\s (0x1 << TC_UIOHOCT_SHIFT) |
(0x1 << TC_UIOHSTOP_SHIFT)); \s\s\s\s (0x1 << TC_UIOHSTOP_SHIFT));
// |====================================== \s\s// |======================================
// | Set PL341 Feature Control Register \s\s// | Set PL341 Feature Control Register
// |====================================== \s\s// |======================================
// | Disable early BRESP - use to optimise CLCD performance \s\s// | Disable early BRESP - use to optimise CLCD performance
DmcWriteReg(DMC_FEATURE_CRTL_REG, 0x00000001); \s\sDmcWriteReg(DMC_FEATURE_CRTL_REG, 0x00000001);
//================= //=================
// Config memories // Config memories
//================= //=================
for (chip = 0; chip <= config-> max_chip; chip++) { for (chip = 0; chip <= config-> max_chip; chip++) {
// send nop \s\s// send nop
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_NOP); \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_NOP);
// pre-charge all \s\s// pre-charge all
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL); \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);
// delay \s\s// delay
for (i = 0; i < 10; i++) { \s\sfor (i = 0; i < 10; i++) {
val32 = DmcReadReg(DMC_STATUS_REG); \s\s val32 = DmcReadReg(DMC_STATUS_REG);
} \s\s}
// set (EMR2) extended mode register 2 \s\s// set (EMR2) extended mode register 2
DmcWriteReg(DMC_DIRECT_CMD_REG, \s\sDmcWriteReg(DMC_DIRECT_CMD_REG,
DMC_DIRECT_CMD_CHIP_ADDR(chip) | \s\s\s\s DMC_DIRECT_CMD_CHIP_ADDR(chip) |
DMC_DIRECT_CMD_BANKADDR(2) | \s\s\s\s DMC_DIRECT_CMD_BANKADDR(2) |
DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); \s\s\s\s DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);
// set (EMR3) extended mode register 3 \s\s// set (EMR3) extended mode register 3
DmcWriteReg(DMC_DIRECT_CMD_REG, \s\sDmcWriteReg(DMC_DIRECT_CMD_REG,
DMC_DIRECT_CMD_CHIP_ADDR(chip) | \s\s\s\s DMC_DIRECT_CMD_CHIP_ADDR(chip) |
DMC_DIRECT_CMD_BANKADDR(3) | \s\s\s\s DMC_DIRECT_CMD_BANKADDR(3) |
DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); \s\s\s\s DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);
// ================================= \s\s// =================================
// set (EMR) Extended Mode Register \s\s// set (EMR) Extended Mode Register
// ================================== \s\s// ==================================
// Put into OCD default state \s\s// Put into OCD default state
DmcWriteReg(DMC_DIRECT_CMD_REG, \s\sDmcWriteReg(DMC_DIRECT_CMD_REG,
DMC_DIRECT_CMD_CHIP_ADDR(chip) | \s\s\s\s DMC_DIRECT_CMD_CHIP_ADDR(chip) |
DMC_DIRECT_CMD_BANKADDR(1) | \s\s\s\s DMC_DIRECT_CMD_BANKADDR(1) |
DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); \s\s\s\s DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);
// =========================================================== \s\s// ===========================================================
// set (MR) mode register - With DLL reset \s\s// set (MR) mode register - With DLL reset
// =========================================================== \s\s// ===========================================================
// Burst Length = 4 (010) \s\s// Burst Length = 4 (010)
// Burst Type = Seq (0) \s\s// Burst Type = Seq (0)
// Latency = 4 (100) \s\s// Latency = 4 (100)
// Test mode = Off (0) \s\s// Test mode = Off (0)
// DLL reset = Yes (1) \s\s// DLL reset = Yes (1)
// Wr Recovery = 4 (011) \s\s// Wr Recovery = 4 (011)
// PD = Normal (0) \s\s// PD = Normal (0)
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080742); DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080742);
// pre-charge all \s\s// pre-charge all
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL); \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);
// auto-refresh \s\s// auto-refresh
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH); \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);
// auto-refresh \s\s// auto-refresh
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH); \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);
// delay \s\s// delay
for (i = 0; i < 10; i++) { \s\sfor (i = 0; i < 10; i++) {
val32 = DmcReadReg(DMC_STATUS_REG); \s\s val32 = DmcReadReg(DMC_STATUS_REG);
} \s\s}
// =========================================================== \s\s// ===========================================================
// set (MR) mode register - Without DLL reset \s\s// set (MR) mode register - Without DLL reset
// =========================================================== \s\s// ===========================================================
// auto-refresh // auto-refresh
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH); DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080642); DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080642);
@@ -338,26 +338,26 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
val32 = DmcReadReg(DMC_STATUS_REG); val32 = DmcReadReg(DMC_STATUS_REG);
} }
// ====================================================== \s\s// ======================================================
// set (EMR) extended mode register - Enable OCD defaults \s\s// set (EMR) extended mode register - Enable OCD defaults
// ====================================================== \s\s// ======================================================
val32 = 0; //NOP \s\sval32 = 0; //NOP
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 | \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 |
(DDR_EMR_OCD_DEFAULT << DDR_EMR_OCD_SHIFT) | \s\s\s\s (DDR_EMR_OCD_DEFAULT << DDR_EMR_OCD_SHIFT) |
DDR_EMR_RTT_75R | \s\s\s\s DDR_EMR_RTT_75R |
(DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK)); \s\s\s\s (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));
// delay \s\s// delay
for (i = 0; i < 10; i++) { \s\sfor (i = 0; i < 10; i++) {
val32 = DmcReadReg(DMC_STATUS_REG); \s\s val32 = DmcReadReg(DMC_STATUS_REG);
} \s\s}
// Set (EMR) extended mode register - OCD Exit \s\s// Set (EMR) extended mode register - OCD Exit
val32 = 0; //NOP \s\sval32 = 0; //NOP
DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 | \s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 |
(DDR_EMR_OCD_NS << DDR_EMR_OCD_SHIFT) | \s\s\s\s (DDR_EMR_OCD_NS << DDR_EMR_OCD_SHIFT) |
DDR_EMR_RTT_75R | \s\s\s\s DDR_EMR_RTT_75R |
(DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK)); \s\s\s\s (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));
} }

24
ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
View File

@@ -21,11 +21,11 @@ EFIAPI
PL390GicEnableInterruptInterface ( PL390GicEnableInterruptInterface (
IN INTN GicInterruptInterfaceBase IN INTN GicInterruptInterfaceBase
) )
{ {\s\s
/* \s\s/*
* Enable the CPU interface in Non-Secure world \s\s * Enable the CPU interface in Non-Secure world
* Note: The ICCICR register is banked when Security extensions are implemented \s\s * Note: The ICCICR register is banked when Security extensions are implemented\s\s
*/ \s\s */
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,0x00000001); MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,0x00000001);
} }
@@ -50,7 +50,7 @@ PL390GicSendSgiTo (
IN INTN CPUTargetList IN INTN CPUTargetList
) )
{ {
MmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16)); \s\sMmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));
} }
UINT32 UINT32
@@ -65,9 +65,9 @@ PL390GicAcknowledgeSgiFrom (
InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR); InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);
//Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID
if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) { \s\sif (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {
//Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR \s\s //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId); \s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);
return 1; return 1;
} else { } else {
return 0; return 0;
@@ -87,9 +87,9 @@ PL390GicAcknowledgeSgi2From (
InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR); InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);
//Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID
if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) { \s\sif((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {
//Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR \s\s //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId); \s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);
return 1; return 1;
} else { } else {
return 0; return 0;

42
ArmPkg/Drivers/PL390Gic/PL390GicSec.c
View File

@@ -34,11 +34,11 @@ PL390GicSetupNonSecure (
//Check if there are any pending interrupts //Check if there are any pending interrupts
while(0 != (MmioRead32(GicDistributorBase + GIC_ICDICPR) & 0xF)) while(0 != (MmioRead32(GicDistributorBase + GIC_ICDICPR) & 0xF))
{ {
//Some of the SGI's are still pending, read Ack register and send End of Interrupt Signal \s\s //Some of the SGI's are still pending, read Ack register and send End of Interrupt Signal
UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR); \s\s UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);
//Write to End of interrupt signal \s\s //Write to End of interrupt signal
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId); \s\s MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);
} }
// Ensure all GIC interrupts are Non-Secure // Ensure all GIC interrupts are Non-Secure
@@ -56,19 +56,19 @@ PL390GicEnableInterruptInterface (
IN INTN GicInterruptInterfaceBase IN INTN GicInterruptInterfaceBase
) )
{ {
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0x000000FF); /* Set Priority Mask to allow interrupts */ \s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0x000000FF); /* Set Priority Mask to allow interrupts */
/* \s\s/*
* Enable CPU interface in Secure world \s\s * Enable CPU interface in Secure world
* Enable CPU inteface in Non-secure World * Enable CPU inteface in Non-secure World
* Signal Secure Interrupts to CPU using FIQ line * \s\s * Signal Secure Interrupts to CPU using FIQ line *
*/ \s\s */
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR, MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,
GIC_ICCICR_ENABLE_SECURE(1) | \s\s\s\sGIC_ICCICR_ENABLE_SECURE(1) |
GIC_ICCICR_ENABLE_NS(1) | \s\s\s\sGIC_ICCICR_ENABLE_NS(1) |
GIC_ICCICR_ACK_CTL(0) | \s\s\s\sGIC_ICCICR_ACK_CTL(0) |
GIC_ICCICR_SIGNAL_SECURE_TO_FIQ(1) | \s\s\s\sGIC_ICCICR_SIGNAL_SECURE_TO_FIQ(1) |
GIC_ICCICR_USE_SBPR(0)); \s\s\s\sGIC_ICCICR_USE_SBPR(0));
} }
VOID VOID
@@ -88,7 +88,7 @@ PL390GicSendSgiTo (
IN INTN CPUTargetList IN INTN CPUTargetList
) )
{ {
MmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16)); \s\sMmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));
} }
UINT32 UINT32
@@ -103,9 +103,9 @@ PL390GicAcknowledgeSgiFrom (
InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR); InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);
//Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID
if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) { \s\sif (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {
//Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR \s\s //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId); \s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);
return 1; return 1;
} else { } else {
return 0; return 0;
@@ -125,9 +125,9 @@ PL390GicAcknowledgeSgi2From (
InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR); InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);
//Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID
if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) { \s\sif((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {
//Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR \s\s //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR
MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId); \s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);
return 1; return 1;
} else { } else {
return 0; return 0;

80
ArmPkg/Include/Drivers/PL341Dmc.h
View File

@@ -17,32 +17,32 @@
struct pl341_dmc_config { struct pl341_dmc_config {
UINTN base; // base address for the controller UINTN\s\sbase; // base address for the controller
UINTN has_qos; // has QoS registers UINTN\s\shas_qos; // has QoS registers
UINTN max_chip; // number of memory chips accessible UINTN\s\smax_chip; // number of memory chips accessible
UINT32 refresh_prd; UINT32\s\srefresh_prd;
UINT32 cas_latency; UINT32\s\scas_latency;
UINT32 write_latency; UINT32\s\swrite_latency;
UINT32 t_mrd; UINT32\s\st_mrd;
UINT32 t_ras; UINT32\s\st_ras;
UINT32 t_rc; UINT32\s\st_rc;
UINT32 t_rcd; UINT32\s\st_rcd;
UINT32 t_rfc; UINT32\s\st_rfc;
UINT32 t_rp; UINT32\s\st_rp;
UINT32 t_rrd; UINT32\s\st_rrd;
UINT32 t_wr; UINT32\s\st_wr;
UINT32 t_wtr; UINT32\s\st_wtr;
UINT32 t_xp; UINT32\s\st_xp;
UINT32 t_xsr; UINT32\s\st_xsr;
UINT32 t_esr; UINT32\s\st_esr;
UINT32 memory_cfg; UINT32\s\smemory_cfg;
UINT32 memory_cfg2; UINT32\s\smemory_cfg2;
UINT32 memory_cfg3; UINT32\s\smemory_cfg3;
UINT32 chip_cfg0; UINT32\s\schip_cfg0;
UINT32 chip_cfg1; UINT32\s\schip_cfg1;
UINT32 chip_cfg2; UINT32\s\schip_cfg2;
UINT32 chip_cfg3; UINT32\s\schip_cfg3;
UINT32 t_faw; UINT32\s\st_faw;
}; };
/* Memory config bit fields */ /* Memory config bit fields */
@@ -60,21 +60,21 @@ struct pl341_dmc_config {
#define DMC_MEMORY_CONFIG_BURST_4 (0x2 << 15) #define DMC_MEMORY_CONFIG_BURST_4 (0x2 << 15)
#define DMC_MEMORY_CONFIG_BURST_8 (0x3 << 15) #define DMC_MEMORY_CONFIG_BURST_8 (0x3 << 15)
#define DMC_MEMORY_CONFIG_BURST_16 (0x4 << 15) #define DMC_MEMORY_CONFIG_BURST_16 (0x4 << 15)
#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_1 (0x0 << 21) #define DMC_MEMORY_CONFIG_ACTIVE_CHIP_1\s\s\s\s(0x0 << 21)
#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_2 (0x1 << 21) #define DMC_MEMORY_CONFIG_ACTIVE_CHIP_2\s\s\s\s(0x1 << 21)
#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_3 (0x2 << 21) #define DMC_MEMORY_CONFIG_ACTIVE_CHIP_3\s\s\s\s(0x2 << 21)
#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_4 (0x3 << 21) #define DMC_MEMORY_CONFIG_ACTIVE_CHIP_4\s\s\s\s(0x3 << 21)
#define DMC_MEMORY_CFG2_CLK_ASYNC (0x0 << 0) #define DMC_MEMORY_CFG2_CLK_ASYNC\s\s\s\s(0x0 << 0)
#define DMC_MEMORY_CFG2_CLK_SYNC (0x1 << 0) #define DMC_MEMORY_CFG2_CLK_SYNC\s\s\s\s(0x1 << 0)
#define DMC_MEMORY_CFG2_DQM_INIT (0x1 << 2) #define DMC_MEMORY_CFG2_DQM_INIT\s\s\s\s(0x1 << 2)
#define DMC_MEMORY_CFG2_CKE_INIT (0x1 << 3) #define DMC_MEMORY_CFG2_CKE_INIT\s\s\s\s(0x1 << 3)
#define DMC_MEMORY_CFG2_BANK_BITS_2 (0x0 << 4) #define DMC_MEMORY_CFG2_BANK_BITS_2\s\s\s\s(0x0 << 4)
#define DMC_MEMORY_CFG2_BANK_BITS_3 (0x3 << 4) #define DMC_MEMORY_CFG2_BANK_BITS_3\s\s\s\s(0x3 << 4)
#define DMC_MEMORY_CFG2_MEM_WIDTH_16 (0x0 << 6) #define DMC_MEMORY_CFG2_MEM_WIDTH_16\s\s\s\s(0x0 << 6)
#define DMC_MEMORY_CFG2_MEM_WIDTH_32 (0x1 << 6) #define DMC_MEMORY_CFG2_MEM_WIDTH_32\s\s\s\s(0x1 << 6)
#define DMC_MEMORY_CFG2_MEM_WIDTH_64 (0x2 << 6) #define DMC_MEMORY_CFG2_MEM_WIDTH_64\s\s\s\s(0x2 << 6)
#define DMC_MEMORY_CFG2_MEM_WIDTH_RESERVED (0x3 << 6) #define DMC_MEMORY_CFG2_MEM_WIDTH_RESERVED\s\s(0x3 << 6)

2
ArmPkg/Include/Library/L2X0CacheLib.h
View File

@@ -29,7 +29,7 @@
#define L230_TAG_LATENCY 0x108 #define L230_TAG_LATENCY 0x108
#define L230_DATA_LATENCY 0x10C #define L230_DATA_LATENCY 0x10C
#define L2X0_INTCLEAR 0x220 #define L2X0_INTCLEAR 0x220
#define L2X0_CACHE_SYNC 0x730 #define L2X0_CACHE_SYNC\s\s\s\s\s\s0x730
#define L2X0_INVWAY 0x77C #define L2X0_INVWAY 0x77C
#define L2X0_CLEAN_WAY 0x7BC #define L2X0_CLEAN_WAY 0x7BC
#define L2X0_PFCTRL 0xF60 #define L2X0_PFCTRL 0xF60

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

@@ -57,4 +57,4 @@ struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL {
extern EFI_GUID gVirtualUncachedPagesProtocolGuid; extern EFI_GUID gVirtualUncachedPagesProtocolGuid;
#endif #endif\s\s

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

@@ -58,18 +58,18 @@ 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
\s\s
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
\s\s
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. \s\s @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
bx LR bx LR
@@ -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
\s\s
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
@@ -111,7 +111,7 @@ ASM_PFX(ArmCleanDataCache):
mrc p15,0,r15,c7,c10,3 mrc p15,0,r15,c7,c10,3
bne ASM_PFX(ArmCleanDataCache) bne 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\s\s@Drain write buffer
bx LR bx LR
ASM_PFX(ArmInvalidateDataCache): ASM_PFX(ArmInvalidateDataCache):
@@ -125,7 +125,7 @@ ASM_PFX(ArmCleanInvalidateDataCache):
mrc p15,0,r15,c7,c14,3 mrc p15,0,r15,c7,c14,3
bne ASM_PFX(ArmCleanInvalidateDataCache) bne ASM_PFX(ArmCleanInvalidateDataCache)
mov R0,#0 mov R0,#0
mcr p15,0,R0,c7,c10,4 @Drain write buffer mcr p15,0,R0,c7,c10,4\s\s @Drain write buffer
bx LR bx LR
ASM_PFX(ArmEnableBranchPrediction): ASM_PFX(ArmEnableBranchPrediction):

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

@@ -112,7 +112,7 @@ ArmCleanDataCache
MRC p15,0,r15,c7,c10,3 MRC p15,0,r15,c7,c10,3
BNE ArmCleanDataCache BNE ArmCleanDataCache
MOV R0,#0 MOV R0,#0
MCR p15,0,R0,c7,c10,4 ;Drain write buffer MCR p15,0,R0,c7,c10,4\s\s ;Drain write buffer
BX LR BX LR
ArmInvalidateDataCache ArmInvalidateDataCache
@@ -126,7 +126,7 @@ ArmCleanInvalidateDataCache
MRC p15,0,r15,c7,c14,3 MRC p15,0,r15,c7,c14,3
BNE ArmCleanInvalidateDataCache BNE ArmCleanInvalidateDataCache
MOV R0,#0 MOV R0,#0
MCR p15,0,R0,c7,c10,4 ;Drain write buffer MCR p15,0,R0,c7,c10,4\s\s ;Drain write buffer
BX LR BX LR
ArmEnableBranchPrediction ArmEnableBranchPrediction

22
ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm
View File

@@ -70,17 +70,17 @@ ArmDisableAsynchronousAbort
ArmEnableIrq ArmEnableIrq
cpsie i cpsie i
isb isb
bx LR \s\sbx LR
ArmDisableIrq ArmDisableIrq
cpsid i cpsid i
isb isb
bx LR \s\sbx LR
ArmEnableFiq ArmEnableFiq
cpsie f cpsie f
isb isb
bx LR \s\sbx LR
ArmDisableFiq ArmDisableFiq
cpsid f cpsid f
@@ -99,17 +99,17 @@ ArmDisableInterrupts
ArmGetInterruptState ArmGetInterruptState
mrs R0,CPSR mrs R0,CPSR
tst R0,#0x80 ;Check if IRQ is enabled. tst R0,#0x80\s\s ;Check if IRQ is enabled.
moveq R0,#1 moveq R0,#1
movne R0,#0 movne R0,#0
bx LR \s\sbx LR
ArmGetFiqState ArmGetFiqState
mrs R0,CPSR \s\smrs R0,CPSR
tst R0,#0x40 ;Check if FIQ is enabled. \s\stst R0,#0x40\s\s ;Check if FIQ is enabled.
moveq R0,#1 \s\smoveq R0,#1
movne R0,#0 \s\smovne R0,#0
bx LR \s\sbx LR
ArmInvalidateTlb ArmInvalidateTlb
mov r0,#0 mov r0,#0
@@ -126,7 +126,7 @@ ArmSetTTBR0
ArmGetTTBR0BaseAddress ArmGetTTBR0BaseAddress
mrc p15,0,r0,c2,c0,0 mrc p15,0,r0,c2,c0,0
ldr r1, = 0xFFFFC000 ldr\s\s r1, = 0xFFFFC000
and r0, r0, r1 and r0, r0, r1
isb isb
bx lr bx lr

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

@@ -31,7 +31,7 @@ ASM_PFX(ArmGetScuBaseAddress):
# the Configuration BAR as a stack is not necessary setup. The SCU is at the # the Configuration BAR as a stack is not necessary setup. The SCU is at the
# offset 0x0000 from the Private Memory Region. # offset 0x0000 from the Private Memory Region.
mrc p15, 4, r0, c15, c0, 0 mrc p15, 4, r0, c15, c0, 0
bx lr bx\s\slr
# IN None # IN None
# OUT r1 = SCU enabled (boolean) # OUT r1 = SCU enabled (boolean)

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

@@ -31,7 +31,7 @@ ArmGetScuBaseAddress
// the Configuration BAR as a stack is not necessary setup. The SCU is at the // the Configuration BAR as a stack is not necessary setup. The SCU is at the
// offset 0x0000 from the Private Memory Region. // offset 0x0000 from the Private Memory Region.
mrc p15, 4, r0, c15, c0, 0 mrc p15, 4, r0, c15, c0, 0
bx lr bx\s\slr
// IN None // IN None
// OUT r1 = SCU enabled (boolean) // OUT r1 = SCU enabled (boolean)

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

@@ -80,21 +80,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\s\s\s\s
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\s\s\s\s
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\s\s\s\s
dsb dsb
isb isb
bx lr bx lr
@@ -119,7 +119,7 @@ ASM_PFX(ArmDisableMmu):
bic R0,R0,#1 bic R0,R0,#1
mcr p15,0,R0,c1,c0,0 @Disable MMU mcr p15,0,R0,c1,c0,0 @Disable MMU
mcr p15,0,R0,c8,c7,0 @Invalidate TLB \s\smcr \s\s\s\sp15,0,R0,c8,c7,0 @Invalidate TLB
mcr p15,0,R0,c7,c5,6 @Invalidate Branch predictor array mcr p15,0,R0,c7,c5,6 @Invalidate Branch predictor array
dsb dsb
isb isb
@@ -309,7 +309,7 @@ ASM_PFX(ArmCallWFI):
//Note: Return 0 in Uniprocessor implementation //Note: Return 0 in Uniprocessor implementation
ASM_PFX(ArmReadCbar): ASM_PFX(ArmReadCbar):
mrc p15, 4, r0, c15, c0, 0 //Read Configuration Base Address Register mrc p15, 4, r0, c15, c0, 0\s\s//Read Configuration Base Address Register
bx lr bx lr
ASM_PFX(ArmInvalidateInstructionAndDataTlb): ASM_PFX(ArmInvalidateInstructionAndDataTlb):
@@ -318,7 +318,7 @@ ASM_PFX(ArmInvalidateInstructionAndDataTlb):
bx lr bx lr
ASM_PFX(ArmReadMpidr): ASM_PFX(ArmReadMpidr):
mrc p15, 0, r0, c0, c0, 5 @ read MPIDR mrc p15, 0, r0, c0, c0, 5\s\s @ read MPIDR
bx lr bx lr
ASM_FUNCTION_REMOVE_IF_UNREFERENCED ASM_FUNCTION_REMOVE_IF_UNREFERENCED

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

@@ -82,21 +82,21 @@ ArmCleanInvalidateDataCacheEntryByMVA
ArmInvalidateDataCacheEntryBySetWay ArmInvalidateDataCacheEntryBySetWay
mcr p15, 0, r0, c7, c6, 2 ; Invalidate this line mcr p15, 0, r0, c7, c6, 2 ; Invalidate this line\s\s\s\s
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\s\s\s\s
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\s\s\s\s
dsb dsb
isb isb
bx lr bx lr
@@ -125,7 +125,7 @@ ArmDisableMmu
bic R0,R0,#1 ; Clear SCTLR.M bit : Disable MMU bic R0,R0,#1 ; Clear SCTLR.M bit : Disable MMU
mcr p15,0,R0,c1,c0,0 ; Write R0 into SCTLR (Write control register configuration data) mcr p15,0,R0,c1,c0,0 ; Write R0 into SCTLR (Write control register configuration data)
mcr p15,0,R0,c8,c7,0 ; TLBIALL : Invalidate unified TLB mcr \s\s p15,0,R0,c8,c7,0 ; TLBIALL : Invalidate unified TLB
mcr p15,0,R0,c7,c5,6 ; BPIALL : Invalidate entire branch predictor array mcr p15,0,R0,c7,c5,6 ; BPIALL : Invalidate entire branch predictor array
dsb dsb
isb isb
@@ -307,7 +307,7 @@ ArmCallWFI
//Note: Return 0 in Uniprocessor implementation //Note: Return 0 in Uniprocessor implementation
ArmReadCbar ArmReadCbar
mrc p15, 4, r0, c15, c0, 0 //Read Configuration Base Address Register mrc p15, 4, r0, c15, c0, 0\s\s//Read Configuration Base Address Register
bx lr bx lr
ArmInvalidateInstructionAndDataTlb ArmInvalidateInstructionAndDataTlb
@@ -316,7 +316,7 @@ ArmInvalidateInstructionAndDataTlb
bx lr bx lr
ArmReadMpidr ArmReadMpidr
mrc p15, 0, r0, c0, c0, 5 ; read MPIDR mrc p15, 0, r0, c0, c0, 5\s\s\s\s; read MPIDR
bx lr bx lr
END END

52
ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
View File

@@ -42,48 +42,48 @@ ASM_PFX(Cp15CacheInfo):
bx LR bx LR
ASM_PFX(ArmEnableInterrupts): ASM_PFX(ArmEnableInterrupts):
mrs R0,CPSR \s\smrs R0,CPSR
bic R0,R0,#0x80 @Enable IRQ interrupts \s\sbic R0,R0,#0x80\s\s\s\s@Enable IRQ interrupts
msr CPSR_c,R0 \s\smsr CPSR_c,R0
bx LR \s\sbx LR
ASM_PFX(ArmDisableInterrupts): ASM_PFX(ArmDisableInterrupts):
mrs R0,CPSR \s\smrs R0,CPSR
orr R1,R0,#0x80 @Disable IRQ interrupts \s\sorr R1,R0,#0x80\s\s\s\s@Disable IRQ interrupts
msr CPSR_c,R1 \s\smsr CPSR_c,R1
tst R0,#0x80 tst R0,#0x80
moveq R0,#1 moveq R0,#1
movne R0,#0 movne R0,#0
bx LR \s\sbx LR
ASM_PFX(ArmGetInterruptState): ASM_PFX(ArmGetInterruptState):
mrs R0,CPSR \s\smrs R0,CPSR
tst R0,#0x80 @Check if IRQ is enabled. \s\stst R0,#0x80\s\s @Check if IRQ is enabled.
moveq R0,#1 \s\smoveq R0,#1
movne R0,#0 \s\smovne R0,#0
bx LR \s\sbx LR
ASM_PFX(ArmEnableFiq): ASM_PFX(ArmEnableFiq):
mrs R0,CPSR \s\smrs R0,CPSR
bic R0,R0,#0x40 @Enable FIQ interrupts \s\sbic R0,R0,#0x40\s\s\s\s@Enable FIQ interrupts
msr CPSR_c,R0 \s\smsr CPSR_c,R0
bx LR \s\sbx LR
ASM_PFX(ArmDisableFiq): ASM_PFX(ArmDisableFiq):
mrs R0,CPSR \s\smrs R0,CPSR
orr R1,R0,#0x40 @Disable FIQ interrupts \s\sorr R1,R0,#0x40\s\s\s\s@Disable FIQ interrupts
msr CPSR_c,R1 \s\smsr CPSR_c,R1
tst R0,#0x80 tst R0,#0x80
moveq R0,#1 moveq R0,#1
movne R0,#0 movne R0,#0
bx LR \s\sbx LR
ASM_PFX(ArmGetFiqState): ASM_PFX(ArmGetFiqState):
mrs R0,CPSR \s\smrs R0,CPSR
tst R0,#0x80 @Check if FIQ is enabled. \s\stst R0,#0x80\s\s @Check if FIQ is enabled.
moveq R0,#1 \s\smoveq R0,#1
movne R0,#0 \s\smovne R0,#0
bx LR \s\sbx LR
ASM_PFX(ArmInvalidateTlb): ASM_PFX(ArmInvalidateTlb):
mov r0,#0 mov r0,#0

52
ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
View File

@@ -48,48 +48,48 @@ ArmIsMPCore
bx LR bx LR
ArmEnableInterrupts ArmEnableInterrupts
mrs R0,CPSR \s\smrs R0,CPSR
bic R0,R0,#0x80 ;Enable IRQ interrupts \s\sbic R0,R0,#0x80\s\s\s\s;Enable IRQ interrupts
msr CPSR_c,R0 \s\smsr CPSR_c,R0
bx LR \s\sbx LR
ArmDisableInterrupts ArmDisableInterrupts
mrs R0,CPSR \s\smrs R0,CPSR
orr R1,R0,#0x80 ;Disable IRQ interrupts \s\sorr R1,R0,#0x80\s\s\s\s;Disable IRQ interrupts
msr CPSR_c,R1 \s\smsr CPSR_c,R1
tst R0,#0x80 tst R0,#0x80
moveq R0,#1 moveq R0,#1
movne R0,#0 movne R0,#0
bx LR \s\sbx LR
ArmGetInterruptState ArmGetInterruptState
mrs R0,CPSR \s\smrs R0,CPSR
tst R0,#0x80 ;Check if IRQ is enabled. \s\stst R0,#0x80\s\s ;Check if IRQ is enabled.
moveq R0,#1 \s\smoveq R0,#1
movne R0,#0 \s\smovne R0,#0
bx LR \s\sbx LR
ArmEnableFiq ArmEnableFiq
mrs R0,CPSR \s\smrs R0,CPSR
bic R0,R0,#0x40 ;Enable IRQ interrupts \s\sbic R0,R0,#0x40\s\s\s\s;Enable IRQ interrupts
msr CPSR_c,R0 \s\smsr CPSR_c,R0
bx LR \s\sbx LR
ArmDisableFiq ArmDisableFiq
mrs R0,CPSR \s\smrs R0,CPSR
orr R1,R0,#0x40 ;Disable IRQ interrupts \s\sorr R1,R0,#0x40\s\s\s\s;Disable IRQ interrupts
msr CPSR_c,R1 \s\smsr CPSR_c,R1
tst R0,#0x40 tst R0,#0x40
moveq R0,#1 moveq R0,#1
movne R0,#0 movne R0,#0
bx LR \s\sbx LR
ArmGetFiqState ArmGetFiqState
mrs R0,CPSR \s\smrs R0,CPSR
tst R0,#0x40 ;Check if IRQ is enabled. \s\stst R0,#0x40\s\s ;Check if IRQ is enabled.
moveq R0,#1 \s\smoveq R0,#1
movne R0,#0 \s\smovne R0,#0
bx LR \s\sbx LR
ArmInvalidateTlb ArmInvalidateTlb
mov r0,#0 mov r0,#0

2
ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c
View File

@@ -17,7 +17,7 @@
#include <Library/IoLib.h> #include <Library/IoLib.h>
VOID ArmClearMPCoreMailbox() { VOID ArmClearMPCoreMailbox() {
MmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue)); \s\sMmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue));
} }
UINTN ArmGetMPCoreMailbox() { UINTN ArmGetMPCoreMailbox() {

4
ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c
View File

@@ -72,8 +72,8 @@ EFI_STATUS TZASCSetRegion(UINTN TzascBase, UINTN RegionId, UINTN Enabled, UINTN
Region = (UINT32*)((UINTN)TzascBase + TZASC_REGIONS_REG + (RegionId * 0x10)); Region = (UINT32*)((UINTN)TzascBase + TZASC_REGIONS_REG + (RegionId * 0x10));
MmioWrite32((UINTN)(Region), LowAddress&0xFFFF8000); MmioWrite32((UINTN)(Region), LowAddress&0xFFFF8000);
MmioWrite32((UINTN)(Region+1), HighAddress); \s\sMmioWrite32((UINTN)(Region+1), HighAddress);
MmioWrite32((UINTN)(Region+2), ((Security & 0xF) <<28) | ((Size & 0x3F) << 1) | (Enabled & 0x1)); \s\sMmioWrite32((UINTN)(Region+2), ((Security & 0xF) <<28) | ((Size & 0x3F) << 1) | (Enabled & 0x1));
return EFI_SUCCESS; return EFI_SUCCESS;
} }

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

@@ -42,71 +42,71 @@ InternalMemCopyMem (
GCC_ASM_EXPORT(InternalMemCopyMem) GCC_ASM_EXPORT(InternalMemCopyMem)
ASM_PFX(InternalMemCopyMem): ASM_PFX(InternalMemCopyMem):
stmfd sp!, {r4-r11, lr} \s\sstmfd\s\ssp!, {r4-r11, lr}
tst r0, #3 \s\stst\s\sr0, #3
mov r11, r0 \s\smov\s\sr11, r0
mov r10, r0 \s\smov\s\sr10, r0
mov ip, r2 \s\smov\s\sip, r2
mov lr, r1 \s\smov\s\slr, r1
movne r0, #0 \s\smovne\s\sr0, #0
bne L4 \s\sbne\s\sL4
tst r1, #3 \s\stst\s\sr1, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r2, #31 \s\scmp\s\sr2, #31
movls r0, #0 \s\smovls\s\sr0, #0
andhi r0, r3, #1 \s\sandhi\s\sr0, r3, #1
L4: L4:
cmp r11, r1 \s\scmp\s\sr11, r1
bcc L26 \s\sbcc\s\sL26
bls L7 \s\sbls\s\sL7
rsb r3, r1, r11 \s\srsb\s\sr3, r1, r11
cmp ip, r3 \s\scmp\s\sip, r3
bcc L26 \s\sbcc\s\sL26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
add r10, r11, ip \s\sadd\s\sr10, r11, ip
add lr, ip, r1 \s\sadd\s\slr, ip, r1
b L16 \s\sb\s\sL16
L29: L29:
sub ip, ip, #8 \s\ssub\s\sip, ip, #8
cmp ip, #7 \s\scmp\s\sip, #7
ldrd r2, [lr, #-8]! \s\sldrd\s\sr2, [lr, #-8]!
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
strd r2, [r10, #-8]! \s\sstrd\s\sr2, [r10, #-8]!
beq L7 \s\sbeq\s\sL7
L16: L16:
cmp r0, #0 \s\scmp\s\sr0, #0
bne L29 \s\sbne\s\sL29
sub r3, lr, #1 \s\ssub\s\sr3, lr, #1
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
ldrb r3, [r3, #0] \s\sldrb\s\sr3, [r3, #0]\s\s
sub r2, r10, #1 \s\ssub\s\sr2, r10, #1
cmp ip, #0 \s\scmp\s\sip, #0
sub r10, r10, #1 \s\ssub\s\sr10, r10, #1
sub lr, lr, #1 \s\ssub\s\slr, lr, #1
strb r3, [r2, #0] \s\sstrb\s\sr3, [r2, #0]
bne L16 \s\sbne\s\sL16
b L7 \s\sb L7
L11: L11:
ldrb r3, [lr], #1 \s\sldrb\s\sr3, [lr], #1\s\s
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
strb r3, [r10], #1 \s\sstrb\s\sr3, [r10], #1
L26: L26:
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
L30: L30:
cmp r0, #0 \s\scmp\s\sr0, #0
beq L11 \s\sbeq\s\sL11
sub ip, ip, #32 \s\ssub\s\sip, ip, #32
cmp ip, #31 \s\scmp\s\sip, #31
ldmia lr!, {r2-r9} \s\sldmia\s\slr!, {r2-r9}
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
stmia r10!, {r2-r9} \s\sstmia\s\sr10!, {r2-r9}
bne L30 \s\sbne\s\sL30
L7: L7:
mov r0, r11 mov\s\sr0, r11
ldmfd sp!, {r4-r11, pc} \s\sldmfd\s\ssp!, {r4-r11, pc}

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

@@ -37,78 +37,78 @@ InternalMemCopyMem (
IN UINTN Length IN UINTN Length
) )
**/ **/
EXPORT InternalMemCopyMem \s\sEXPORT InternalMemCopyMem
AREA AsmMemStuff, CODE, READONLY \s\sAREA AsmMemStuff, CODE, READONLY
InternalMemCopyMem InternalMemCopyMem
stmfd sp!, {r4-r11, lr} \s\sstmfd\s\ssp!, {r4-r11, lr}
tst r0, #3 \s\stst\s\sr0, #3
mov r11, r0 \s\smov\s\sr11, r0
mov r10, r0 \s\smov\s\sr10, r0
mov ip, r2 \s\smov\s\sip, r2
mov lr, r1 \s\smov\s\slr, r1
movne r0, #0 \s\smovne\s\sr0, #0
bne L4 \s\sbne\s\sL4
tst r1, #3 \s\stst\s\sr1, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r2, #31 \s\scmp\s\sr2, #31
movls r0, #0 \s\smovls\s\sr0, #0
andhi r0, r3, #1 \s\sandhi\s\sr0, r3, #1
L4 L4
cmp r11, r1 \s\scmp\s\sr11, r1
bcc L26 \s\sbcc\s\sL26
bls L7 \s\sbls\s\sL7
rsb r3, r1, r11 \s\srsb\s\sr3, r1, r11
cmp ip, r3 \s\scmp\s\sip, r3
bcc L26 \s\sbcc\s\sL26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
add r10, r11, ip \s\sadd\s\sr10, r11, ip
add lr, ip, r1 \s\sadd\s\slr, ip, r1
b L16 \s\sb\s\sL16
L29 L29
sub ip, ip, #8 \s\ssub\s\sip, ip, #8
cmp ip, #7 \s\scmp\s\sip, #7
ldrd r2, [lr, #-8]! \s\sldrd\s\sr2, [lr, #-8]!
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
strd r2, [r10, #-8]! \s\sstrd\s\sr2, [r10, #-8]!
beq L7 \s\sbeq\s\sL7
L16 L16
cmp r0, #0 \s\scmp\s\sr0, #0
bne L29 \s\sbne\s\sL29
sub r3, lr, #1 \s\ssub\s\sr3, lr, #1
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
ldrb r3, [r3, #0] \s\sldrb\s\sr3, [r3, #0]\s\s
sub r2, r10, #1 \s\ssub\s\sr2, r10, #1
cmp ip, #0 \s\scmp\s\sip, #0
sub r10, r10, #1 \s\ssub\s\sr10, r10, #1
sub lr, lr, #1 \s\ssub\s\slr, lr, #1
strb r3, [r2, #0] \s\sstrb\s\sr3, [r2, #0]
bne L16 \s\sbne\s\sL16
b L7 \s\sb L7
L11 L11
ldrb r3, [lr], #1 \s\sldrb\s\sr3, [lr], #1\s\s
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
strb r3, [r10], #1 \s\sstrb\s\sr3, [r10], #1
L26 L26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
L30 L30
cmp r0, #0 \s\scmp\s\sr0, #0
beq L11 \s\sbeq\s\sL11
sub ip, ip, #32 \s\ssub\s\sip, ip, #32
cmp ip, #31 \s\scmp\s\sip, #31
ldmia lr!, {r2-r9} \s\sldmia\s\slr!, {r2-r9}
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
stmia r10!, {r2-r9} \s\sstmia\s\sr10!, {r2-r9}
bne L30 \s\sbne\s\sL30
L7 L7
mov r0, r11 mov\s\sr0, r11
ldmfd sp!, {r4-r11, pc} \s\sldmfd\s\ssp!, {r4-r11, pc}
\s\s
END END

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

@@ -34,49 +34,49 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
\s\s
.text .text
.align 2 .align 2
GCC_ASM_EXPORT(InternalMemSetMem) GCC_ASM_EXPORT(InternalMemSetMem)
ASM_PFX(InternalMemSetMem): ASM_PFX(InternalMemSetMem):
stmfd sp!, {r4-r11, lr} \s\sstmfd\s\ssp!, {r4-r11, lr}
tst r0, #3 \s\stst\s\s r0, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r1, #31 \s\scmp\s\s r1, #31
movls lr, #0 \s\smovls lr, #0
andhi lr, r3, #1 \s\sandhi\s\slr, r3, #1
cmp lr, #0 \s\scmp\s\s lr, #0
mov r12, r0 \s\smov\s\s r12, r0
bne L31 \s\sbne\s\s L31
L32: L32:
mov r3, #0 \s\smov\s\s r3, #0
b L43 \s\sb\s\s L43
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 \s\smov r5, r4
mov r5, r4 \s\smov r5, r4
mov r6, r4 \s\smov r6, r4
mov r7, r4 \s\smov r7, r4
mov r8, r4 \s\smov r8, r4
mov r9, r4 \s\smov r9, r4
mov r10, r4 \s\smov r10, r4
mov r11, r4 \s\smov r11, r4
b L32 \s\sb\s\s L32
L34: L34:
cmp lr, #0 \s\scmp\s\s lr, #0
streqb r2, [r12], #1 \s\sstreqb\s\sr2, [r12], #1
subeq r1, r1, #1 \s\ssubeq\s\s r1, r1, #1
beq L43 \s\sbeq\s\s L43
sub r1, r1, #32 \s\ssub\s\s r1, r1, #32
cmp r1, #31 \s\scmp\s\s r1, #31
movls lr, r3 \s\smovls\s\s lr, r3
stmia r12!, {r4-r11} \s\sstmia\s\s r12!, {r4-r11}
L43: L43:
cmp r1, #0 \s\scmp\s\s r1, #0
bne L34 \s\sbne\s\s L34
ldmfd sp!, {r4-r11, pc} \s\sldmfd\s\s sp!, {r4-r11, pc}
\s\s

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

@@ -33,51 +33,51 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
\s\s
EXPORT InternalMemSetMem \s\sEXPORT InternalMemSetMem
\s\s
AREA AsmMemStuff, CODE, READONLY \s\sAREA AsmMemStuff, CODE, READONLY
InternalMemSetMem InternalMemSetMem
stmfd sp!, {r4-r11, lr} \s\sstmfd\s\ssp!, {r4-r11, lr}
tst r0, #3 \s\stst\s\s r0, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r1, #31 \s\scmp\s\s r1, #31
movls lr, #0 \s\smovls lr, #0
andhi lr, r3, #1 \s\sandhi\s\slr, r3, #1
cmp lr, #0 \s\scmp\s\s lr, #0
mov r12, r0 \s\smov\s\s r12, r0
bne L31 \s\sbne\s\s L31
L32 L32
mov r3, #0 \s\smov\s\s r3, #0
b L43 \s\sb\s\s L43
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 \s\smov r5, r4
mov r5, r4 \s\smov r5, r4
mov r6, r4 \s\smov r6, r4
mov r7, r4 \s\smov r7, r4
mov r8, r4 \s\smov r8, r4
mov r9, r4 \s\smov r9, r4
mov r10, r4 \s\smov r10, r4
mov r11, r4 \s\smov r11, r4
b L32 \s\sb\s\s L32
L34 L34
cmp lr, #0 \s\scmp\s\s lr, #0
streqb r2, [r12], #1 \s\sstreqb\s\sr2, [r12], #1
subeq r1, r1, #1 \s\ssubeq\s\s r1, r1, #1
beq L43 \s\sbeq\s\s L43
sub r1, r1, #32 \s\ssub\s\s r1, r1, #32
cmp r1, #31 \s\scmp\s\s r1, #31
movls lr, r3 \s\smovls\s\s lr, r3
stmia r12!, {r4-r11} \s\sstmia\s\s r12!, {r4-r11}
L43 L43
cmp r1, #0 \s\scmp\s\s r1, #0
bne L34 \s\sbne\s\s L34
ldmfd sp!, {r4-r11, pc} \s\sldmfd\s\s sp!, {r4-r11, pc}
\s\s
END END

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

@@ -42,73 +42,73 @@ InternalMemCopyMem (
GCC_ASM_EXPORT(InternalMemCopyMem) GCC_ASM_EXPORT(InternalMemCopyMem)
ASM_PFX(InternalMemCopyMem): ASM_PFX(InternalMemCopyMem):
stmfd sp!, {r4, r9, lr} \s\sstmfd\s\ssp!, {r4, r9, lr}
tst r0, #3 \s\stst\s\sr0, #3
mov r4, r0 \s\smov\s\sr4, r0
mov r9, r0 \s\smov\s\sr9, r0
mov ip, r2 \s\smov\s\sip, r2
mov lr, r1 \s\smov\s\slr, r1
movne r0, #0 \s\smovne\s\sr0, #0
bne L4 \s\sbne\s\sL4
tst r1, #3 \s\stst\s\sr1, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r2, #127 \s\scmp\s\sr2, #127
movls r0, #0 \s\smovls\s\sr0, #0
andhi r0, r3, #1 \s\sandhi\s\sr0, r3, #1
L4: L4:
cmp r4, r1 \s\scmp\s\sr4, r1
bcc L26 \s\sbcc\s\sL26
bls L7 \s\sbls\s\sL7
rsb r3, r1, r4 \s\srsb\s\sr3, r1, r4
cmp ip, r3 \s\scmp\s\sip, r3
bcc L26 \s\sbcc\s\sL26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
add r9, r4, ip \s\sadd\s\sr9, r4, ip
add lr, ip, r1 \s\sadd\s\slr, ip, r1
b L16 \s\sb\s\sL16
L29: L29:
sub ip, ip, #8 \s\ssub\s\sip, ip, #8
cmp ip, #7 \s\scmp\s\sip, #7
ldrd r2, [lr, #-8]! \s\sldrd\s\sr2, [lr, #-8]!
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
strd r2, [r9, #-8]! \s\sstrd\s\sr2, [r9, #-8]!
beq L7 \s\sbeq\s\sL7
L16: L16:
cmp r0, #0 \s\scmp\s\sr0, #0
bne L29 \s\sbne\s\sL29
sub r3, lr, #1 \s\ssub\s\sr3, lr, #1
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
ldrb r3, [r3, #0] \s\sldrb\s\sr3, [r3, #0]\s\s
sub r2, r9, #1 \s\ssub\s\sr2, r9, #1
cmp ip, #0 \s\scmp\s\sip, #0
sub r9, r9, #1 \s\ssub\s\sr9, r9, #1
sub lr, lr, #1 \s\ssub\s\slr, lr, #1
strb r3, [r2, #0] \s\sstrb\s\sr3, [r2, #0]
bne L16 \s\sbne\s\sL16
b L7 \s\sb L7
L11: L11:
ldrb r3, [lr], #1 \s\sldrb\s\sr3, [lr], #1\s\s
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
strb r3, [r9], #1 \s\sstrb\s\sr3, [r9], #1
L26: L26:
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
L30: L30:
cmp r0, #0 \s\scmp\s\sr0, #0
beq L11 \s\sbeq\s\sL11
sub ip, ip, #128 // 32 \s\ssub\s\sip, ip, #128 // 32
cmp ip, #127 // 31 \s\scmp\s\sip, #127 // 31
vldm lr!, {d0-d15} \s\svldm lr!, {d0-d15}
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
vstm r9!, {d0-d15} \s\svstm r9!, {d0-d15}
bne L30 \s\sbne\s\sL30
L7: L7:
dsb dsb
mov r0, r4 mov\s\sr0, r4
ldmfd sp!, {r4, r9, pc} \s\sldmfd\s\ssp!, {r4, r9, pc}

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

@@ -37,79 +37,79 @@ InternalMemCopyMem (
IN UINTN Length IN UINTN Length
) )
**/ **/
EXPORT InternalMemCopyMem \s\sEXPORT InternalMemCopyMem
AREA AsmMemStuff, CODE, READONLY \s\sAREA AsmMemStuff, CODE, READONLY
InternalMemCopyMem InternalMemCopyMem
stmfd sp!, {r4, r9, lr} \s\sstmfd\s\ssp!, {r4, r9, lr}
tst r0, #3 \s\stst\s\sr0, #3
mov r4, r0 \s\smov\s\sr4, r0
mov r9, r0 \s\smov\s\sr9, r0
mov ip, r2 \s\smov\s\sip, r2
mov lr, r1 \s\smov\s\slr, r1
movne r0, #0 \s\smovne\s\sr0, #0
bne L4 \s\sbne\s\sL4
tst r1, #3 \s\stst\s\sr1, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r2, #127 \s\scmp\s\sr2, #127
movls r0, #0 \s\smovls\s\sr0, #0
andhi r0, r3, #1 \s\sandhi\s\sr0, r3, #1
L4 L4
cmp r4, r1 \s\scmp\s\sr4, r1
bcc L26 \s\sbcc\s\sL26
bls L7 \s\sbls\s\sL7
rsb r3, r1, r4 \s\srsb\s\sr3, r1, r4
cmp ip, r3 \s\scmp\s\sip, r3
bcc L26 \s\sbcc\s\sL26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
add r9, r4, ip \s\sadd\s\sr9, r4, ip
add lr, ip, r1 \s\sadd\s\slr, ip, r1
b L16 \s\sb\s\sL16
L29 L29
sub ip, ip, #8 \s\ssub\s\sip, ip, #8
cmp ip, #7 \s\scmp\s\sip, #7
ldrd r2, [lr, #-8]! \s\sldrd\s\sr2, [lr, #-8]!
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
strd r2, [r9, #-8]! \s\sstrd\s\sr2, [r9, #-8]!
beq L7 \s\sbeq\s\sL7
L16 L16
cmp r0, #0 \s\scmp\s\sr0, #0
bne L29 \s\sbne\s\sL29
sub r3, lr, #1 \s\ssub\s\sr3, lr, #1
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
ldrb r3, [r3, #0] \s\sldrb\s\sr3, [r3, #0]\s\s
sub r2, r9, #1 \s\ssub\s\sr2, r9, #1
cmp ip, #0 \s\scmp\s\sip, #0
sub r9, r9, #1 \s\ssub\s\sr9, r9, #1
sub lr, lr, #1 \s\ssub\s\slr, lr, #1
strb r3, [r2, #0] \s\sstrb\s\sr3, [r2, #0]
bne L16 \s\sbne\s\sL16
b L7 \s\sb L7
L11 L11
ldrb r3, [lr], #1 \s\sldrb\s\sr3, [lr], #1\s\s
sub ip, ip, #1 \s\ssub\s\sip, ip, #1
strb r3, [r9], #1 \s\sstrb\s\sr3, [r9], #1
L26 L26
cmp ip, #0 \s\scmp\s\sip, #0
beq L7 \s\sbeq\s\sL7
L30 L30
cmp r0, #0 \s\scmp\s\sr0, #0
beq L11 \s\sbeq\s\sL11
sub ip, ip, #128 // 32 \s\ssub\s\sip, ip, #128 // 32
cmp ip, #127 // 31 \s\scmp\s\sip, #127 // 31
vldm lr!, {d0-d15} \s\svldm lr!, {d0-d15}
movls r0, #0 \s\smovls\s\sr0, #0
cmp ip, #0 \s\scmp\s\sip, #0
vstm r9!, {d0-d15} \s\svstm r9!, {d0-d15}
bne L30 \s\sbne\s\sL30
L7 L7
dsb dsb
mov r0, r4 mov\s\sr0, r4
ldmfd sp!, {r4, r9, pc} \s\sldmfd\s\ssp!, {r4, r9, pc}
END END

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

@@ -34,25 +34,25 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
\s\s
.text .text
.align 2 .align 2
GCC_ASM_EXPORT(InternalMemSetMem) GCC_ASM_EXPORT(InternalMemSetMem)
ASM_PFX(InternalMemSetMem): ASM_PFX(InternalMemSetMem):
stmfd sp!, {r4-r7, lr} \s\sstmfd\s\ssp!, {r4-r7, lr}
tst r0, #3 \s\stst\s\s r0, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r1, #127 \s\scmp\s\s r1, #127
movls lr, #0 \s\smovls lr, #0
andhi lr, r3, #1 \s\sandhi\s\slr, r3, #1
cmp lr, #0 \s\scmp\s\s lr, #0
mov r12, r0 \s\smov\s\s r12, r0
bne L31 \s\sbne\s\s L31
L32: L32:
mov r3, #0 \s\smov\s\s r3, #0
b L43 \s\sb\s\s L43
L31: L31:
vdup.8 q0,r2 vdup.8 q0,r2
vmov q1,q0 vmov q1,q0
@@ -62,19 +62,19 @@ L31:
vmov q5,q0 vmov q5,q0
vmov q6,q0 vmov q6,q0
vmov q7,q0 vmov q7,q0
b L32 \s\sb\s\s L32
L34: L34:
cmp lr, #0 \s\scmp\s\s lr, #0
streqb r2, [r12], #1 \s\sstreqb\s\sr2, [r12], #1
subeq r1, r1, #1 \s\ssubeq\s\s r1, r1, #1
beq L43 \s\sbeq\s\s L43
sub r1, r1, #128 \s\ssub\s\s r1, r1, #128
cmp r1, #127 \s\scmp\s\s r1, #127
cmp r1, #31 \s\scmp\s\s r1, #31
movls lr, r3 \s\smovls\s\s lr, r3
vstm r12!, {d0-d15} \s\svstm r12!, {d0-d15}
L43: L43:
cmp r1, #0 \s\scmp\s\s r1, #0
bne L34 \s\sbne\s\s L34
ldmfd sp!, {pc} \s\sldmfd\s\s sp!, {pc}
\s\s

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

@@ -33,25 +33,25 @@ InternalMemSetMem (
IN UINT8 Value IN UINT8 Value
) )
**/ **/
\s\s
EXPORT InternalMemSetMem \s\sEXPORT InternalMemSetMem
\s\s
AREA AsmMemStuff, CODE, READONLY \s\sAREA AsmMemStuff, CODE, READONLY
InternalMemSetMem InternalMemSetMem
stmfd sp!, {lr} \s\sstmfd\s\ssp!, {lr}
tst r0, #3 \s\stst\s\s r0, #3
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #1 \s\smoveq\s\sr3, #1
cmp r1, #127 \s\scmp\s\s r1, #127
movls lr, #0 \s\smovls lr, #0
andhi lr, r3, #1 \s\sandhi\s\slr, r3, #1
cmp lr, #0 \s\scmp\s\s lr, #0
mov r12, r0 \s\smov\s\s r12, r0
bne L31 \s\sbne\s\s L31
L32 L32
mov r3, #0 \s\smov\s\s r3, #0
b L43 \s\sb\s\s L43
L31 L31
vdup.8 q0,r2 vdup.8 q0,r2
vmov q1,q0 vmov q1,q0
@@ -61,20 +61,20 @@ L31
vmov q5,q0 vmov q5,q0
vmov q6,q0 vmov q6,q0
vmov q7,q0 vmov q7,q0
b L32 \s\sb\s\s L32
L34 L34
cmp lr, #0 \s\scmp\s\s lr, #0
streqb r2, [r12], #1 \s\sstreqb\s\sr2, [r12], #1
subeq r1, r1, #1 \s\ssubeq\s\s r1, r1, #1
beq L43 \s\sbeq\s\s L43
sub r1, r1, #128 \s\ssub\s\s r1, r1, #128
cmp r1, #127 \s\scmp\s\s r1, #127
movls lr, r3 \s\smovls\s\s lr, r3
vstm r12!, {d0-d15} \s\svstm r12!, {d0-d15}
L43 L43
cmp r1, #0 \s\scmp\s\s r1, #0
bne L34 \s\sbne\s\s L34
ldmfd sp!, {pc} \s\sldmfd\s\s sp!, {pc}
\s\s
END END

4
ArmPkg/Library/BdsLib/BdsFilePathFs.c
View File

@@ -34,8 +34,8 @@ EFI_STATUS BdsLoadFileFromSimpleFileSystem(
} }
//Try to Open the volume and get root directory //Try to Open the volume and get root directory
Status = FsProtocol->OpenVolume(FsProtocol, &Fs); \s\sStatus = FsProtocol->OpenVolume(FsProtocol, &Fs);
if (EFI_ERROR(Status)) { \s\sif (EFI_ERROR(Status)) {
return Status; return Status;
} }

38
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
View File

@@ -12,24 +12,24 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__ashldi3) \s\sGCC_ASM_EXPORT(__ashldi3)
\s\s
ASM_PFX(__ashldi3): ASM_PFX(__ashldi3):
cmp r2, #31 \s\scmp\s\sr2, #31
bls L2 \s\sbls\s\sL2
cmp r2, #63 \s\scmp\s\sr2, #63
subls r2, r2, #32 \s\ssubls\s\sr2, r2, #32
movls r2, r0, asl r2 \s\smovls\s\sr2, r0, asl r2
movhi r2, #0 \s\smovhi\s\sr2, #0
mov r1, r2 \s\smov\s\sr1, r2
mov r0, #0 \s\smov\s\sr0, #0
bx lr \s\sbx\s\slr
L2: L2:
cmp r2, #0 \s\scmp\s\sr2, #0
rsbne r3, r2, #32 \s\srsbne\s\sr3, r2, #32
movne r3, r0, lsr r3 \s\smovne\s\sr3, r0, lsr r3
movne r0, r0, asl r2 \s\smovne\s\sr0, r0, asl r2
orrne r1, r3, r1, asl r2 \s\sorrne\s\sr1, r3, r1, asl r2
bx lr \s\sbx\s\slr

38
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
View File

@@ -12,25 +12,25 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__ashrdi3) \s\sGCC_ASM_EXPORT(__ashrdi3)
ASM_PFX(__ashrdi3): ASM_PFX(__ashrdi3):
cmp r2, #31 \s\scmp\s\sr2, #31
bls L2 \s\sbls\s\sL2
cmp r2, #63 \s\scmp\s\sr2, #63
subls r2, r2, #32 \s\ssubls\s\sr2, r2, #32
mov ip, r1, asr #31 \s\smov\s\sip, r1, asr #31
movls r2, r1, asr r2 \s\smovls\s\sr2, r1, asr r2
movhi r2, ip \s\smovhi\s\sr2, ip
mov r0, r2 \s\smov\s\sr0, r2
mov r1, ip \s\smov\s\sr1, ip
bx lr \s\sbx\s\slr
L2: L2:
cmp r2, #0 \s\scmp\s\sr2, #0
rsbne r3, r2, #32 \s\srsbne\s\sr3, r2, #32
movne r3, r1, asl r3 \s\smovne\s\sr3, r1, asl r3
movne r1, r1, asr r2 \s\smovne\s\sr1, r1, asr r2
orrne r0, r3, r0, lsr r2 \s\sorrne\s\sr0, r3, r0, lsr r2
bx lr \s\sbx\s\slr

82
ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
View File

@@ -12,46 +12,46 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__clzsi2) \s\sGCC_ASM_EXPORT(__clzsi2)
ASM_PFX(__clzsi2): ASM_PFX(__clzsi2):
@ frame_needed = 1, uses_anonymous_args = 0 \s\s@ frame_needed = 1, uses_anonymous_args = 0
stmfd sp!, {r7, lr} \s\sstmfd\s\ssp!, {r7, lr}
add r7, sp, #0 \s\sadd\s\sr7, sp, #0
movs r3, r0, lsr #16 \s\smovs\s\sr3, r0, lsr #16
movne r3, #16 \s\smovne\s\sr3, #16
moveq r3, #0 \s\smoveq\s\sr3, #0
movne r9, #0 \s\smovne\s\sr9, #0
moveq r9, #16 \s\smoveq\s\sr9, #16
mov r3, r0, lsr r3 \s\smov\s\sr3, r0, lsr r3
tst r3, #65280 \s\stst\s\sr3, #65280
movne r0, #8 \s\smovne\s\sr0, #8
moveq r0, #0 \s\smoveq\s\sr0, #0
movne lr, #0 \s\smovne\s\slr, #0
moveq lr, #8 \s\smoveq\s\slr, #8
mov r3, r3, lsr r0 \s\smov\s\sr3, r3, lsr r0
tst r3, #240 \s\stst\s\sr3, #240
movne r0, #4 \s\smovne\s\sr0, #4
moveq r0, #0 \s\smoveq\s\sr0, #0
movne ip, #0 \s\smovne\s\sip, #0
moveq ip, #4 \s\smoveq\s\sip, #4
mov r3, r3, lsr r0 \s\smov\s\sr3, r3, lsr r0
tst r3, #12 \s\stst\s\sr3, #12
movne r0, #2 \s\smovne\s\sr0, #2
moveq r0, #0 \s\smoveq\s\sr0, #0
movne r1, #0 \s\smovne\s\sr1, #0
moveq r1, #2 \s\smoveq\s\sr1, #2
mov r2, r3, lsr r0 \s\smov\s\sr2, r3, lsr r0
add r3, lr, r9 \s\sadd\s\sr3, lr, r9
add r0, r3, ip \s\sadd\s\sr0, r3, ip
add r1, r0, r1 \s\sadd\s\sr1, r0, r1
mov r0, r2, lsr #1 \s\smov\s\sr0, r2, lsr #1
eor r0, r0, #1 \s\seor\s\sr0, r0, #1
ands r0, r0, #1 \s\sands\s\sr0, r0, #1
mvnne r0, #0 \s\smvnne\s\sr0, #0
rsb r3, r2, #2 \s\srsb\s\sr3, r2, #2
and r0, r0, r3 \s\sand\s\sr0, r0, r3
add r0, r1, r0 \s\sadd\s\sr0, r1, r0
ldmfd sp!, {r7, pc} \s\sldmfd\s\ssp!, {r7, pc}

68
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
View File

@@ -12,38 +12,38 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__ctzsi2) \s\sGCC_ASM_EXPORT(__ctzsi2)
\s\s
ASM_PFX(__ctzsi2): ASM_PFX(__ctzsi2):
uxth r3, r0 \s\suxth\s\sr3, r0
cmp r3, #0 \s\scmp\s\sr3, #0
moveq ip, #16 \s\smoveq\s\sip, #16
movne ip, #0 \s\smovne\s\sip, #0
@ lr needed for prologue \s\s@ lr needed for prologue
mov r0, r0, lsr ip \s\smov\s\sr0, r0, lsr ip
tst r0, #255 \s\stst\s\sr0, #255
movne r3, #0 \s\smovne\s\sr3, #0
moveq r3, #8 \s\smoveq\s\sr3, #8
mov r0, r0, lsr r3 \s\smov\s\sr0, r0, lsr r3
tst r0, #15 \s\stst\s\sr0, #15
movne r1, #0 \s\smovne\s\sr1, #0
moveq r1, #4 \s\smoveq\s\sr1, #4
add r3, r3, ip \s\sadd\s\sr3, r3, ip
mov r0, r0, lsr r1 \s\smov\s\sr0, r0, lsr r1
tst r0, #3 \s\stst\s\sr0, #3
movne r2, #0 \s\smovne\s\sr2, #0
moveq r2, #2 \s\smoveq\s\sr2, #2
add r3, r3, r1 \s\sadd\s\sr3, r3, r1
mov r0, r0, lsr r2 \s\smov\s\sr0, r0, lsr r2
and r0, r0, #3 \s\sand\s\sr0, r0, #3
add r2, r3, r2 \s\sadd\s\sr2, r3, r2
eor r3, r0, #1 \s\seor\s\sr3, r0, #1
mov r0, r0, lsr #1 \s\smov\s\sr0, r0, lsr #1
ands r3, r3, #1 \s\sands\s\sr3, r3, #1
mvnne r3, #0 \s\smvnne\s\sr3, #0
rsb r0, r0, #2 \s\srsb\s\sr0, r0, #2
and r0, r3, r0 \s\sand\s\sr0, r3, r0
add r0, r2, r0 \s\sadd\s\sr0, r2, r0
bx lr \s\sbx\s\slr

68
ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
View File

@@ -12,38 +12,38 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__divdi3) \s\sGCC_ASM_EXPORT(__divdi3)
\s\s
ASM_PFX(__divdi3): ASM_PFX(__divdi3):
@ args = 0, pretend = 0, frame = 0 \s\s@ args = 0, pretend = 0, frame = 0
@ frame_needed = 1, uses_anonymous_args = 0 \s\s@ frame_needed = 1, uses_anonymous_args = 0
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
mov r4, r3, asr #31 \s\smov\s\sr4, r3, asr #31
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
stmfd sp!, {r10, r11} \s\sstmfd\s\ssp!, {r10, r11}
mov r10, r1, asr #31 \s\smov\s\sr10, r1, asr #31
sub sp, sp, #8 \s\ssub\s\ssp, sp, #8
mov r11, r10 \s\smov\s\sr11, r10
mov r5, r4 \s\smov\s\sr5, r4
eor r0, r0, r10 \s\seor\s\sr0, r0, r10
eor r1, r1, r10 \s\seor\s\sr1, r1, r10
eor r2, r2, r4 \s\seor\s\sr2, r2, r4
eor r3, r3, r4 \s\seor\s\sr3, r3, r4
subs r2, r2, r4 \s\ssubs\s\sr2, r2, r4
sbc r3, r3, r5 \s\ssbc\s\sr3, r3, r5
mov ip, #0 \s\smov\s\sip, #0
subs r0, r0, r10 \s\ssubs\s\sr0, r0, r10
sbc r1, r1, r11 \s\ssbc\s\sr1, r1, r11
str ip, [sp, #0] \s\sstr\s\sip, [sp, #0]
bl ASM_PFX(__udivmoddi4) \s\sbl\s\sASM_PFX(__udivmoddi4)
eor r2, r10, r4 \s\seor\s\sr2, r10, r4
eor r3, r10, r4 \s\seor\s\sr3, r10, r4
eor r0, r0, r2 \s\seor\s\sr0, r0, r2
eor r1, r1, r3 \s\seor\s\sr1, r1, r3
subs r0, r0, r2 \s\ssubs\s\sr0, r0, r2
sbc r1, r1, r3 \s\ssbc\s\sr1, r1, r3
sub sp, r7, #16 \s\ssub\s\ssp, r7, #16
ldmfd sp!, {r10, r11} \s\sldmfd\s\ssp!, {r10, r11}
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

34
ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
View File

@@ -12,21 +12,21 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__divsi3) \s\sGCC_ASM_EXPORT(__divsi3)
\s\s
ASM_PFX(__divsi3): ASM_PFX(__divsi3):
eor r3, r0, r0, asr #31 \s\seor\s\sr3, r0, r0, asr #31
eor r2, r1, r1, asr #31 \s\seor\s\sr2, r1, r1, asr #31
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
mov r5, r0, asr #31 \s\smov\s\sr5, r0, asr #31
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
mov r4, r1, asr #31 \s\smov\s\sr4, r1, asr #31
sub r0, r3, r0, asr #31 \s\ssub\s\sr0, r3, r0, asr #31
sub r1, r2, r1, asr #31 \s\ssub\s\sr1, r2, r1, asr #31
bl ASM_PFX(__udivsi3) \s\sbl\s\sASM_PFX(__udivsi3)
eor r1, r5, r4 \s\seor\s\sr1, r5, r4
eor r0, r0, r1 \s\seor\s\sr0, r0, r1
rsb r0, r1, r0 \s\srsb\s\sr0, r1, r0
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

6
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
View File

@@ -13,9 +13,9 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__aeabi_ldivmod) \s\sGCC_ASM_EXPORT(__aeabi_ldivmod)
// //
// A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}}, // A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}},

38
ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
View File

@@ -12,24 +12,24 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__lshrdi3) \s\sGCC_ASM_EXPORT(__lshrdi3)
\s\s
ASM_PFX(__lshrdi3): ASM_PFX(__lshrdi3):
cmp r2, #31 \s\scmp\s\sr2, #31
bls L2 \s\sbls\s\sL2
cmp r2, #63 \s\scmp\s\sr2, #63
subls r2, r2, #32 \s\ssubls\s\sr2, r2, #32
movls r2, r1, lsr r2 \s\smovls\s\sr2, r1, lsr r2
movhi r2, #0 \s\smovhi\s\sr2, #0
mov r0, r2 \s\smov\s\sr0, r2
mov r1, #0 \s\smov\s\sr1, #0
bx lr \s\sbx\s\slr
L2: L2:
cmp r2, #0 \s\scmp\s\sr2, #0
rsbne r3, r2, #32 \s\srsbne\s\sr3, r2, #32
movne r3, r1, asl r3 \s\smovne\s\sr3, r1, asl r3
movne r1, r1, lsr r2 \s\smovne\s\sr1, r1, lsr r2
orrne r0, r3, r0, lsr r2 \s\sorrne\s\sr0, r3, r0, lsr r2
bx lr \s\sbx\s\slr

30
ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
View File

@@ -12,23 +12,23 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(memcpy) \s\sGCC_ASM_EXPORT(memcpy)
ASM_PFX(memcpy): ASM_PFX(memcpy):
stmfd sp!, {r7, lr} \s\sstmfd\s\ssp!, {r7, lr}
mov ip, #0 \s\smov\s\sip, #0
add r7, sp, #0 \s\sadd\s\sr7, sp, #0
mov lr, r0 \s\smov\s\slr, r0
b L4 \s\sb\s\sL4
L5: L5:
ldrb r3, [r1], #1 @ zero_extendqisi2 \s\sldrb\s\sr3, [r1], #1\s\s@ zero_extendqisi2
add ip, ip, #1 \s\sadd\s\sip, ip, #1
and r3, r3, #255 \s\sand\s\sr3, r3, #255
strb r3, [lr], #1 \s\sstrb\s\sr3, [lr], #1
L4: L4:
cmp ip, r2 \s\scmp\s\sip, r2
bne L5 \s\sbne\s\sL5
ldmfd sp!, {r7, pc} \s\sldmfd\s\ssp!, {r7, pc}

36
ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
View File

@@ -14,23 +14,25 @@
.text .text
.align 2 \s\s.align 2
GCC_ASM_EXPORT (memset) \s\sGCC_ASM_EXPORT (memset)
ASM_PFX(memset): ASM_PFX(memset):
@ args = 0, pretend = 0, frame = 0
@ frame_needed = 1, uses_anonymous_args = 0 \s\s@ args = 0, pretend = 0, frame = 0
stmfd sp!, {r7, lr} \s\s@ frame_needed = 1, uses_anonymous_args = 0
mov ip, #0 \s\sstmfd\s\ssp!, {r7, lr}
add r7, sp, #0 \s\smov\s\sip, #0
mov lr, r0 \s\sadd\s\sr7, sp, #0
b L9 \s\smov\s\slr, r0
L10: \s\sb\s\sL9
and r3, r1, #255 L10:
add ip, ip, #1 \s\sand\s\sr3, r1, #255
strb r3, [lr], #1 \s\sadd\s\sip, ip, #1
L9: \s\sstrb\s\sr3, [lr], #1
cmp ip, r2 L9:
bne L10 \s\scmp\s\sip, r2
ldmfd sp!, {r7, pc} \s\sbne\s\sL10
\s\sldmfd\s\ssp!, {r7, pc}

60
ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
View File

@@ -12,35 +12,35 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__moddi3) \s\sGCC_ASM_EXPORT(__moddi3)
ASM_PFX(__moddi3): ASM_PFX(__moddi3):
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
mov r4, r1, asr #31 \s\smov\s\sr4, r1, asr #31
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
stmfd sp!, {r10, r11} \s\sstmfd\s\ssp!, {r10, r11}
mov r10, r3, asr #31 \s\smov\s\sr10, r3, asr #31
sub sp, sp, #16 \s\ssub\s\ssp, sp, #16
mov r5, r4 \s\smov\s\sr5, r4
mov r11, r10 \s\smov\s\sr11, r10
eor r0, r0, r4 \s\seor\s\sr0, r0, r4
eor r1, r1, r4 \s\seor\s\sr1, r1, r4
eor r2, r2, r10 \s\seor\s\sr2, r2, r10
eor r3, r3, r10 \s\seor\s\sr3, r3, r10
add ip, sp, #8 \s\sadd\s\sip, sp, #8
subs r0, r0, r4 \s\ssubs\s\sr0, r0, r4
sbc r1, r1, r5 \s\ssbc\s\sr1, r1, r5
subs r2, r2, r10 \s\ssubs\s\sr2, r2, r10
sbc r3, r3, r11 \s\ssbc\s\sr3, r3, r11
str ip, [sp, #0] \s\sstr\s\sip, [sp, #0]
bl ASM_PFX(__udivmoddi4) \s\sbl\s\sASM_PFX(__udivmoddi4)
ldrd r0, [sp, #8] \s\sldrd\s\sr0, [sp, #8]
eor r0, r0, r4 \s\seor\s\sr0, r0, r4
eor r1, r1, r4 \s\seor\s\sr1, r1, r4
subs r0, r0, r4 \s\ssubs\s\sr0, r0, r4
sbc r1, r1, r5 \s\ssbc\s\sr1, r1, r5
sub sp, r7, #16 \s\ssub\s\ssp, r7, #16
ldmfd sp!, {r10, r11} \s\sldmfd\s\ssp!, {r10, r11}
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

22
ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
View File

@@ -12,16 +12,16 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__modsi3) \s\sGCC_ASM_EXPORT(__modsi3)
ASM_PFX(__modsi3): ASM_PFX(__modsi3):
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
mov r5, r0 \s\smov\s\sr5, r0
mov r4, r1 \s\smov\s\sr4, r1
bl ___divsi3 \s\sbl\s\s___divsi3
mul r0, r4, r0 \s\smul\s\sr0, r4, r0
rsb r0, r0, r5 \s\srsb\s\sr0, r0, r5
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

80
ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
View File

@@ -12,47 +12,47 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__muldi3) \s\sGCC_ASM_EXPORT(__muldi3)
ASM_PFX(__muldi3): ASM_PFX(__muldi3):
stmfd sp!, {r4, r5, r6, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r6, r7, lr}
add r7, sp, #12 \s\sadd\s\sr7, sp, #12
stmfd sp!, {r8, r10, r11} \s\sstmfd\s\ssp!, {r8, r10, r11}
ldr r11, L4 \s\sldr\s\sr11, L4
mov r4, r0, lsr #16 \s\smov\s\sr4, r0, lsr #16
and r8, r0, r11 \s\sand\s\sr8, r0, r11
and ip, r2, r11 \s\sand\s\sip, r2, r11
mul lr, ip, r8 \s\smul\s\slr, ip, r8
mul ip, r4, ip \s\smul\s\sip, r4, ip
sub sp, sp, #8 \s\ssub\s\ssp, sp, #8
add r10, ip, lr, lsr #16 \s\sadd\s\sr10, ip, lr, lsr #16
and ip, r10, r11 \s\sand\s\sip, r10, r11
and lr, lr, r11 \s\sand\s\slr, lr, r11
mov r6, r2, lsr #16 \s\smov\s\sr6, r2, lsr #16
str r4, [sp, #4] \s\sstr\s\sr4, [sp, #4]
add r4, lr, ip, asl #16 \s\sadd\s\sr4, lr, ip, asl #16
mul ip, r8, r6 \s\smul\s\sip, r8, r6
mov r5, r10, lsr #16 \s\smov\s\sr5, r10, lsr #16
add r10, ip, r4, lsr #16 \s\sadd\s\sr10, ip, r4, lsr #16
and ip, r10, r11 \s\sand\s\sip, r10, r11
and lr, r4, r11 \s\sand\s\slr, r4, r11
add r4, lr, ip, asl #16 \s\sadd\s\sr4, lr, ip, asl #16
mul r0, r3, r0 \s\smul\s\sr0, r3, r0
add ip, r5, r10, lsr #16 \s\sadd\s\sip, r5, r10, lsr #16
ldr r5, [sp, #4] \s\sldr\s\sr5, [sp, #4]
mla r0, r2, r1, r0 \s\smla\s\sr0, r2, r1, r0
mla r5, r6, r5, ip \s\smla\s\sr5, r6, r5, ip
mov r10, r4 \s\smov\s\sr10, r4
add r11, r0, r5 \s\sadd\s\sr11, r0, r5
mov r1, r11 \s\smov\s\sr1, r11
mov r0, r4 \s\smov\s\sr0, r4
sub sp, r7, #24 \s\ssub\s\ssp, r7, #24
ldmfd sp!, {r8, r10, r11} \s\sldmfd\s\ssp!, {r8, r10, r11}
ldmfd sp!, {r4, r5, r6, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r6, r7, pc}
.p2align 2 \s\s.p2align 2
L5: L5:
.align 2 \s\s.align 2
L4: L4:
.long 65535 \s\s.long\s\s65535

4
ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm
View File

@@ -13,8 +13,8 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
EXPORT __ARM_ll_mullu EXPORT\s\s__ARM_ll_mullu
EXPORT __aeabi_lmul EXPORT\s\s__aeabi_lmul
AREA Math, CODE, READONLY AREA Math, CODE, READONLY

18
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm
View File

@@ -14,16 +14,16 @@
EXPORT __ARM_switch8 EXPORT\s\s__ARM_switch8
AREA ArmSwitch, CODE, READONLY
AREA\s\sArmSwitch, CODE, READONLY
\s\s
__ARM_switch8 __ARM_switch8
LDRB r12,[lr,#-1] \s\sLDRB\s\s r12,[lr,#-1]
CMP r3,r12 \s\sCMP\s\s\s\s r3,r12
LDRBCC r3,[lr,r3] \s\sLDRBCC\s\sr3,[lr,r3]
LDRBCS r3,[lr,r12] \s\sLDRBCS\s\sr3,[lr,r12]
ADD r12,lr,r3,LSL #1 \s\sADD\s\s\s\s r12,lr,r3,LSL #1
BX r12 \s\sBX\s\s\s\s r12
END END

40
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
View File

@@ -12,27 +12,27 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__ucmpdi2) \s\sGCC_ASM_EXPORT(__ucmpdi2)
\s\s
ASM_PFX(__ucmpdi2): ASM_PFX(__ucmpdi2):
stmfd sp!, {r4, r5, r8, lr} \s\sstmfd\s\ssp!, {r4, r5, r8, lr}
cmp r1, r3 \s\scmp\s\sr1, r3
mov r8, r0 \s\smov\s\sr8, r0
mov r4, r2 \s\smov\s\sr4, r2
mov r5, r3 \s\smov\s\sr5, r3
bcc L2 \s\sbcc\s\sL2
bhi L4 \s\sbhi\s\sL4
cmp r0, r2 \s\scmp\s\sr0, r2
bcc L2 \s\sbcc\s\sL2
movls r0, #1 \s\smovls\s\sr0, #1
bls L8 \s\sbls\s\sL8
b L4 \s\sb\s\sL4
L2: L2:
mov r0, #0 \s\smov\s\sr0, #0
b L8 \s\sb\s\sL8
L4: L4:
mov r0, #2 \s\smov\s\sr0, #2
L8: L8:
ldmfd sp!, {r4, r5, r8, pc} \s\sldmfd\s\ssp!, {r4, r5, r8, pc}

22
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
View File

@@ -12,16 +12,16 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__udivdi3) \s\sGCC_ASM_EXPORT(__udivdi3)
ASM_PFX(__udivdi3): ASM_PFX(__udivdi3):
stmfd sp!, {r7, lr} \s\sstmfd\s\ssp!, {r7, lr}
add r7, sp, #0 \s\sadd\s\sr7, sp, #0
sub sp, sp, #8 \s\ssub\s\ssp, sp, #8
mov ip, #0 \s\smov\s\sip, #0
str ip, [sp, #0] \s\sstr\s\sip, [sp, #0]
bl ASM_PFX(__udivmoddi4) \s\sbl\s\sASM_PFX(__udivmoddi4)
sub sp, r7, #0 \s\ssub\s\ssp, r7, #0
ldmfd sp!, {r7, pc} \s\sldmfd\s\ssp!, {r7, pc}

412
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
View File

@@ -12,231 +12,231 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__udivmoddi4) \s\sGCC_ASM_EXPORT(__udivmoddi4)
\s\s
ASM_PFX(__udivmoddi4): ASM_PFX(__udivmoddi4):
stmfd sp!, {r4, r5, r6, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r6, r7, lr}
add r7, sp, #12 \s\sadd\s\sr7, sp, #12
stmfd sp!, {r10, r11} \s\sstmfd\s\ssp!, {r10, r11}
sub sp, sp, #20 \s\ssub\s\ssp, sp, #20
stmia sp, {r2-r3} \s\sstmia\s\ssp, {r2-r3}
ldr r6, [sp, #48] \s\sldr\s\sr6, [sp, #48]
orrs r2, r2, r3 \s\sorrs\s\sr2, r2, r3
mov r10, r0 \s\smov\s\sr10, r0
mov r11, r1 \s\smov\s\sr11, r1
beq L2 \s\sbeq\s\sL2
subs ip, r1, #0 \s\ssubs\s\sip, r1, #0
bne L4 \s\sbne\s\sL4
cmp r3, #0 \s\scmp\s\sr3, #0
bne L6 \s\sbne\s\sL6
cmp r6, #0 \s\scmp\s\sr6, #0
beq L8 \s\sbeq\s\sL8
mov r1, r2 \s\smov\s\sr1, r2
bl ASM_PFX(__umodsi3) \s\sbl\s\sASM_PFX(__umodsi3)
mov r1, #0 \s\smov\s\sr1, #0
stmia r6, {r0-r1} \s\sstmia\s\sr6, {r0-r1}
L8: L8:
ldr r1, [sp, #0] \s\sldr\s\sr1, [sp, #0]
mov r0, r10 \s\smov\s\sr0, r10
b L45 \s\sb\s\sL45
L6: L6:
cmp r6, #0 \s\scmp\s\sr6, #0
movne r1, #0 \s\smovne\s\sr1, #0
stmneia r6, {r0-r1} \s\sstmneia\s\sr6, {r0-r1}
b L2 \s\sb\s\sL2
L4: L4:
ldr r1, [sp, #0] \s\sldr\s\sr1, [sp, #0]
cmp r1, #0 \s\scmp\s\sr1, #0
bne L12 \s\sbne\s\sL12
ldr r2, [sp, #4] \s\sldr\s\sr2, [sp, #4]
cmp r2, #0 \s\scmp\s\sr2, #0
bne L14 \s\sbne\s\sL14
cmp r6, #0 \s\scmp\s\sr6, #0
beq L16 \s\sbeq\s\sL16
mov r1, r2 \s\smov\s\sr1, r2
mov r0, r11 \s\smov\s\sr0, r11
bl ASM_PFX(__umodsi3) \s\sbl\s\sASM_PFX(__umodsi3)
mov r1, #0 \s\smov\s\sr1, #0
stmia r6, {r0-r1} \s\sstmia\s\sr6, {r0-r1}
L16: L16:
ldr r1, [sp, #4] \s\sldr\s\sr1, [sp, #4]
mov r0, r11 \s\smov\s\sr0, r11
L45: L45:
bl ASM_PFX(__udivsi3) \s\sbl\s\sASM_PFX(__udivsi3)
L46: L46:
mov r10, r0 \s\smov\s\sr10, r0
mov r11, #0 \s\smov\s\sr11, #0
b L10 \s\sb\s\sL10
L14: L14:
subs r1, r0, #0 \s\ssubs\s\sr1, r0, #0
bne L18 \s\sbne\s\sL18
cmp r6, #0 \s\scmp\s\sr6, #0
beq L16 \s\sbeq\s\sL16
ldr r1, [sp, #4] \s\sldr\s\sr1, [sp, #4]
mov r0, r11 \s\smov\s\sr0, r11
bl ASM_PFX(__umodsi3) \s\sbl\s\sASM_PFX(__umodsi3)
mov r4, r10 \s\smov\s\sr4, r10
mov r5, r0 \s\smov\s\sr5, r0
stmia r6, {r4-r5} \s\sstmia\s\sr6, {r4-r5}
b L16 \s\sb\s\sL16
L18: L18:
sub r3, r2, #1 \s\ssub\s\sr3, r2, #1
tst r2, r3 \s\stst\s\sr2, r3
bne L22 \s\sbne\s\sL22
cmp r6, #0 \s\scmp\s\sr6, #0
movne r4, r0 \s\smovne\s\sr4, r0
andne r5, ip, r3 \s\sandne\s\sr5, ip, r3
stmneia r6, {r4-r5} \s\sstmneia\s\sr6, {r4-r5}
L24: L24:
rsb r3, r2, #0 \s\srsb\s\sr3, r2, #0
and r3, r2, r3 \s\sand\s\sr3, r2, r3
clz r3, r3 \s\sclz\s\sr3, r3
rsb r3, r3, #31 \s\srsb\s\sr3, r3, #31
mov r0, ip, lsr r3 \s\smov\s\sr0, ip, lsr r3
b L46 \s\sb\s\sL46
L22: L22:
clz r2, r2 \s\sclz\s\sr2, r2
clz r3, ip \s\sclz\s\sr3, ip
rsb r3, r3, r2 \s\srsb\s\sr3, r3, r2
cmp r3, #30 \s\scmp\s\sr3, #30
bhi L48 \s\sbhi\s\sL48
rsb r2, r3, #31 \s\srsb\s\sr2, r3, #31
add lr, r3, #1 \s\sadd\s\slr, r3, #1
mov r3, r1, asl r2 \s\smov\s\sr3, r1, asl r2
str r3, [sp, #12] \s\sstr\s\sr3, [sp, #12]
mov r3, r1, lsr lr \s\smov\s\sr3, r1, lsr lr
ldr r0, [sp, #0] \s\sldr\s\sr0, [sp, #0]
mov r5, ip, lsr lr \s\smov\s\sr5, ip, lsr lr
orr r4, r3, ip, asl r2 \s\sorr\s\sr4, r3, ip, asl r2
str r0, [sp, #8] \s\sstr\s\sr0, [sp, #8]
b L29 \s\sb\s\sL29
L12: L12:
ldr r3, [sp, #4] \s\sldr\s\sr3, [sp, #4]
cmp r3, #0 \s\scmp\s\sr3, #0
bne L30 \s\sbne\s\sL30
sub r3, r1, #1 \s\ssub\s\sr3, r1, #1
tst r1, r3 \s\stst\s\sr1, r3
bne L32 \s\sbne\s\sL32
cmp r6, #0 \s\scmp\s\sr6, #0
andne r3, r3, r0 \s\sandne\s\sr3, r3, r0
movne r2, r3 \s\smovne\s\sr2, r3
movne r3, #0 \s\smovne\s\sr3, #0
stmneia r6, {r2-r3} \s\sstmneia\s\sr6, {r2-r3}
L34: L34:
cmp r1, #1 \s\scmp\s\sr1, #1
beq L10 \s\sbeq\s\sL10
rsb r3, r1, #0 \s\srsb\s\sr3, r1, #0
and r3, r1, r3 \s\sand\s\sr3, r1, r3
clz r3, r3 \s\sclz\s\sr3, r3
rsb r0, r3, #31 \s\srsb\s\sr0, r3, #31
mov r1, ip, lsr r0 \s\smov\s\sr1, ip, lsr r0
rsb r3, r0, #32 \s\srsb\s\sr3, r0, #32
mov r0, r10, lsr r0 \s\smov\s\sr0, r10, lsr r0
orr ip, r0, ip, asl r3 \s\sorr\s\sip, r0, ip, asl r3
str r1, [sp, #12] \s\sstr\s\sr1, [sp, #12]
str ip, [sp, #8] \s\sstr\s\sip, [sp, #8]
ldrd r10, [sp, #8] \s\sldrd\s\sr10, [sp, #8]
b L10 \s\sb\s\sL10
L32: L32:
clz r2, r1 \s\sclz\s\sr2, r1
clz r3, ip \s\sclz\s\sr3, ip
rsb r3, r3, r2 \s\srsb\s\sr3, r3, r2
rsb r4, r3, #31 \s\srsb\s\sr4, r3, #31
mov r2, r0, asl r4 \s\smov\s\sr2, r0, asl r4
mvn r1, r3 \s\smvn\s\sr1, r3
and r2, r2, r1, asr #31 \s\sand\s\sr2, r2, r1, asr #31
add lr, r3, #33 \s\sadd\s\slr, r3, #33
str r2, [sp, #8] \s\sstr\s\sr2, [sp, #8]
add r2, r3, #1 \s\sadd\s\sr2, r3, #1
mov r3, r3, asr #31 \s\smov\s\sr3, r3, asr #31
and r0, r3, r0, asl r1 \s\sand\s\sr0, r3, r0, asl r1
mov r3, r10, lsr r2 \s\smov\s\sr3, r10, lsr r2
orr r3, r3, ip, asl r4 \s\sorr\s\sr3, r3, ip, asl r4
and r3, r3, r1, asr #31 \s\sand\s\sr3, r3, r1, asr #31
orr r0, r0, r3 \s\sorr\s\sr0, r0, r3
mov r3, ip, lsr lr \s\smov\s\sr3, ip, lsr lr
str r0, [sp, #12] \s\sstr\s\sr0, [sp, #12]
mov r0, r10, lsr lr \s\smov\s\sr0, r10, lsr lr
and r5, r3, r2, asr #31 \s\sand\s\sr5, r3, r2, asr #31
rsb r3, lr, #31 \s\srsb\s\sr3, lr, #31
mov r3, r3, asr #31 \s\smov\s\sr3, r3, asr #31
orr r0, r0, ip, asl r1 \s\sorr\s\sr0, r0, ip, asl r1
and r3, r3, ip, lsr r2 \s\sand\s\sr3, r3, ip, lsr r2
and r0, r0, r2, asr #31 \s\sand\s\sr0, r0, r2, asr #31
orr r4, r3, r0 \s\sorr\s\sr4, r3, r0
b L29 \s\sb\s\sL29
L30: L30:
clz r2, r3 \s\sclz\s\sr2, r3
clz r3, ip \s\sclz\s\sr3, ip
rsb r3, r3, r2 \s\srsb\s\sr3, r3, r2
cmp r3, #31 \s\scmp\s\sr3, #31
bls L37 \s\sbls\s\sL37
L48: L48:
cmp r6, #0 \s\scmp\s\sr6, #0
stmneia r6, {r10-r11} \s\sstmneia\s\sr6, {r10-r11}
b L2 \s\sb\s\sL2
L37: L37:
rsb r1, r3, #31 \s\srsb\s\sr1, r3, #31
mov r0, r0, asl r1 \s\smov\s\sr0, r0, asl r1
add lr, r3, #1 \s\sadd\s\slr, r3, #1
mov r2, #0 \s\smov\s\sr2, #0
str r0, [sp, #12] \s\sstr\s\sr0, [sp, #12]
mov r0, r10, lsr lr \s\smov\s\sr0, r10, lsr lr
str r2, [sp, #8] \s\sstr\s\sr2, [sp, #8]
sub r2, r3, #31 \s\ssub\s\sr2, r3, #31
and r0, r0, r2, asr #31 \s\sand\s\sr0, r0, r2, asr #31
mov r3, ip, lsr lr \s\smov\s\sr3, ip, lsr lr
orr r4, r0, ip, asl r1 \s\sorr\s\sr4, r0, ip, asl r1
and r5, r3, r2, asr #31 \s\sand\s\sr5, r3, r2, asr #31
L29: L29:
mov ip, #0 \s\smov\s\sip, #0
mov r10, ip \s\smov\s\sr10, ip
b L40 \s\sb\s\sL40
L41: L41:
ldr r1, [sp, #12] \s\sldr\s\sr1, [sp, #12]
ldr r2, [sp, #8] \s\sldr\s\sr2, [sp, #8]
mov r3, r4, lsr #31 \s\smov\s\sr3, r4, lsr #31
orr r5, r3, r5, asl #1 \s\sorr\s\sr5, r3, r5, asl #1
mov r3, r1, lsr #31 \s\smov\s\sr3, r1, lsr #31
orr r4, r3, r4, asl #1 \s\sorr\s\sr4, r3, r4, asl #1
mov r3, r2, lsr #31 \s\smov\s\sr3, r2, lsr #31
orr r0, r3, r1, asl #1 \s\sorr\s\sr0, r3, r1, asl #1
orr r1, ip, r2, asl #1 \s\sorr\s\sr1, ip, r2, asl #1
ldmia sp, {r2-r3} \s\sldmia\s\ssp, {r2-r3}
str r0, [sp, #12] \s\sstr\s\sr0, [sp, #12]
subs r2, r2, r4 \s\ssubs\s\sr2, r2, r4
sbc r3, r3, r5 \s\ssbc\s\sr3, r3, r5
str r1, [sp, #8] \s\sstr\s\sr1, [sp, #8]
subs r0, r2, #1 \s\ssubs\s\sr0, r2, #1
sbc r1, r3, #0 \s\ssbc\s\sr1, r3, #0
mov r2, r1, asr #31 \s\smov\s\sr2, r1, asr #31
ldmia sp, {r0-r1} \s\sldmia\s\ssp, {r0-r1}
mov r3, r2 \s\smov\s\sr3, r2
and ip, r2, #1 \s\sand\s\sip, r2, #1
and r3, r3, r1 \s\sand\s\sr3, r3, r1
and r2, r2, r0 \s\sand\s\sr2, r2, r0
subs r4, r4, r2 \s\ssubs\s\sr4, r4, r2
sbc r5, r5, r3 \s\ssbc\s\sr5, r5, r3
add r10, r10, #1 \s\sadd\s\sr10, r10, #1
L40: L40:
cmp r10, lr \s\scmp\s\sr10, lr
bne L41 \s\sbne\s\sL41
ldrd r0, [sp, #8] \s\sldrd\s\sr0, [sp, #8]
adds r0, r0, r0 \s\sadds\s\sr0, r0, r0
adc r1, r1, r1 \s\sadc\s\sr1, r1, r1
cmp r6, #0 \s\scmp\s\sr6, #0
orr r10, r0, ip \s\sorr\s\sr10, r0, ip
mov r11, r1 \s\smov\s\sr11, r1
stmneia r6, {r4-r5} \s\sstmneia\s\sr6, {r4-r5}
b L10 \s\sb\s\sL10
L2: L2:
mov r10, #0 \s\smov\s\sr10, #0
mov r11, #0 \s\smov\s\sr11, #0
L10: L10:
mov r0, r10 \s\smov\s\sr0, r10
mov r1, r11 \s\smov\s\sr1, r11
sub sp, r7, #20 \s\ssub\s\ssp, r7, #20
ldmfd sp!, {r10, r11} \s\sldmfd\s\ssp!, {r10, r11}
ldmfd sp!, {r4, r5, r6, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r6, r7, pc}

74
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
View File

@@ -12,46 +12,46 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__udivsi3) \s\sGCC_ASM_EXPORT(__udivsi3)
ASM_PFX(__udivsi3): ASM_PFX(__udivsi3):
cmp r1, #0 \s\scmp\s\sr1, #0
cmpne r0, #0 \s\scmpne\s\sr0, #0
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
beq L2 \s\sbeq\s\sL2
clz r2, r1 \s\sclz\s\sr2, r1
clz r3, r0 \s\sclz\s\sr3, r0
rsb r3, r3, r2 \s\srsb\s\sr3, r3, r2
cmp r3, #31 \s\scmp\s\sr3, #31
bhi L2 \s\sbhi\s\sL2
ldmeqfd sp!, {r4, r5, r7, pc} \s\sldmeqfd\s\ssp!, {r4, r5, r7, pc}
add r5, r3, #1 \s\sadd\s\sr5, r3, #1
rsb r3, r3, #31 \s\srsb\s\sr3, r3, #31
mov lr, #0 \s\smov\s\slr, #0
mov r2, r0, asl r3 \s\smov\s\sr2, r0, asl r3
mov ip, r0, lsr r5 \s\smov\s\sip, r0, lsr r5
mov r4, lr \s\smov\s\sr4, lr
b L8 \s\sb\s\sL8
L9: L9:
mov r0, r2, lsr #31 \s\smov\s\sr0, r2, lsr #31
orr ip, r0, ip, asl #1 \s\sorr\s\sip, r0, ip, asl #1
orr r2, r3, lr \s\sorr\s\sr2, r3, lr
rsb r3, ip, r1 \s\srsb\s\sr3, ip, r1
sub r3, r3, #1 \s\ssub\s\sr3, r3, #1
and r0, r1, r3, asr #31 \s\sand\s\sr0, r1, r3, asr #31
mov lr, r3, lsr #31 \s\smov\s\slr, r3, lsr #31
rsb ip, r0, ip \s\srsb\s\sip, r0, ip
add r4, r4, #1 \s\sadd\s\sr4, r4, #1
L8: L8:
cmp r4, r5 \s\scmp\s\sr4, r5
mov r3, r2, asl #1 \s\smov\s\sr3, r2, asl #1
bne L9 \s\sbne\s\sL9
orr r0, r3, lr \s\sorr\s\sr0, r3, lr
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}
L2: L2:
mov r0, #0 \s\smov\s\sr0, #0
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

6
ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
View File

@@ -14,9 +14,9 @@
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__aeabi_uldivmod) \s\sGCC_ASM_EXPORT(__aeabi_uldivmod)
// //
//UINT64 //UINT64

26
ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
View File

@@ -12,18 +12,18 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__umoddi3) \s\sGCC_ASM_EXPORT(__umoddi3)
\s\s
ASM_PFX(__umoddi3): ASM_PFX(__umoddi3):
stmfd sp!, {r7, lr} \s\sstmfd\s\ssp!, {r7, lr}
add r7, sp, #0 \s\sadd\s\sr7, sp, #0
sub sp, sp, #16 \s\ssub\s\ssp, sp, #16
add ip, sp, #8 \s\sadd\s\sip, sp, #8
str ip, [sp, #0] \s\sstr\s\sip, [sp, #0]
bl ASM_PFX(__udivmoddi4) \s\sbl\s\sASM_PFX(__udivmoddi4)
ldrd r0, [sp, #8] \s\sldrd\s\sr0, [sp, #8]
sub sp, r7, #0 \s\ssub\s\ssp, r7, #0
ldmfd sp!, {r7, pc} \s\sldmfd\s\ssp!, {r7, pc}

24
ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
View File

@@ -12,17 +12,17 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.text \s\s.text
.align 2 \s\s.align 2
GCC_ASM_EXPORT(__umodsi3) \s\sGCC_ASM_EXPORT(__umodsi3)
\s\s
ASM_PFX(__umodsi3): ASM_PFX(__umodsi3):
stmfd sp!, {r4, r5, r7, lr} \s\sstmfd\s\ssp!, {r4, r5, r7, lr}
add r7, sp, #8 \s\sadd\s\sr7, sp, #8
mov r5, r0 \s\smov\s\sr5, r0
mov r4, r1 \s\smov\s\sr4, r1
bl ASM_PFX(__udivsi3) \s\sbl \s\sASM_PFX(__udivsi3)
mul r0, r4, r0 \s\smul\s\sr0, r4, r0
rsb r0, r0, r5 \s\srsb\s\sr0, r0, r5
ldmfd sp!, {r4, r5, r7, pc} \s\sldmfd\s\ssp!, {r4, r5, r7, pc}

12
ArmPkg/Universal/MmcDxe/Mmc.h
View File

@@ -30,12 +30,12 @@
#define MMC_OCR_POWERUP 0x80000000 #define MMC_OCR_POWERUP 0x80000000
#define MMC_CSD_GET_CCC(Response) (Response[1] >> 20) #define MMC_CSD_GET_CCC(Response)\s\s\s\s(Response[1] >> 20)
#define MMC_CSD_GET_TRANSPEED(Response) (Response[0] & 0xFF) #define MMC_CSD_GET_TRANSPEED(Response)\s\s\s\s(Response[0] & 0xFF)
#define MMC_CSD_GET_READBLLEN(Response) ((Response[1] >> 16) & 0xF) #define MMC_CSD_GET_READBLLEN(Response)\s\s\s\s((Response[1] >> 16) & 0xF)
#define MMC_CSD_GET_WRITEBLLEN(Response) ((Response[3] >> 22) & 0xF) #define MMC_CSD_GET_WRITEBLLEN(Response)\s\s((Response[3] >> 22) & 0xF)
#define MMC_CSD_GET_FILEFORMAT(Response) ((Response[3] >> 10) & 0x3) #define MMC_CSD_GET_FILEFORMAT(Response)\s\s((Response[3] >> 10) & 0x3)
#define MMC_CSD_GET_FILEFORMATGRP(Response) ((Response[3] >> 15) & 0x1) #define MMC_CSD_GET_FILEFORMATGRP(Response)\s\s((Response[3] >> 15) & 0x1)
#define MMC_CSD_GET_DEVICESIZE(csd) (((Response[2] >> 30) & 0x3) | ((Response[1] & 0x3FF) << 2)) #define MMC_CSD_GET_DEVICESIZE(csd) (((Response[2] >> 30) & 0x3) | ((Response[1] & 0x3FF) << 2))
#define MMC_CSD_GET_DEVICESIZEMULT(csd) ((Response[2] >> 15) & 0x7) #define MMC_CSD_GET_DEVICESIZEMULT(csd) ((Response[2] >> 15) & 0x7)