UefiCpuPkg/ExceptionLib: Add EXCEPTION_HANDLER_DATA definition

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
index b28e9c574a65ec4a06ed24d9c1729f4b0b795e64..0757aef7b76b2625792c95f41a0707911de96988 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
@@ -1,7 +1,7 @@
 /** @file\r
   Common header file for CPU Exception Handler Library.\r
 \r
 /** @file\r
   Common header file for CPU Exception Handler Library.\r
 \r

-  Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -40,6 +40,13 @@ typedef struct {
   UINTN HookAfterStubHeaderStart;\r
 } EXCEPTION_HANDLER_TEMPLATE_MAP;\r
 \r
   UINTN HookAfterStubHeaderStart;\r
 } EXCEPTION_HANDLER_TEMPLATE_MAP;\r
 \r

+typedef struct {\r
+  UINTN                       IdtEntryCount;\r
+  SPIN_LOCK                   DisplayMessageSpinLock;\r
+  RESERVED_VECTORS_DATA       *ReservedVectors;\r
+  EFI_CPU_INTERRUPT_HANDLER   *ExternalInterruptHandler;\r
+} EXCEPTION_HANDLER_DATA;\r
+\r

 extern CONST UINT32                mErrorCodeFlag;\r
 extern CONST UINTN                 mImageAlignSize;\r
 extern CONST UINTN                 mDoFarReturnFlag;\r
 extern CONST UINT32                mErrorCodeFlag;\r
 extern CONST UINTN                 mImageAlignSize;\r
 extern CONST UINTN                 mDoFarReturnFlag;\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
index 6739a2cc3cfb559e63a9482e2443534156572f1f..6d163367ab9004d0238b2e15881e52d6f3e03bca 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c
@@ -1,7 +1,7 @@
 /** @file\r
   CPU exception handler library implemenation for DXE modules.\r
 \r
 /** @file\r
   CPU exception handler library implemenation for DXE modules.\r
 \r

-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -21,6 +21,7 @@ CONST UINTN    mDoFarReturnFlag  = 0;
 \r
 extern SPIN_LOCK                   mDisplayMessageSpinLock;\r
 extern EFI_CPU_INTERRUPT_HANDLER   *mExternalInterruptHandler;\r
 \r
 extern SPIN_LOCK                   mDisplayMessageSpinLock;\r
 extern EFI_CPU_INTERRUPT_HANDLER   *mExternalInterruptHandler;\r

+EXCEPTION_HANDLER_DATA      mExceptionHandlerData;\r

 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r
 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
index 40f12502668263aef1607253f7e7414b26ead323..3f9d001fd525dde640350ba7169af553631030eb 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
@@ -1,7 +1,7 @@
 /** @file\r
   CPU exception handler library implemenation for SMM modules.\r
 \r
 /** @file\r
   CPU exception handler library implemenation for SMM modules.\r
 \r

-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,6 +17,7 @@
 \r
 CONST UINTN   mDoFarReturnFlag   = 1; \r
 \r
 \r
 CONST UINTN   mDoFarReturnFlag   = 1; \r
 \r

+EXCEPTION_HANDLER_DATA      mExceptionHandlerData;\r

 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r
   \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r
   \r