UefiCpuPkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / UefiCpuPkg / Library / CpuExceptionHandlerLib / CpuExceptionCommon.c

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
index 05372083b36db4990963aab2e6bb62705761c08c..8adbd43fefb42581846156084a5c569a353bbbc6 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
@@ -1,14 +1,8 @@
 /** @file\r
   CPU Exception Handler Library common functions.\r
 \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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -20,7 +14,7 @@
 //\r
 // 1 means an error code will be pushed, otherwise 0\r
 //\r
-CONST UINT32 mErrorCodeFlag = 0x00027d00;\r
+CONST UINT32 mErrorCodeFlag = 0x00227d00;\r
 \r
 //\r
 // Define the maximum message length\r
@@ -49,7 +43,8 @@ CONST CHAR8 *mExceptionNameStr[] = {
   "#AC - Alignment Check",\r
   "#MC - Machine-Check",\r
   "#XM - SIMD floating-point",\r
-  "#VE - Virtualization"\r
+  "#VE - Virtualization",\r
+  "#CP - Control Protection"\r
 };\r
 \r
 #define EXCEPTION_KNOWN_NAME_NUM  (sizeof (mExceptionNameStr) / sizeof (CHAR8 *))\r
@@ -106,11 +101,11 @@ InternalPrintMessage (
 \r
 /**\r
   Find and display image base address and return image base and its entry point.\r
-  \r
+\r
   @param CurrentEip      Current instruction pointer.\r
-  \r
+\r
 **/\r
-VOID \r
+VOID\r
 DumpModuleImageInfo (\r
   IN  UINTN              CurrentEip\r
   )\r
@@ -120,7 +115,7 @@ DumpModuleImageInfo (
   VOID                                 *PdbPointer;\r
   VOID                                 *EntryPoint;\r
 \r
-  Pe32Data = PeCoffSerachImageBase (CurrentEip);\r
+  Pe32Data = PeCoffSearchImageBase (CurrentEip);\r
   if (Pe32Data == 0) {\r
     InternalPrintMessage ("!!!! Can't find image information. !!!!\n");\r
   } else {\r
@@ -131,7 +126,7 @@ DumpModuleImageInfo (
     if (EFI_ERROR (Status)) {\r
       EntryPoint = NULL;\r
     }\r
-    InternalPrintMessage ("!!!! Find image ");\r
+    InternalPrintMessage ("!!!! Find image based on IP(0x%x) ", CurrentEip);\r
     PdbPointer = PeCoffLoaderGetPdbPointer ((VOID *) Pe32Data);\r
     if (PdbPointer != NULL) {\r
       InternalPrintMessage ("%a", PdbPointer);\r
@@ -177,4 +172,4 @@ ReadAndVerifyVectorInfo (
     VectorInfo ++;\r
   }\r
   return EFI_SUCCESS;\r
-}
\ No newline at end of file
+}\r