[AMD Official Use Only - General]
Need maintainer to review this changes. However, same comment as I gave earlier. We will have to wait until the File Naming and Directory naming sections are firmed and published in edk2 coding standard spec.
Abner
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sunil V L
> via groups.io
> Sent: Saturday, October 15, 2022 12:48 AM
> To: devel@edk2.groups.io
> Cc: Eric Dong <eric.dong@intel.com>; Ray Ni <ray.ni@intel.com>; Rahul
> Kumar <rahul1.kumar@intel.com>
> Subject: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V4 15/34]
> UefiCpuPkg/CpuExceptionHandlerLib: Refactor to allow other architectures
>
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
>
>
> REF:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugz
> illa.tianocore.org%2Fshow_bug.cgi%3Fid%3D4076&data=05%7C01%7Ca
> bner.chang%40amd.com%7C59e63a7db04e464f5c3208daae043c0a%7C3dd89
> 61fe4884e608e11a82d994e183d%7C0%7C0%7C638013630462875566%7CUnkn
> own%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik
> 1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=93oEfG8e%2FDl
> va3yL1aAnvHKm6ZbO17Rxgoo%2FL7JM3No%3D&reserved=0
>
> Currently, the CpuExceptionHandlerLib library supports only X86.
> Refactor the library to allow adding other CPU architectures.
>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> ---
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.in
> f | 14 ++++++++------
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
> | 8 ++++----
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib
> .inf | 12 +++++++-----
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i
> nf | 8 ++++----
>
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHa
> ndlerLib.inf | 6 +++---
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ =>
> Ia32X64}/CpuExceptionCommon.h | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ =>
> Ia32X64}/CpuExceptionCommon.c | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ => Ia32X64}/DxeException.c
> | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ =>
> Ia32X64}/PeiCpuException.c | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ =>
> Ia32X64}/PeiDxeSmmCpuException.c | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ =>
> Ia32X64}/SecPeiCpuException.c | 0
> UefiCpuPkg/Library/CpuExceptionHandlerLib/{ => Ia32X64}/SmmException.c
> | 0
> 12 files changed, 26 insertions(+), 22 deletions(-)
>
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.
> inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib
> .inf
> index e7a81bebdb13..8fdf2b756c2c 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.
> inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib
> .inf
> @@ -32,11 +32,11 @@ [Sources.X64]
> X64/ArchExceptionHandler.c
> X64/ArchInterruptDefs.h
>
> -[Sources.common]
> - CpuExceptionCommon.h
> - CpuExceptionCommon.c
> - PeiDxeSmmCpuException.c
> - DxeException.c
> +[Sources.IA32, Sources.X64]
> + Ia32X64/CpuExceptionCommon.h
> + Ia32X64/CpuExceptionCommon.c
> + Ia32X64/PeiDxeSmmCpuException.c
> + Ia32X64/DxeException.c
>
> [Pcd]
> gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard
> @@ -56,8 +56,10 @@ [LibraryClasses]
> SerialPortLib
> PrintLib
> SynchronizationLib
> - LocalApicLib
> PeCoffGetEntryPointLib
> MemoryAllocationLib
> DebugLib
> +
> +[LibraryClasses.IA32, LibraryClasses.X64]
> + LocalApicLib
> VmgExitLib
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> index 7c2ec3b2db4c..af4899e6885e 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i
> nf
> @@ -33,10 +33,10 @@ [Sources.X64]
> X64/ArchInterruptDefs.h
>
> [Sources.common]
> - CpuExceptionCommon.h
> - CpuExceptionCommon.c
> - PeiCpuException.c
> - PeiDxeSmmCpuException.c
> + Ia32X64/CpuExceptionCommon.h
> + Ia32X64/CpuExceptionCommon.c
> + Ia32X64/PeiCpuException.c
> + Ia32X64/PeiDxeSmmCpuException.c
>
> [Packages]
> MdePkg/MdePkg.dec
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> index 6a170286c8fc..79911b21f62d 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandler
> Lib.inf
> @@ -32,10 +32,10 @@ [Sources.X64]
> X64/ArchExceptionHandler.c
> X64/ArchInterruptDefs.h
>
> -[Sources.common]
> - CpuExceptionCommon.h
> - CpuExceptionCommon.c
> - SecPeiCpuException.c
> +[Sources.IA32, Sources.X64]
> + Ia32X64/CpuExceptionCommon.h
> + Ia32X64/CpuExceptionCommon.c
> + Ia32X64/SecPeiCpuException.c
>
> [Packages]
> MdePkg/MdePkg.dec
> @@ -46,8 +46,10 @@ [LibraryClasses]
> BaseLib
> SerialPortLib
> PrintLib
> - LocalApicLib
> PeCoffGetEntryPointLib
> +
> +[LibraryClasses.IA32, LibraryClasses.X64]
> + LocalApicLib
> VmgExitLib
>
> [Pcd]
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLi
> b.inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLi
> b.inf
> index 9dde07612a04..249446588bfa 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLi
> b.inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLi
> b.inf
> @@ -33,10 +33,10 @@ [Sources.X64]
> X64/ArchInterruptDefs.h
>
> [Sources.common]
> - CpuExceptionCommon.h
> - CpuExceptionCommon.c
> - PeiDxeSmmCpuException.c
> - SmmException.c
> + Ia32X64/CpuExceptionCommon.h
> + Ia32X64/CpuExceptionCommon.c
> + Ia32X64/PeiDxeSmmCpuException.c
> + Ia32X64/SmmException.c
>
> [Packages]
> MdePkg/MdePkg.dec
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> index 6d2f66504a5b..23200437eb8b 100644
> ---
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> +++
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuException
> HandlerLib.inf
> @@ -38,9 +38,9 @@ [Sources.X64]
> X64/ArchInterruptDefs.h
>
> [Sources.common]
> - CpuExceptionCommon.h
> - CpuExceptionCommon.c
> - SecPeiCpuException.c
> + Ia32X64/CpuExceptionCommon.h
> + Ia32X64/CpuExceptionCommon.c
> + Ia32X64/SecPeiCpuException.c
>
> [Packages]
> MdePkg/MdePkg.dec
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/CpuExceptionCom
> mon.h
> similarity index 100%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/CpuExceptionCommo
> n.h
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/CpuExceptionCom
> mon.c
> similarity index 100%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/CpuExceptionCommo
> n.c
> diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/DxeException.c
> similarity index 100%
> rename from UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/DxeException.c
> diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/PeiCpuException.c
> similarity index 100%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/PeiCpuException.c
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/PeiDxeSmmCpuExc
> eption.c
> similarity index 100%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiDxeSmmCpuException.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/PeiDxeSmmCpuExcep
> tion.c
> diff --git
> a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/SecPeiCpuExceptio
> n.c
> similarity index 100%
> rename from
> UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/SecPeiCpuException.c
> diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
> b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/SmmException.c
> similarity index 100%
> rename from UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
> rename to
> UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32X64/SmmException.c
> --
> 2.38.0
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95267): https://edk2.groups.io/g/devel/message/95267
Mute This Topic: https://groups.io/mt/94330842/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-