* [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build
2019-09-18 12:25 [PATCH 0/3] Arm builds on Visual Studio Baptiste Gerondeau
@ 2019-09-18 12:25 ` Baptiste Gerondeau
2019-09-19 9:38 ` Ard Biesheuvel
0 siblings, 1 reply; 8+ messages in thread
From: Baptiste Gerondeau @ 2019-09-18 12:25 UTC (permalink / raw)
To: devel
Cc: ard.biesheuvel, leif.lindholm, michael.d.kinney, liming.gao,
shenglei.zhang, Baptiste Gerondeau, Baptiste GERONDEAU
From: Baptiste GERONDEAU <bgerondeau@gmail.com>
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
Since RVCT shares the same assembler syntax as MSFT, use .asm files
and associate them with MSFT, which would be a first step to addressing
the above Bugzilla issue.
RVCT will also have to be erased from BaseTools/rest of the build
infrastructure, to fully address BZ#1750 ; this patch only addresses the
"code" in itself.
Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
---
ArmPkg/Drivers/ArmGic/ArmGicLib.inf | 2 +-
ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf | 2 +-
ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf | 2 +-
ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 2 +-
ArmPkg/Library/ArmLib/ArmBaseLib.inf | 8 ++++----
ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 2 +-
ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 2 +-
ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf | 2 +-
ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf | 2 +-
ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 2 +-
ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 6 +++---
ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 6 +++---
ArmPlatformPkg/PrePi/PeiMPCore.inf | 2 +-
ArmPlatformPkg/PrePi/PeiUniCore.inf | 2 +-
MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf | 2 +-
MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf | 2 +-
18 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index 5e23c732bfab..4fccb938eb6d 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
GicV3/Arm/ArmGicV3.S | GCC
- GicV3/Arm/ArmGicV3.asm | RVCT
+ GicV3/Arm/ArmGicV3.asm | MSFT
[Sources.AARCH64]
GicV3/AArch64/ArmGicV3.S
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
index fdb9c24d21bc..58b2ddbff858 100644
--- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
+++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
@@ -33,7 +33,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmException.c
- Arm/ExceptionSupport.asm | RVCT
+ Arm/ExceptionSupport.asm | MSFT
Arm/ExceptionSupport.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
index ef1a43a27c45..a404ca2ccf82 100644
--- a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
+++ b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
@@ -28,7 +28,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmException.c
- Arm/ExceptionSupport.asm | RVCT
+ Arm/ExceptionSupport.asm | MSFT
Arm/ExceptionSupport.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
index 69f68f63d7a6..be8d8a228865 100644
--- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
+++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
@@ -15,7 +15,7 @@ [Defines]
LIBRARY_CLASS = ArmHvcLib
[Sources.ARM]
- Arm/ArmHvc.asm | RVCT
+ Arm/ArmHvc.asm | MSFT
Arm/ArmHvc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
index 5e70990872f2..63e175623393 100644
--- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf
+++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
@@ -30,10 +30,10 @@ [Sources.ARM]
Arm/ArmV7Support.S | GCC
Arm/ArmV7ArchTimerSupport.S | GCC
- Arm/ArmLibSupport.asm | RVCT
- Arm/ArmLibSupportV7.asm | RVCT
- Arm/ArmV7Support.asm | RVCT
- Arm/ArmV7ArchTimerSupport.asm | RVCT
+ Arm/ArmLibSupport.asm | MSFT
+ Arm/ArmLibSupportV7.asm | MSFT
+ Arm/ArmV7Support.asm | MSFT
+ Arm/ArmV7ArchTimerSupport.asm | MSFT
[Sources.AARCH64]
AArch64/AArch64Lib.h
diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
index 33dddf1e2b97..44366f02c6d9 100644
--- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
+++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
@@ -23,7 +23,7 @@ [Sources.AARCH64]
[Sources.ARM]
Arm/ArmMmuLibCore.c
Arm/ArmMmuLibV7Support.S | GCC
- Arm/ArmMmuLibV7Support.asm |RVCT
+ Arm/ArmMmuLibV7Support.asm | MSFT
[Packages]
ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
index 4f4b09f4528a..af8c0e53cc2b 100644
--- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -14,7 +14,7 @@ [Defines]
LIBRARY_CLASS = ArmSmcLib
[Sources.ARM]
- Arm/ArmSmc.asm | RVCT
+ Arm/ArmSmc.asm | MSFT
Arm/ArmSmc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
index fa19bf649131..f4c9e5510b9a 100644
--- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
@@ -21,7 +21,7 @@ [Sources.AARCH64]
[Sources.ARM]
Arm/Reset.S | GCC
- Arm/Reset.asm | RVCT
+ Arm/Reset.asm | MSFT
[Sources]
ArmSmcPsciResetSystemLib.c
diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
index 744a29fbf723..6631e40df130 100644
--- a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
+++ b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
@@ -14,7 +14,7 @@ [Defines]
LIBRARY_CLASS = ArmSvcLib
[Sources.ARM]
- Arm/ArmSvc.asm | RVCT
+ Arm/ArmSvc.asm | MSFT
Arm/ArmSvc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
index e0d0028d8224..cc791a3a68fd 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
@@ -29,7 +29,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmPlatformHelper.S | GCC
- Arm/ArmPlatformHelper.asm | RVCT
+ Arm/ArmPlatformHelper.asm | MSFT
[Sources.AArch64]
AArch64/ArmPlatformHelper.S
diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
index 76f809c80d9f..e88330c1c382 100644
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
@@ -21,7 +21,7 @@ [Packages]
ArmPlatformPkg/ArmPlatformPkg.dec
[Sources.ARM]
- Arm/ArmPlatformStackLib.asm | RVCT
+ Arm/ArmPlatformStackLib.asm | MSFT
Arm/ArmPlatformStackLib.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index f2ac45d171bc..b663ff749182 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
[Sources.ARM]
Arm/ArchPrePeiCore.c
- Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.asm | MSFT
Arm/PrePeiCoreEntryPoint.S | GCC
- Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.asm | MSFT
Arm/SwitchStack.S | GCC
- Arm/Exception.asm | RVCT
+ Arm/Exception.asm | MSFT
Arm/Exception.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 84c319c3679b..6d05ed096c4c 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
[Sources.ARM]
Arm/ArchPrePeiCore.c
- Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.asm | MSFT
Arm/PrePeiCoreEntryPoint.S | GCC
- Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.asm | MSFT
Arm/SwitchStack.S | GCC
- Arm/Exception.asm | RVCT
+ Arm/Exception.asm | MSFT
Arm/Exception.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 9c5da0d42a7b..fd2a35e59591 100644
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
Arm/ArchPrePi.c
Arm/ModuleEntryPoint.S | GCC
- Arm/ModuleEntryPoint.asm | RVCT
+ Arm/ModuleEntryPoint.asm | MSFT
[Sources.AArch64]
AArch64/ArchPrePi.c
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index ee9b05b25337..de3abadfeac6 100644
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
Arm/ArchPrePi.c
Arm/ModuleEntryPoint.S | GCC
- Arm/ModuleEntryPoint.asm | RVCT
+ Arm/ModuleEntryPoint.asm | MSFT
[Sources.AArch64]
AArch64/ArchPrePi.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
index ad68f841fb6b..62b46377116c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
@@ -31,7 +31,7 @@ [Sources]
[Sources.ARM]
IoLibArmVirt.c
Arm/ArmVirtMmio.S | GCC
- Arm/ArmVirtMmio.asm | RVCT
+ Arm/ArmVirtMmio.asm | MSFT
[Sources.AARCH64]
IoLibArmVirt.c
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index d38e1397eee1..79ba2a2dfc39 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -85,11 +85,11 @@ [Sources.ARM]
Arm/CompareMem.S | GCC
Arm/CompareGuid.S | GCC
- Arm/ScanMem.asm |RVCT
- Arm/SetMem.asm |RVCT
- Arm/CopyMem.asm |RVCT
- Arm/CompareMem.asm |RVCT
- Arm/CompareGuid.asm |RVCT
+ Arm/ScanMem.asm | MSFT
+ Arm/SetMem.asm | MSFT
+ Arm/CopyMem.asm | MSFT
+ Arm/CompareMem.asm | MSFT
+ Arm/CompareGuid.asm | MSFT
[Sources.AARCH64]
AArch64/ScanMem.S
diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
index 446bc19b63eb..39c503a28a2c 100755
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -70,7 +70,7 @@ [Sources.EBC]
[Sources.ARM]
Synchronization.c
- Arm/Synchronization.asm | RVCT
+ Arm/Synchronization.asm | MSFT
Arm/Synchronization.S | GCC
[Sources.AARCH64]
--
2.23.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format
[not found] <cover.1568821123.git.baptiste.gerondeau@linaro.org>
@ 2019-09-18 16:05 ` Baptiste Gerondeau
2019-09-19 10:42 ` Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 2/3] ARM/Assembler: Correct syntax from RVCT for MSFT Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Baptiste Gerondeau
2 siblings, 1 reply; 8+ messages in thread
From: Baptiste Gerondeau @ 2019-09-18 16:05 UTC (permalink / raw)
To: devel
Cc: ard.biesheuvel, leif.lindholm, michael.d.kinney, liming.gao,
shenglei.zhang, Baptiste Gerondeau
From: Baptiste GERONDEAU <baptiste.gerondeau@linaro.org>
Add a space between the '|' and the name of the toolchain to use,
as is the case in all other INF files.
Note that I did not touch the RVCT lines, since a following commit in
the set will address those.
Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
---
ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
index f4fecbb4098a..33dddf1e2b97 100644
--- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
+++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
@@ -22,7 +22,7 @@ [Sources.AARCH64]
[Sources.ARM]
Arm/ArmMmuLibCore.c
- Arm/ArmMmuLibV7Support.S |GCC
+ Arm/ArmMmuLibV7Support.S | GCC
Arm/ArmMmuLibV7Support.asm |RVCT
[Packages]
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index e4e3d532e7b8..d38e1397eee1 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -79,11 +79,11 @@ [Defines.ARM, Defines.AARCH64]
LIBRARY_CLASS = BaseMemoryLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION
[Sources.ARM]
- Arm/ScanMem.S |GCC
- Arm/SetMem.S |GCC
- Arm/CopyMem.S |GCC
- Arm/CompareMem.S |GCC
- Arm/CompareGuid.S |GCC
+ Arm/ScanMem.S | GCC
+ Arm/SetMem.S | GCC
+ Arm/CopyMem.S | GCC
+ Arm/CompareMem.S | GCC
+ Arm/CompareGuid.S | GCC
Arm/ScanMem.asm |RVCT
Arm/SetMem.asm |RVCT
--
2.23.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ARM/Assembler: Correct syntax from RVCT for MSFT
[not found] <cover.1568821123.git.baptiste.gerondeau@linaro.org>
2019-09-18 16:05 ` [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format Baptiste Gerondeau
@ 2019-09-18 16:05 ` Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Baptiste Gerondeau
2 siblings, 0 replies; 8+ messages in thread
From: Baptiste Gerondeau @ 2019-09-18 16:05 UTC (permalink / raw)
To: devel
Cc: ard.biesheuvel, leif.lindholm, michael.d.kinney, liming.gao,
shenglei.zhang, Baptiste Gerondeau
From: Baptiste GERONDEAU <baptiste.gerondeau@linaro.org>
RVCT and MSFT's ARM assembler share the same file syntax, but some
instructions use pre-UAL syntax that is not picked up
by MSFT's ARM assembler, this commit translates those instructions
into MSFT-buildable ones (subset of UAL/THUMB).
Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
---
ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.asm | 30 +++++++++++++++++-------------
ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm | 6 ++++--
MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm | 18 +++++++++---------
3 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.asm b/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.asm
index aa0229d2e85f..880246bd6206 100644
--- a/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.asm
+++ b/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.asm
@@ -90,7 +90,7 @@ Fiq
ResetEntry
srsfd #0x13! ; Store return state on SVC stack
; We are already in SVC mode
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -102,7 +102,7 @@ UndefinedInstructionEntry
sub LR, LR, #4 ; Only -2 for Thumb, adjust in CommonExceptionEntry
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -113,7 +113,7 @@ UndefinedInstructionEntry
SoftwareInterruptEntry
srsfd #0x13! ; Store return state on SVC stack
; We are already in SVC mode
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -125,7 +125,7 @@ PrefetchAbortEntry
sub LR,LR,#4
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -137,7 +137,7 @@ DataAbortEntry
sub LR,LR,#8
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -148,7 +148,7 @@ DataAbortEntry
ReservedExceptionEntry
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -160,7 +160,7 @@ IrqEntry
sub LR,LR,#4
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
@@ -172,7 +172,7 @@ FiqEntry
sub LR,LR,#4
srsfd #0x13! ; Store return state on SVC stack
cps #0x13 ; Switch to SVC for common stack
- stmfd SP!,{LR} ; Store the link register for the current mode
+ push {LR} ; Store the link register for the current mode
sub SP,SP,#0x20 ; Save space for SP, LR, PC, IFAR - CPSR
stmfd SP!,{R0-R12} ; Store the register state
; Since we have already switch to SVC R8_fiq - R12_fiq
@@ -213,9 +213,11 @@ AsmCommonExceptionEntry
and R3, R1, #0x1f ; Check CPSR to see if User or System Mode
cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 ;
- stmeqed R2, {lr}^ ; save unbanked lr
+ mrseq R8, lr_usr ; save unbanked lr to R8
+ streq R2, [R8] ; make R2 point to R8
; else
- stmneed R2, {lr} ; save SVC lr
+ mrsne R8, lr_svc ; save SVC lr to R8
+ strne R2, [R8] ; make R2 point to R8
ldr R5, [SP, #0x58] ; PC is the LR pushed by srsfd
@@ -280,15 +282,17 @@ CommonCExceptionHandler (
and R1, R1, #0x1f ; Check to see if User or System Mode
cmp R1, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R1, #0x10 ;
- ldmeqed R2, {lr}^ ; restore unbanked lr
+ ldreq R8, [R2] ; load sys/usr lr from R2 pointer
+ msreq lr_usr, R8 ; restore unbanked lr
; else
- ldmneed R3, {lr} ; restore SVC lr, via ldmfd SP!, {LR}
+ ldrne R8, [R3] ; load SVC lr from R3 pointer
+ msrne lr_svc, R8 ; restore SVC lr, via ldmfd SP!, {LR}
ldmfd SP!,{R0-R12} ; Restore general purpose registers
; Exception handler can not change SP
add SP,SP,#0x20 ; Clear out the remaining stack space
- ldmfd SP!,{LR} ; restore the link register for this context
+ pop {LR} ; restore the link register for this context
rfefd SP! ; return from exception via srsfd stack slot
END
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm
index 3146c2b52181..724306399e6c 100644
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm
@@ -200,8 +200,10 @@ Loop2
mov R9, R4 ; R9 working copy of the max way size (right aligned)
Loop3
- 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
+ lsl R8, R9, R5
+ orr R0, R10, R8 ; factor in the way number and cache number
+ lsl R8, R7, R2
+ orr R0, R0, R8 ; factor in the index number
blx R1
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
index 5a423df16bff..a46d70e41433 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
+++ b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
@@ -5,16 +5,16 @@
;
-AREA IoLibMmio, CODE, READONLY
+ AREA IoLibMmio, CODE, READONLY
-EXPORT MmioRead8Internal
-EXPORT MmioWrite8Internal
-EXPORT MmioRead16Internal
-EXPORT MmioWrite16Internal
-EXPORT MmioRead32Internal
-EXPORT MmioWrite32Internal
-EXPORT MmioRead64Internal
-EXPORT MmioWrite64Internal
+ EXPORT MmioRead8Internal
+ EXPORT MmioWrite8Internal
+ EXPORT MmioRead16Internal
+ EXPORT MmioWrite16Internal
+ EXPORT MmioRead32Internal
+ EXPORT MmioWrite32Internal
+ EXPORT MmioRead64Internal
+ EXPORT MmioWrite64Internal
;
; Reads an 8-bit MMIO register.
--
2.23.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build
[not found] <cover.1568821123.git.baptiste.gerondeau@linaro.org>
2019-09-18 16:05 ` [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 2/3] ARM/Assembler: Correct syntax from RVCT for MSFT Baptiste Gerondeau
@ 2019-09-18 16:05 ` Baptiste Gerondeau
2 siblings, 0 replies; 8+ messages in thread
From: Baptiste Gerondeau @ 2019-09-18 16:05 UTC (permalink / raw)
To: devel
Cc: ard.biesheuvel, leif.lindholm, michael.d.kinney, liming.gao,
shenglei.zhang, Baptiste Gerondeau
From: Baptiste GERONDEAU <baptiste.gerondeau@linaro.org>
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
Since RVCT shares the same assembler syntax as MSFT, use .asm files
and associate them with MSFT, which would be a first step to addressing
the above Bugzilla issue.
RVCT will also have to be erased from BaseTools/rest of the build
infrastructure, to fully address BZ#1750 ; this patch only addresses the
"code" in itself.
Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
---
ArmPkg/Drivers/ArmGic/ArmGicLib.inf | 2 +-
ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf | 2 +-
ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf | 2 +-
ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 2 +-
ArmPkg/Library/ArmLib/ArmBaseLib.inf | 8 ++++----
ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 2 +-
ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 2 +-
ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf | 2 +-
ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf | 2 +-
ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 2 +-
ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 6 +++---
ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 6 +++---
ArmPlatformPkg/PrePi/PeiMPCore.inf | 2 +-
ArmPlatformPkg/PrePi/PeiUniCore.inf | 2 +-
MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf | 2 +-
MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf | 2 +-
18 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index 5e23c732bfab..4fccb938eb6d 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
GicV3/Arm/ArmGicV3.S | GCC
- GicV3/Arm/ArmGicV3.asm | RVCT
+ GicV3/Arm/ArmGicV3.asm | MSFT
[Sources.AARCH64]
GicV3/AArch64/ArmGicV3.S
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
index fdb9c24d21bc..58b2ddbff858 100644
--- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
+++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
@@ -33,7 +33,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmException.c
- Arm/ExceptionSupport.asm | RVCT
+ Arm/ExceptionSupport.asm | MSFT
Arm/ExceptionSupport.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
index ef1a43a27c45..a404ca2ccf82 100644
--- a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
+++ b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
@@ -28,7 +28,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmException.c
- Arm/ExceptionSupport.asm | RVCT
+ Arm/ExceptionSupport.asm | MSFT
Arm/ExceptionSupport.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
index 69f68f63d7a6..be8d8a228865 100644
--- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
+++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
@@ -15,7 +15,7 @@ [Defines]
LIBRARY_CLASS = ArmHvcLib
[Sources.ARM]
- Arm/ArmHvc.asm | RVCT
+ Arm/ArmHvc.asm | MSFT
Arm/ArmHvc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
index 5e70990872f2..63e175623393 100644
--- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf
+++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
@@ -30,10 +30,10 @@ [Sources.ARM]
Arm/ArmV7Support.S | GCC
Arm/ArmV7ArchTimerSupport.S | GCC
- Arm/ArmLibSupport.asm | RVCT
- Arm/ArmLibSupportV7.asm | RVCT
- Arm/ArmV7Support.asm | RVCT
- Arm/ArmV7ArchTimerSupport.asm | RVCT
+ Arm/ArmLibSupport.asm | MSFT
+ Arm/ArmLibSupportV7.asm | MSFT
+ Arm/ArmV7Support.asm | MSFT
+ Arm/ArmV7ArchTimerSupport.asm | MSFT
[Sources.AARCH64]
AArch64/AArch64Lib.h
diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
index 33dddf1e2b97..44366f02c6d9 100644
--- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
+++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
@@ -23,7 +23,7 @@ [Sources.AARCH64]
[Sources.ARM]
Arm/ArmMmuLibCore.c
Arm/ArmMmuLibV7Support.S | GCC
- Arm/ArmMmuLibV7Support.asm |RVCT
+ Arm/ArmMmuLibV7Support.asm | MSFT
[Packages]
ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
index 4f4b09f4528a..af8c0e53cc2b 100644
--- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -14,7 +14,7 @@ [Defines]
LIBRARY_CLASS = ArmSmcLib
[Sources.ARM]
- Arm/ArmSmc.asm | RVCT
+ Arm/ArmSmc.asm | MSFT
Arm/ArmSmc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
index fa19bf649131..f4c9e5510b9a 100644
--- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
@@ -21,7 +21,7 @@ [Sources.AARCH64]
[Sources.ARM]
Arm/Reset.S | GCC
- Arm/Reset.asm | RVCT
+ Arm/Reset.asm | MSFT
[Sources]
ArmSmcPsciResetSystemLib.c
diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
index 744a29fbf723..6631e40df130 100644
--- a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
+++ b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
@@ -14,7 +14,7 @@ [Defines]
LIBRARY_CLASS = ArmSvcLib
[Sources.ARM]
- Arm/ArmSvc.asm | RVCT
+ Arm/ArmSvc.asm | MSFT
Arm/ArmSvc.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
index e0d0028d8224..cc791a3a68fd 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
@@ -29,7 +29,7 @@ [Sources.common]
[Sources.Arm]
Arm/ArmPlatformHelper.S | GCC
- Arm/ArmPlatformHelper.asm | RVCT
+ Arm/ArmPlatformHelper.asm | MSFT
[Sources.AArch64]
AArch64/ArmPlatformHelper.S
diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
index 76f809c80d9f..e88330c1c382 100644
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
@@ -21,7 +21,7 @@ [Packages]
ArmPlatformPkg/ArmPlatformPkg.dec
[Sources.ARM]
- Arm/ArmPlatformStackLib.asm | RVCT
+ Arm/ArmPlatformStackLib.asm | MSFT
Arm/ArmPlatformStackLib.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index f2ac45d171bc..b663ff749182 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
[Sources.ARM]
Arm/ArchPrePeiCore.c
- Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.asm | MSFT
Arm/PrePeiCoreEntryPoint.S | GCC
- Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.asm | MSFT
Arm/SwitchStack.S | GCC
- Arm/Exception.asm | RVCT
+ Arm/Exception.asm | MSFT
Arm/Exception.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 84c319c3679b..6d05ed096c4c 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -21,11 +21,11 @@ [Sources.common]
[Sources.ARM]
Arm/ArchPrePeiCore.c
- Arm/PrePeiCoreEntryPoint.asm | RVCT
+ Arm/PrePeiCoreEntryPoint.asm | MSFT
Arm/PrePeiCoreEntryPoint.S | GCC
- Arm/SwitchStack.asm | RVCT
+ Arm/SwitchStack.asm | MSFT
Arm/SwitchStack.S | GCC
- Arm/Exception.asm | RVCT
+ Arm/Exception.asm | MSFT
Arm/Exception.S | GCC
[Sources.AARCH64]
diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 9c5da0d42a7b..fd2a35e59591 100644
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
Arm/ArchPrePi.c
Arm/ModuleEntryPoint.S | GCC
- Arm/ModuleEntryPoint.asm | RVCT
+ Arm/ModuleEntryPoint.asm | MSFT
[Sources.AArch64]
AArch64/ArchPrePi.c
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index ee9b05b25337..de3abadfeac6 100644
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -22,7 +22,7 @@ [Sources]
[Sources.ARM]
Arm/ArchPrePi.c
Arm/ModuleEntryPoint.S | GCC
- Arm/ModuleEntryPoint.asm | RVCT
+ Arm/ModuleEntryPoint.asm | MSFT
[Sources.AArch64]
AArch64/ArchPrePi.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
index ad68f841fb6b..62b46377116c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
@@ -31,7 +31,7 @@ [Sources]
[Sources.ARM]
IoLibArmVirt.c
Arm/ArmVirtMmio.S | GCC
- Arm/ArmVirtMmio.asm | RVCT
+ Arm/ArmVirtMmio.asm | MSFT
[Sources.AARCH64]
IoLibArmVirt.c
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index d38e1397eee1..79ba2a2dfc39 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -85,11 +85,11 @@ [Sources.ARM]
Arm/CompareMem.S | GCC
Arm/CompareGuid.S | GCC
- Arm/ScanMem.asm |RVCT
- Arm/SetMem.asm |RVCT
- Arm/CopyMem.asm |RVCT
- Arm/CompareMem.asm |RVCT
- Arm/CompareGuid.asm |RVCT
+ Arm/ScanMem.asm | MSFT
+ Arm/SetMem.asm | MSFT
+ Arm/CopyMem.asm | MSFT
+ Arm/CompareMem.asm | MSFT
+ Arm/CompareGuid.asm | MSFT
[Sources.AARCH64]
AArch64/ScanMem.S
diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
index 446bc19b63eb..39c503a28a2c 100755
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -70,7 +70,7 @@ [Sources.EBC]
[Sources.ARM]
Synchronization.c
- Arm/Synchronization.asm | RVCT
+ Arm/Synchronization.asm | MSFT
Arm/Synchronization.S | GCC
[Sources.AARCH64]
--
2.23.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build
2019-09-18 12:25 ` [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Baptiste Gerondeau
@ 2019-09-19 9:38 ` Ard Biesheuvel
2019-09-19 9:52 ` Leif Lindholm
0 siblings, 1 reply; 8+ messages in thread
From: Ard Biesheuvel @ 2019-09-19 9:38 UTC (permalink / raw)
To: Baptiste Gerondeau
Cc: edk2-devel-groups-io, Leif Lindholm, Kinney, Michael D,
Gao, Liming, Zhang, Shenglei, Baptiste GERONDEAU
On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
<baptiste.gerondeau@linaro.org> wrote:
>
> From: Baptiste GERONDEAU <bgerondeau@gmail.com>
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
>
> Since RVCT shares the same assembler syntax as MSFT, use .asm files
> and associate them with MSFT, which would be a first step to addressing
> the above Bugzilla issue.
> RVCT will also have to be erased from BaseTools/rest of the build
> infrastructure, to fully address BZ#1750 ; this patch only addresses the
> "code" in itself.
>
> Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
The changes look fine to me, but please split them out per package as
Liming suggested.
> ---
> ArmPkg/Drivers/ArmGic/ArmGicLib.inf | 2 +-
> ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf | 2 +-
> ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf | 2 +-
> ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 2 +-
> ArmPkg/Library/ArmLib/ArmBaseLib.inf | 8 ++++----
> ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
> ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 2 +-
> ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 2 +-
> ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf | 2 +-
> ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf | 2 +-
> ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 2 +-
> ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 6 +++---
> ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 6 +++---
> ArmPlatformPkg/PrePi/PeiMPCore.inf | 2 +-
> ArmPlatformPkg/PrePi/PeiUniCore.inf | 2 +-
> MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf | 2 +-
> MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
> MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf | 2 +-
> 18 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> index 5e23c732bfab..4fccb938eb6d 100644
> --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> @@ -22,7 +22,7 @@ [Sources]
>
> [Sources.ARM]
> GicV3/Arm/ArmGicV3.S | GCC
> - GicV3/Arm/ArmGicV3.asm | RVCT
> + GicV3/Arm/ArmGicV3.asm | MSFT
>
> [Sources.AARCH64]
> GicV3/AArch64/ArmGicV3.S
> diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> index fdb9c24d21bc..58b2ddbff858 100644
> --- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> +++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> @@ -33,7 +33,7 @@ [Sources.common]
>
> [Sources.Arm]
> Arm/ArmException.c
> - Arm/ExceptionSupport.asm | RVCT
> + Arm/ExceptionSupport.asm | MSFT
> Arm/ExceptionSupport.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> index ef1a43a27c45..a404ca2ccf82 100644
> --- a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> +++ b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> @@ -28,7 +28,7 @@ [Sources.common]
>
> [Sources.Arm]
> Arm/ArmException.c
> - Arm/ExceptionSupport.asm | RVCT
> + Arm/ExceptionSupport.asm | MSFT
> Arm/ExceptionSupport.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> index 69f68f63d7a6..be8d8a228865 100644
> --- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> +++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> @@ -15,7 +15,7 @@ [Defines]
> LIBRARY_CLASS = ArmHvcLib
>
> [Sources.ARM]
> - Arm/ArmHvc.asm | RVCT
> + Arm/ArmHvc.asm | MSFT
> Arm/ArmHvc.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> index 5e70990872f2..63e175623393 100644
> --- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> @@ -30,10 +30,10 @@ [Sources.ARM]
> Arm/ArmV7Support.S | GCC
> Arm/ArmV7ArchTimerSupport.S | GCC
>
> - Arm/ArmLibSupport.asm | RVCT
> - Arm/ArmLibSupportV7.asm | RVCT
> - Arm/ArmV7Support.asm | RVCT
> - Arm/ArmV7ArchTimerSupport.asm | RVCT
> + Arm/ArmLibSupport.asm | MSFT
> + Arm/ArmLibSupportV7.asm | MSFT
> + Arm/ArmV7Support.asm | MSFT
> + Arm/ArmV7ArchTimerSupport.asm | MSFT
>
> [Sources.AARCH64]
> AArch64/AArch64Lib.h
> diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> index 33dddf1e2b97..44366f02c6d9 100644
> --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> @@ -23,7 +23,7 @@ [Sources.AARCH64]
> [Sources.ARM]
> Arm/ArmMmuLibCore.c
> Arm/ArmMmuLibV7Support.S | GCC
> - Arm/ArmMmuLibV7Support.asm |RVCT
> + Arm/ArmMmuLibV7Support.asm | MSFT
>
> [Packages]
> ArmPkg/ArmPkg.dec
> diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> index 4f4b09f4528a..af8c0e53cc2b 100644
> --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> +++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> @@ -14,7 +14,7 @@ [Defines]
> LIBRARY_CLASS = ArmSmcLib
>
> [Sources.ARM]
> - Arm/ArmSmc.asm | RVCT
> + Arm/ArmSmc.asm | MSFT
> Arm/ArmSmc.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> index fa19bf649131..f4c9e5510b9a 100644
> --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> @@ -21,7 +21,7 @@ [Sources.AARCH64]
>
> [Sources.ARM]
> Arm/Reset.S | GCC
> - Arm/Reset.asm | RVCT
> + Arm/Reset.asm | MSFT
>
> [Sources]
> ArmSmcPsciResetSystemLib.c
> diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> index 744a29fbf723..6631e40df130 100644
> --- a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> +++ b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> @@ -14,7 +14,7 @@ [Defines]
> LIBRARY_CLASS = ArmSvcLib
>
> [Sources.ARM]
> - Arm/ArmSvc.asm | RVCT
> + Arm/ArmSvc.asm | MSFT
> Arm/ArmSvc.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> index e0d0028d8224..cc791a3a68fd 100644
> --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> @@ -29,7 +29,7 @@ [Sources.common]
>
> [Sources.Arm]
> Arm/ArmPlatformHelper.S | GCC
> - Arm/ArmPlatformHelper.asm | RVCT
> + Arm/ArmPlatformHelper.asm | MSFT
>
> [Sources.AArch64]
> AArch64/ArmPlatformHelper.S
> diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> index 76f809c80d9f..e88330c1c382 100644
> --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> @@ -21,7 +21,7 @@ [Packages]
> ArmPlatformPkg/ArmPlatformPkg.dec
>
> [Sources.ARM]
> - Arm/ArmPlatformStackLib.asm | RVCT
> + Arm/ArmPlatformStackLib.asm | MSFT
> Arm/ArmPlatformStackLib.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> index f2ac45d171bc..b663ff749182 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> @@ -21,11 +21,11 @@ [Sources.common]
>
> [Sources.ARM]
> Arm/ArchPrePeiCore.c
> - Arm/PrePeiCoreEntryPoint.asm | RVCT
> + Arm/PrePeiCoreEntryPoint.asm | MSFT
> Arm/PrePeiCoreEntryPoint.S | GCC
> - Arm/SwitchStack.asm | RVCT
> + Arm/SwitchStack.asm | MSFT
> Arm/SwitchStack.S | GCC
> - Arm/Exception.asm | RVCT
> + Arm/Exception.asm | MSFT
> Arm/Exception.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> index 84c319c3679b..6d05ed096c4c 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> @@ -21,11 +21,11 @@ [Sources.common]
>
> [Sources.ARM]
> Arm/ArchPrePeiCore.c
> - Arm/PrePeiCoreEntryPoint.asm | RVCT
> + Arm/PrePeiCoreEntryPoint.asm | MSFT
> Arm/PrePeiCoreEntryPoint.S | GCC
> - Arm/SwitchStack.asm | RVCT
> + Arm/SwitchStack.asm | MSFT
> Arm/SwitchStack.S | GCC
> - Arm/Exception.asm | RVCT
> + Arm/Exception.asm | MSFT
> Arm/Exception.S | GCC
>
> [Sources.AARCH64]
> diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> index 9c5da0d42a7b..fd2a35e59591 100644
> --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> @@ -22,7 +22,7 @@ [Sources]
> [Sources.ARM]
> Arm/ArchPrePi.c
> Arm/ModuleEntryPoint.S | GCC
> - Arm/ModuleEntryPoint.asm | RVCT
> + Arm/ModuleEntryPoint.asm | MSFT
>
> [Sources.AArch64]
> AArch64/ArchPrePi.c
> diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> index ee9b05b25337..de3abadfeac6 100644
> --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
> +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> @@ -22,7 +22,7 @@ [Sources]
> [Sources.ARM]
> Arm/ArchPrePi.c
> Arm/ModuleEntryPoint.S | GCC
> - Arm/ModuleEntryPoint.asm | RVCT
> + Arm/ModuleEntryPoint.asm | MSFT
>
> [Sources.AArch64]
> AArch64/ArchPrePi.c
> diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> index ad68f841fb6b..62b46377116c 100644
> --- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> @@ -31,7 +31,7 @@ [Sources]
> [Sources.ARM]
> IoLibArmVirt.c
> Arm/ArmVirtMmio.S | GCC
> - Arm/ArmVirtMmio.asm | RVCT
> + Arm/ArmVirtMmio.asm | MSFT
>
> [Sources.AARCH64]
> IoLibArmVirt.c
> diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> index d38e1397eee1..79ba2a2dfc39 100644
> --- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> +++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> @@ -85,11 +85,11 @@ [Sources.ARM]
> Arm/CompareMem.S | GCC
> Arm/CompareGuid.S | GCC
>
> - Arm/ScanMem.asm |RVCT
> - Arm/SetMem.asm |RVCT
> - Arm/CopyMem.asm |RVCT
> - Arm/CompareMem.asm |RVCT
> - Arm/CompareGuid.asm |RVCT
> + Arm/ScanMem.asm | MSFT
> + Arm/SetMem.asm | MSFT
> + Arm/CopyMem.asm | MSFT
> + Arm/CompareMem.asm | MSFT
> + Arm/CompareGuid.asm | MSFT
>
> [Sources.AARCH64]
> AArch64/ScanMem.S
> diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> index 446bc19b63eb..39c503a28a2c 100755
> --- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> +++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> @@ -70,7 +70,7 @@ [Sources.EBC]
>
> [Sources.ARM]
> Synchronization.c
> - Arm/Synchronization.asm | RVCT
> + Arm/Synchronization.asm | MSFT
> Arm/Synchronization.S | GCC
>
> [Sources.AARCH64]
> --
> 2.23.0
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build
2019-09-19 9:38 ` Ard Biesheuvel
@ 2019-09-19 9:52 ` Leif Lindholm
2019-09-19 9:59 ` Ard Biesheuvel
0 siblings, 1 reply; 8+ messages in thread
From: Leif Lindholm @ 2019-09-19 9:52 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Baptiste Gerondeau, edk2-devel-groups-io, Kinney, Michael D,
Gao, Liming, Zhang, Shenglei, Baptiste GERONDEAU
On Thu, Sep 19, 2019 at 12:38:00PM +0300, Ard Biesheuvel wrote:
> On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
> <baptiste.gerondeau@linaro.org> wrote:
> >
> > From: Baptiste GERONDEAU <bgerondeau@gmail.com>
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
> >
> > Since RVCT shares the same assembler syntax as MSFT, use .asm files
> > and associate them with MSFT, which would be a first step to addressing
> > the above Bugzilla issue.
> > RVCT will also have to be erased from BaseTools/rest of the build
> > infrastructure, to fully address BZ#1750 ; this patch only addresses the
> > "code" in itself.
> >
> > Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
>
> The changes look fine to me, but please split them out per package as
> Liming suggested.
Hmm, and I've just gone and contradicted that.
As I said in my reply to Liming, this is a very special situation, and
the net effect of splitting this patch up is that we end up with a
set of not-usefully-bisectable patches.
/
Leif
> > ---
> > ArmPkg/Drivers/ArmGic/ArmGicLib.inf | 2 +-
> > ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf | 2 +-
> > ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf | 2 +-
> > ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 2 +-
> > ArmPkg/Library/ArmLib/ArmBaseLib.inf | 8 ++++----
> > ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
> > ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 2 +-
> > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 2 +-
> > ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf | 2 +-
> > ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf | 2 +-
> > ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf | 2 +-
> > ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 6 +++---
> > ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 6 +++---
> > ArmPlatformPkg/PrePi/PeiMPCore.inf | 2 +-
> > ArmPlatformPkg/PrePi/PeiUniCore.inf | 2 +-
> > MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf | 2 +-
> > MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
> > MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf | 2 +-
> > 18 files changed, 29 insertions(+), 29 deletions(-)
> >
> > diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> > index 5e23c732bfab..4fccb938eb6d 100644
> > --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> > +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
> > @@ -22,7 +22,7 @@ [Sources]
> >
> > [Sources.ARM]
> > GicV3/Arm/ArmGicV3.S | GCC
> > - GicV3/Arm/ArmGicV3.asm | RVCT
> > + GicV3/Arm/ArmGicV3.asm | MSFT
> >
> > [Sources.AARCH64]
> > GicV3/AArch64/ArmGicV3.S
> > diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> > index fdb9c24d21bc..58b2ddbff858 100644
> > --- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> > +++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
> > @@ -33,7 +33,7 @@ [Sources.common]
> >
> > [Sources.Arm]
> > Arm/ArmException.c
> > - Arm/ExceptionSupport.asm | RVCT
> > + Arm/ExceptionSupport.asm | MSFT
> > Arm/ExceptionSupport.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> > index ef1a43a27c45..a404ca2ccf82 100644
> > --- a/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> > +++ b/ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
> > @@ -28,7 +28,7 @@ [Sources.common]
> >
> > [Sources.Arm]
> > Arm/ArmException.c
> > - Arm/ExceptionSupport.asm | RVCT
> > + Arm/ExceptionSupport.asm | MSFT
> > Arm/ExceptionSupport.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> > index 69f68f63d7a6..be8d8a228865 100644
> > --- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> > +++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
> > @@ -15,7 +15,7 @@ [Defines]
> > LIBRARY_CLASS = ArmHvcLib
> >
> > [Sources.ARM]
> > - Arm/ArmHvc.asm | RVCT
> > + Arm/ArmHvc.asm | MSFT
> > Arm/ArmHvc.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > index 5e70990872f2..63e175623393 100644
> > --- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
> > @@ -30,10 +30,10 @@ [Sources.ARM]
> > Arm/ArmV7Support.S | GCC
> > Arm/ArmV7ArchTimerSupport.S | GCC
> >
> > - Arm/ArmLibSupport.asm | RVCT
> > - Arm/ArmLibSupportV7.asm | RVCT
> > - Arm/ArmV7Support.asm | RVCT
> > - Arm/ArmV7ArchTimerSupport.asm | RVCT
> > + Arm/ArmLibSupport.asm | MSFT
> > + Arm/ArmLibSupportV7.asm | MSFT
> > + Arm/ArmV7Support.asm | MSFT
> > + Arm/ArmV7ArchTimerSupport.asm | MSFT
> >
> > [Sources.AARCH64]
> > AArch64/AArch64Lib.h
> > diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> > index 33dddf1e2b97..44366f02c6d9 100644
> > --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> > +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> > @@ -23,7 +23,7 @@ [Sources.AARCH64]
> > [Sources.ARM]
> > Arm/ArmMmuLibCore.c
> > Arm/ArmMmuLibV7Support.S | GCC
> > - Arm/ArmMmuLibV7Support.asm |RVCT
> > + Arm/ArmMmuLibV7Support.asm | MSFT
> >
> > [Packages]
> > ArmPkg/ArmPkg.dec
> > diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> > index 4f4b09f4528a..af8c0e53cc2b 100644
> > --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> > +++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
> > @@ -14,7 +14,7 @@ [Defines]
> > LIBRARY_CLASS = ArmSmcLib
> >
> > [Sources.ARM]
> > - Arm/ArmSmc.asm | RVCT
> > + Arm/ArmSmc.asm | MSFT
> > Arm/ArmSmc.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > index fa19bf649131..f4c9e5510b9a 100644
> > --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> > @@ -21,7 +21,7 @@ [Sources.AARCH64]
> >
> > [Sources.ARM]
> > Arm/Reset.S | GCC
> > - Arm/Reset.asm | RVCT
> > + Arm/Reset.asm | MSFT
> >
> > [Sources]
> > ArmSmcPsciResetSystemLib.c
> > diff --git a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > index 744a29fbf723..6631e40df130 100644
> > --- a/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > +++ b/ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> > @@ -14,7 +14,7 @@ [Defines]
> > LIBRARY_CLASS = ArmSvcLib
> >
> > [Sources.ARM]
> > - Arm/ArmSvc.asm | RVCT
> > + Arm/ArmSvc.asm | MSFT
> > Arm/ArmSvc.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> > index e0d0028d8224..cc791a3a68fd 100644
> > --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> > +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
> > @@ -29,7 +29,7 @@ [Sources.common]
> >
> > [Sources.Arm]
> > Arm/ArmPlatformHelper.S | GCC
> > - Arm/ArmPlatformHelper.asm | RVCT
> > + Arm/ArmPlatformHelper.asm | MSFT
> >
> > [Sources.AArch64]
> > AArch64/ArmPlatformHelper.S
> > diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> > index 76f809c80d9f..e88330c1c382 100644
> > --- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> > +++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
> > @@ -21,7 +21,7 @@ [Packages]
> > ArmPlatformPkg/ArmPlatformPkg.dec
> >
> > [Sources.ARM]
> > - Arm/ArmPlatformStackLib.asm | RVCT
> > + Arm/ArmPlatformStackLib.asm | MSFT
> > Arm/ArmPlatformStackLib.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > index f2ac45d171bc..b663ff749182 100644
> > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
> > @@ -21,11 +21,11 @@ [Sources.common]
> >
> > [Sources.ARM]
> > Arm/ArchPrePeiCore.c
> > - Arm/PrePeiCoreEntryPoint.asm | RVCT
> > + Arm/PrePeiCoreEntryPoint.asm | MSFT
> > Arm/PrePeiCoreEntryPoint.S | GCC
> > - Arm/SwitchStack.asm | RVCT
> > + Arm/SwitchStack.asm | MSFT
> > Arm/SwitchStack.S | GCC
> > - Arm/Exception.asm | RVCT
> > + Arm/Exception.asm | MSFT
> > Arm/Exception.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > index 84c319c3679b..6d05ed096c4c 100644
> > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
> > @@ -21,11 +21,11 @@ [Sources.common]
> >
> > [Sources.ARM]
> > Arm/ArchPrePeiCore.c
> > - Arm/PrePeiCoreEntryPoint.asm | RVCT
> > + Arm/PrePeiCoreEntryPoint.asm | MSFT
> > Arm/PrePeiCoreEntryPoint.S | GCC
> > - Arm/SwitchStack.asm | RVCT
> > + Arm/SwitchStack.asm | MSFT
> > Arm/SwitchStack.S | GCC
> > - Arm/Exception.asm | RVCT
> > + Arm/Exception.asm | MSFT
> > Arm/Exception.S | GCC
> >
> > [Sources.AARCH64]
> > diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > index 9c5da0d42a7b..fd2a35e59591 100644
> > --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
> > @@ -22,7 +22,7 @@ [Sources]
> > [Sources.ARM]
> > Arm/ArchPrePi.c
> > Arm/ModuleEntryPoint.S | GCC
> > - Arm/ModuleEntryPoint.asm | RVCT
> > + Arm/ModuleEntryPoint.asm | MSFT
> >
> > [Sources.AArch64]
> > AArch64/ArchPrePi.c
> > diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > index ee9b05b25337..de3abadfeac6 100644
> > --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
> > @@ -22,7 +22,7 @@ [Sources]
> > [Sources.ARM]
> > Arm/ArchPrePi.c
> > Arm/ModuleEntryPoint.S | GCC
> > - Arm/ModuleEntryPoint.asm | RVCT
> > + Arm/ModuleEntryPoint.asm | MSFT
> >
> > [Sources.AArch64]
> > AArch64/ArchPrePi.c
> > diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> > index ad68f841fb6b..62b46377116c 100644
> > --- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> > +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
> > @@ -31,7 +31,7 @@ [Sources]
> > [Sources.ARM]
> > IoLibArmVirt.c
> > Arm/ArmVirtMmio.S | GCC
> > - Arm/ArmVirtMmio.asm | RVCT
> > + Arm/ArmVirtMmio.asm | MSFT
> >
> > [Sources.AARCH64]
> > IoLibArmVirt.c
> > diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> > index d38e1397eee1..79ba2a2dfc39 100644
> > --- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> > +++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> > @@ -85,11 +85,11 @@ [Sources.ARM]
> > Arm/CompareMem.S | GCC
> > Arm/CompareGuid.S | GCC
> >
> > - Arm/ScanMem.asm |RVCT
> > - Arm/SetMem.asm |RVCT
> > - Arm/CopyMem.asm |RVCT
> > - Arm/CompareMem.asm |RVCT
> > - Arm/CompareGuid.asm |RVCT
> > + Arm/ScanMem.asm | MSFT
> > + Arm/SetMem.asm | MSFT
> > + Arm/CopyMem.asm | MSFT
> > + Arm/CompareMem.asm | MSFT
> > + Arm/CompareGuid.asm | MSFT
> >
> > [Sources.AARCH64]
> > AArch64/ScanMem.S
> > diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> > index 446bc19b63eb..39c503a28a2c 100755
> > --- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> > +++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
> > @@ -70,7 +70,7 @@ [Sources.EBC]
> >
> > [Sources.ARM]
> > Synchronization.c
> > - Arm/Synchronization.asm | RVCT
> > + Arm/Synchronization.asm | MSFT
> > Arm/Synchronization.S | GCC
> >
> > [Sources.AARCH64]
> > --
> > 2.23.0
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build
2019-09-19 9:52 ` Leif Lindholm
@ 2019-09-19 9:59 ` Ard Biesheuvel
0 siblings, 0 replies; 8+ messages in thread
From: Ard Biesheuvel @ 2019-09-19 9:59 UTC (permalink / raw)
To: Leif Lindholm
Cc: Baptiste Gerondeau, edk2-devel-groups-io, Kinney, Michael D,
Gao, Liming, Zhang, Shenglei, Baptiste GERONDEAU
On Thu, 19 Sep 2019 at 12:52, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Thu, Sep 19, 2019 at 12:38:00PM +0300, Ard Biesheuvel wrote:
> > On Wed, 18 Sep 2019 at 15:27, Baptiste Gerondeau
> > <baptiste.gerondeau@linaro.org> wrote:
> > >
> > > From: Baptiste GERONDEAU <bgerondeau@gmail.com>
> > >
> > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1750"
> > >
> > > Since RVCT shares the same assembler syntax as MSFT, use .asm files
> > > and associate them with MSFT, which would be a first step to addressing
> > > the above Bugzilla issue.
> > > RVCT will also have to be erased from BaseTools/rest of the build
> > > infrastructure, to fully address BZ#1750 ; this patch only addresses the
> > > "code" in itself.
> > >
> > > Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
> >
> > The changes look fine to me, but please split them out per package as
> > Liming suggested.
>
> Hmm, and I've just gone and contradicted that.
> As I said in my reply to Liming, this is a very special situation, and
> the net effect of splitting this patch up is that we end up with a
> set of not-usefully-bisectable patches.
>
Fair enough. I won't get involved in that discussion, though.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format
2019-09-18 16:05 ` [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format Baptiste Gerondeau
@ 2019-09-19 10:42 ` Baptiste Gerondeau
0 siblings, 0 replies; 8+ messages in thread
From: Baptiste Gerondeau @ 2019-09-19 10:42 UTC (permalink / raw)
To: edk2-devel-groups-io
Cc: Ard Biesheuvel, Leif Lindholm, Kinney, Michael D, Gao, Liming,
Zhang, Shenglei
[-- Attachment #1: Type: text/plain, Size: 2575 bytes --]
Sorry, for replying on this thread, this is the correct one (messed up the
author's email, sorry again !)
Ard Biescheuvel asks : "Why ?"
The practical reason would be because it breaks an "grep -nr "|
${toolchain}" "
(although with some regex magic I guess it can be circumvented, but one
would need to know in advance that there are places where there aren't
spaces)
The second reason would be because it breaks the standard format used in
all other inf files.
But if you find this is useless, I'll drop this one !
On Wed, 18 Sep 2019 at 18:05, Baptiste Gerondeau <
baptiste.gerondeau@linaro.org> wrote:
> From: Baptiste GERONDEAU <baptiste.gerondeau@linaro.org>
>
> Add a space between the '|' and the name of the toolchain to use,
> as is the case in all other INF files.
> Note that I did not touch the RVCT lines, since a following commit in
> the set will address those.
>
> Signed-off-by: Baptiste Gerondeau <baptiste.gerondeau@linaro.org>
> ---
> ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +-
> MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> index f4fecbb4098a..33dddf1e2b97 100644
> --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
> @@ -22,7 +22,7 @@ [Sources.AARCH64]
>
> [Sources.ARM]
> Arm/ArmMmuLibCore.c
> - Arm/ArmMmuLibV7Support.S |GCC
> + Arm/ArmMmuLibV7Support.S | GCC
> Arm/ArmMmuLibV7Support.asm |RVCT
>
> [Packages]
> diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> index e4e3d532e7b8..d38e1397eee1 100644
> --- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> +++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> @@ -79,11 +79,11 @@ [Defines.ARM, Defines.AARCH64]
> LIBRARY_CLASS = BaseMemoryLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER
> UEFI_DRIVER UEFI_APPLICATION
>
> [Sources.ARM]
> - Arm/ScanMem.S |GCC
> - Arm/SetMem.S |GCC
> - Arm/CopyMem.S |GCC
> - Arm/CompareMem.S |GCC
> - Arm/CompareGuid.S |GCC
> + Arm/ScanMem.S | GCC
> + Arm/SetMem.S | GCC
> + Arm/CopyMem.S | GCC
> + Arm/CompareMem.S | GCC
> + Arm/CompareGuid.S | GCC
>
> Arm/ScanMem.asm |RVCT
> Arm/SetMem.asm |RVCT
> --
> 2.23.0
>
>
--
Baptiste Gerondeau
Engineer - HPC SIG - LDCG - Linaro
#irc : BaptisteGer
[-- Attachment #2: Type: text/html, Size: 3469 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-09-19 10:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1568821123.git.baptiste.gerondeau@linaro.org>
2019-09-18 16:05 ` [PATCH 1/3] ArmPkg/MdePkg : Unify INF files format Baptiste Gerondeau
2019-09-19 10:42 ` Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 2/3] ARM/Assembler: Correct syntax from RVCT for MSFT Baptiste Gerondeau
2019-09-18 16:05 ` [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Baptiste Gerondeau
2019-09-18 12:25 [PATCH 0/3] Arm builds on Visual Studio Baptiste Gerondeau
2019-09-18 12:25 ` [PATCH 3/3] ARM/Assembler: Reuse RVCT assembler for MSFT build Baptiste Gerondeau
2019-09-19 9:38 ` Ard Biesheuvel
2019-09-19 9:52 ` Leif Lindholm
2019-09-19 9:59 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox