Add new status code definition in PI 1.2 Errata B.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11616 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 84 insertions, 4 deletions

diff --git a/MdePkg/Include/Guid/StatusCodeDataTypeId.h b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
index dbe7662faf..7471db848a 100644
--- a/MdePkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/MdePkg/Include/Guid/StatusCodeDataTypeId.h
@@ -686,6 +686,18 @@ typedef union {
   /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.

   ///

   EFI_SYSTEM_CONTEXT_IPF  SystemContextIpf;

+  ///

+  /// The context of the X64 processor when the exception was generated. Type

+  /// EFI_SYSTEM_CONTEXT_X64 is defined in the

+  /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.

+  ///

+  EFI_SYSTEM_CONTEXT_X64  SystemContextX64; 

+  ///

+  /// The context of the ARM processor when the exception was generated. Type

+  /// EFI_SYSTEM_CONTEXT_ARM is defined in the

+  /// EFI_DEBUG_SUPPORT_PROTOCOL in the UEFI Specification.

+  ///

+  EFI_SYSTEM_CONTEXT_ARM  SystemContextArm;

 } EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT;

 

 ///

diff --git a/MdePkg/Include/Pi/PiStatusCode.h b/MdePkg/Include/Pi/PiStatusCode.h
index 77c0d7f688..389d31c9a8 100644
--- a/MdePkg/Include/Pi/PiStatusCode.h
+++ b/MdePkg/Include/Pi/PiStatusCode.h
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __PI_STATUS_CODE_H__

 

 //

-// Required for IA32 and IPF defines for CPU exception types

+// Required for IA32, X64, IPF, ARM and EBC defines for CPU exception types

 //

 #include <Protocol/DebugSupport.h>

 

@@ -711,6 +711,9 @@ typedef struct {
 #define EFI_SOFTWARE_EFI_BOOT_SERVICE     (EFI_SOFTWARE | 0x00100000)

 #define EFI_SOFTWARE_EFI_RUNTIME_SERVICE  (EFI_SOFTWARE | 0x00110000)

 #define EFI_SOFTWARE_EFI_DXE_SERVICE      (EFI_SOFTWARE | 0x00120000)

+#define EFI_SOFTWARE_X64_EXCEPTION        (EFI_SOFTWARE | 0x00130000)

+#define EFI_SOFTWARE_ARM_EXCEPTION        (EFI_SOFTWARE | 0x00140000)

+

 ///@}

 

 ///

@@ -807,6 +810,14 @@ typedef struct {
 ///@}

 

 //

+// Software Class X64 Exception Subclass Progress Code definitions.

+//

+

+//

+// Software Class ARM Exception Subclass Progress Code definitions.

+//

+

+//

 // Software Class EBC Exception Subclass Progress Code definitions.

 //

 

@@ -1121,8 +1132,65 @@ typedef struct {
 // Software Class EFI Runtime Service Subclass Error Code definitions.

 //

 

-//

-// Software Class EFI DXE Service Subclass Error Code definitions.

-//

+///

+/// Software Class EFI DXE Service Subclass Error Code definitions.

+///

+///@{

+#define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS   (EFI_SUBCLASS_SPECIFIC | 0x00000005)

+#define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD         (EFI_SUBCLASS_SPECIFIC | 0x00000006)

+///@}

+

+///

+/// Software Class DXE RT Driver Subclass Progress Code definitions.

+///

+///@{

+#define EFI_SW_DXE_RT_PC_S0                         (EFI_SUBCLASS_SPECIFIC | 0x00000000)

+#define EFI_SW_DXE_RT_PC_S1                         (EFI_SUBCLASS_SPECIFIC | 0x00000001)

+#define EFI_SW_DXE_RT_PC_S2                         (EFI_SUBCLASS_SPECIFIC | 0x00000002)

+#define EFI_SW_DXE_RT_PC_S3                         (EFI_SUBCLASS_SPECIFIC | 0x00000003)

+#define EFI_SW_DXE_RT_PC_S4                         (EFI_SUBCLASS_SPECIFIC | 0x00000004)

+#define EFI_SW_DXE_RT_PC_S5                         (EFI_SUBCLASS_SPECIFIC | 0x00000005)

+///@}

+

+///

+/// Software Class X64 Exception Subclass Error Code definitions.

+/// These exceptions are derived from the debug protocol

+/// definitions in the EFI specification.

+///

+///@{

+#define EFI_SW_EC_X64_DIVIDE_ERROR                   EXCEPT_X64_DIVIDE_ERROR

+#define EFI_SW_EC_X64_DEBUG                          EXCEPT_X64_DEBUG

+#define EFI_SW_EC_X64_NMI                            EXCEPT_X64_NMI

+#define EFI_SW_EC_X64_BREAKPOINT                     EXCEPT_X64_BREAKPOINT

+#define EFI_SW_EC_X64_OVERFLOW                       EXCEPT_X64_OVERFLOW

+#define EFI_SW_EC_X64_BOUND                          EXCEPT_X64_BOUND

+#define EFI_SW_EC_X64_INVALID_OPCODE                 EXCEPT_X64_INVALID_OPCODE

+#define EFI_SW_EC_X64_DOUBLE_FAULT                   EXCEPT_X64_DOUBLE_FAULT

+#define EFI_SW_EC_X64_INVALID_TSS                    EXCEPT_X64_INVALID_TSS

+#define EFI_SW_EC_X64_SEG_NOT_PRESENT                EXCEPT_X64_SEG_NOT_PRESENT

+#define EFI_SW_EC_X64_STACK_FAULT                    EXCEPT_X64_STACK_FAULT

+#define EFI_SW_EC_X64_GP_FAULT                       EXCEPT_X64_GP_FAULT

+#define EFI_SW_EC_X64_PAGE_FAULT                     EXCEPT_X64_PAGE_FAULT

+#define EFI_SW_EC_X64_FP_ERROR                       EXCEPT_X64_FP_ERROR

+#define EFI_SW_EC_X64_ALIGNMENT_CHECK                EXCEPT_X64_ALIGNMENT_CHECK

+#define EFI_SW_EC_X64_MACHINE_CHECK                  EXCEPT_X64_MACHINE_CHECK

+#define EFI_SW_EC_X64_SIMD                           EXCEPT_X64_SIMD

+///@}

+

+///

+/// Software Class ARM Exception Subclass Error Code definitions.

+/// These exceptions are derived from the debug protocol

+/// definitions in the EFI specification.

+///

+///@{

+#define EFI_SW_EC_ARM_RESET                          EXCEPT_ARM_RESET 

+#define EFI_SW_EC_ARM_UNDEFINED_INSTRUCTION          EXCEPT_ARM_UNDEFINED_INSTRUCTION 

+#define EFI_SW_EC_ARM_SOFTWARE_INTERRUPT             EXCEPT_ARM_SOFTWARE_INTERRUPT 

+#define EFI_SW_EC_ARM_PREFETCH_ABORT                 EXCEPT_ARM_PREFETCH_ABORT

+#define EFI_SW_EC_ARM_DATA_ABORT                     EXCEPT_ARM_DATA_ABORT

+#define EFI_SW_EC_ARM_RESERVED                       EXCEPT_ARM_RESERVED

+#define EFI_SW_EC_ARM_IRQ                            EXCEPT_ARM_IRQ

+#define EFI_SW_EC_ARM_FIQ                            EXCEPT_ARM_FIQ

+///@}

 

 #endif