I feel that ordering alphabetically may break the logical groups. For example, below two might be placed in a reverse way. CpuExceptionCommon.h CpuExceptionCommon.c But luckily, you didn't re-order the above to make .c above .h. So, you are not simply ordering them alphabetically. Nevertheless, the current changes look good to me. Reviewed-by: Ray Ni Thanks, Ray ________________________________ From: Chao Li Sent: Wednesday, March 20, 2024 16:42 To: devel@edk2.groups.io Cc: Ni, Ray ; Kumar, Rahul R ; Gerd Hoffmann Subject: [PATCH v2 02/13] UefiCpuPkg/CpuExceptionHandlerLib: Reorder the INF files alphabetically Some of the order is not in alphabetical, reorder. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4726 Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Signed-off-by: Chao Li Acked-by: Gerd Hoffmann --- .../DxeCpuExceptionHandlerLib.inf | 20 +++++++++---------- .../PeiCpuExceptionHandlerLib.inf | 16 +++++++-------- .../SecPeiCpuExceptionHandlerLib.inf | 12 +++++------ .../SmmCpuExceptionHandlerLib.inf | 16 +++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf index fdbebadab9..aabcabff0f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf @@ -22,21 +22,21 @@ [Defines] # [Sources.Ia32] - Ia32/ExceptionHandlerAsm.nasm - Ia32/ExceptionTssEntryAsm.nasm Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionTssEntryAsm.nasm [Sources.X64] - X64/ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h + X64/ExceptionHandlerAsm.nasm [Sources.common] CpuExceptionCommon.h CpuExceptionCommon.c - PeiDxeSmmCpuException.c DxeException.c + PeiDxeSmmCpuException.c [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard @@ -53,14 +53,14 @@ [Packages] [LibraryClasses] BaseLib - SerialPortLib - PrintLib - SynchronizationLib + CcExitLib + DebugLib LocalApicLib - PeCoffGetEntryPointLib MemoryAllocationLib - DebugLib - CcExitLib + PeCoffGetEntryPointLib + PrintLib + SerialPortLib + SynchronizationLib [BuildOptions] XCODE:*_*_X64_NASM_FLAGS = -D NO_ABSOLUTE_RELOCS_IN_TEXT diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf index 3bcaff5c5f..3a11516e32 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf @@ -22,15 +22,15 @@ [Defines] # [Sources.Ia32] - Ia32/ExceptionHandlerAsm.nasm - Ia32/ExceptionTssEntryAsm.nasm Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionTssEntryAsm.nasm [Sources.X64] - X64/SecPeiExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h + X64/SecPeiExceptionHandlerAsm.nasm [Sources.common] CpuExceptionCommon.h @@ -45,14 +45,14 @@ [Packages] [LibraryClasses] BaseLib - SerialPortLib - PrintLib - LocalApicLib - PeCoffGetEntryPointLib + CcExitLib HobLib + LocalApicLib MemoryAllocationLib + PeCoffGetEntryPointLib + PrintLib + SerialPortLib SynchronizationLib - CcExitLib [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard # CONSUMES diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf index e7b1144f69..f8e597d86d 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf @@ -22,15 +22,15 @@ [Defines] # [Sources.Ia32] - Ia32/ExceptionHandlerAsm.nasm - Ia32/ExceptionTssEntryAsm.nasm Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionTssEntryAsm.nasm [Sources.X64] - X64/SecPeiExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h + X64/SecPeiExceptionHandlerAsm.nasm [Sources.common] CpuExceptionCommon.h @@ -44,11 +44,11 @@ [Packages] [LibraryClasses] BaseLib - SerialPortLib - PrintLib + CcExitLib LocalApicLib PeCoffGetEntryPointLib - CcExitLib + PrintLib + SerialPortLib [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf index 27f0b96fa9..cc280a6ee7 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf @@ -22,15 +22,15 @@ [Defines] # [Sources.Ia32] - Ia32/ExceptionHandlerAsm.nasm - Ia32/ExceptionTssEntryAsm.nasm Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionTssEntryAsm.nasm [Sources.X64] - X64/ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h + X64/ExceptionHandlerAsm.nasm [Sources.common] CpuExceptionCommon.h @@ -45,13 +45,13 @@ [Packages] [LibraryClasses] BaseLib - SerialPortLib - PrintLib - SynchronizationLib + CcExitLib + DebugLib LocalApicLib PeCoffGetEntryPointLib - DebugLib - CcExitLib + PrintLib + SerialPortLib + SynchronizationLib [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117020): https://edk2.groups.io/g/devel/message/117020 Mute This Topic: https://groups.io/mt/105041087/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-