Fix ECC issue

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

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 7df939d7580a1f2cedc62e62e898e1c01c5c87e8..69033598e6ba70304a3de302edb117ca7ddbdf2e 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -514,9 +514,9 @@ PeCoffLoaderRelocateImage (
   UINT16                                *RelocEnd;\r
   CHAR8                                 *Fixup;\r
   CHAR8                                 *FixupBase;\r
-  UINT16                                *F16;\r
-  UINT32                                *F32;\r
-  UINT64                                *F64;\r
+  UINT16                                *Fixup16;\r
+  UINT32                                *Fixup32;\r
+  UINT64                                *Fixup64;\r
   CHAR8                                 *FixupData;\r
   PHYSICAL_ADDRESS                      BaseAddress;\r
   UINT32                                NumberOfRvaAndSizes;\r
@@ -644,39 +644,39 @@ PeCoffLoaderRelocateImage (
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_HIGH:\r
-        F16   = (UINT16 *) Fixup;\r
-        *F16 = (UINT16) (*F16 + ((UINT16) ((UINT32) Adjust >> 16)));\r
+        Fixup16   = (UINT16 *) Fixup;\r
+        *Fixup16 = (UINT16) (*Fixup16 + ((UINT16) ((UINT32) Adjust >> 16)));\r
         if (FixupData != NULL) {\r
-          *(UINT16 *) FixupData = *F16;\r
+          *(UINT16 *) FixupData = *Fixup16;\r
           FixupData             = FixupData + sizeof (UINT16);\r
         }\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_LOW:\r
-        F16   = (UINT16 *) Fixup;\r
-        *F16  = (UINT16) (*F16 + (UINT16) Adjust);\r
+        Fixup16   = (UINT16 *) Fixup;\r
+        *Fixup16  = (UINT16) (*Fixup16 + (UINT16) Adjust);\r
         if (FixupData != NULL) {\r
-          *(UINT16 *) FixupData = *F16;\r
+          *(UINT16 *) FixupData = *Fixup16;\r
           FixupData             = FixupData + sizeof (UINT16);\r
         }\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_HIGHLOW:\r
-        F32   = (UINT32 *) Fixup;\r
-        *F32  = *F32 + (UINT32) Adjust;\r
+        Fixup32   = (UINT32 *) Fixup;\r
+        *Fixup32  = *Fixup32 + (UINT32) Adjust;\r
         if (FixupData != NULL) {\r
           FixupData             = ALIGN_POINTER (FixupData, sizeof (UINT32));\r
-          *(UINT32 *)FixupData  = *F32;\r
+          *(UINT32 *)FixupData  = *Fixup32;\r
           FixupData             = FixupData + sizeof (UINT32);\r
         }\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_DIR64:\r
-        F64 = (UINT64 *) Fixup;\r
-        *F64 = *F64 + (UINT64) Adjust;\r
+        Fixup64 = (UINT64 *) Fixup;\r
+        *Fixup64 = *Fixup64 + (UINT64) Adjust;\r
         if (FixupData != NULL) {\r
           FixupData = ALIGN_POINTER (FixupData, sizeof(UINT64));\r
-          *(UINT64 *)(FixupData) = *F64;\r
+          *(UINT64 *)(FixupData) = *Fixup64;\r
           FixupData = FixupData + sizeof(UINT64);\r
         }\r
         break;\r
@@ -1149,9 +1149,9 @@ PeCoffLoaderRelocateImageForRuntime (
   UINT16                              *RelocEnd;\r
   CHAR8                               *Fixup;\r
   CHAR8                               *FixupBase;\r
-  UINT16                              *F16;\r
-  UINT32                              *F32;\r
-  UINT64                              *F64;\r
+  UINT16                              *Fixup16;\r
+  UINT32                              *Fixup32;\r
+  UINT64                              *Fixup64;\r
   CHAR8                               *FixupData;\r
   UINTN                               Adjust;\r
   RETURN_STATUS                       Status;\r
@@ -1250,38 +1250,38 @@ PeCoffLoaderRelocateImageForRuntime (
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_HIGH:\r
-        F16 = (UINT16 *) Fixup;\r
-        if (*(UINT16 *) FixupData == *F16) {\r
-          *F16 = (UINT16) (*F16 + ((UINT16) ((UINT32) Adjust >> 16)));\r
+        Fixup16 = (UINT16 *) Fixup;\r
+        if (*(UINT16 *) FixupData == *Fixup16) {\r
+          *Fixup16 = (UINT16) (*Fixup16 + ((UINT16) ((UINT32) Adjust >> 16)));\r
         }\r
 \r
         FixupData = FixupData + sizeof (UINT16);\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_LOW:\r
-        F16 = (UINT16 *) Fixup;\r
-        if (*(UINT16 *) FixupData == *F16) {\r
-          *F16 = (UINT16) (*F16 + ((UINT16) Adjust & 0xffff));\r
+        Fixup16 = (UINT16 *) Fixup;\r
+        if (*(UINT16 *) FixupData == *Fixup16) {\r
+          *Fixup16 = (UINT16) (*Fixup16 + ((UINT16) Adjust & 0xffff));\r
         }\r
 \r
         FixupData = FixupData + sizeof (UINT16);\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_HIGHLOW:\r
-        F32       = (UINT32 *) Fixup;\r
+        Fixup32       = (UINT32 *) Fixup;\r
         FixupData = ALIGN_POINTER (FixupData, sizeof (UINT32));\r
-        if (*(UINT32 *) FixupData == *F32) {\r
-          *F32 = *F32 + (UINT32) Adjust;\r
+        if (*(UINT32 *) FixupData == *Fixup32) {\r
+          *Fixup32 = *Fixup32 + (UINT32) Adjust;\r
         }\r
 \r
         FixupData = FixupData + sizeof (UINT32);\r
         break;\r
 \r
       case EFI_IMAGE_REL_BASED_DIR64:\r
-        F64       = (UINT64 *)Fixup;\r
+        Fixup64       = (UINT64 *)Fixup;\r
         FixupData = ALIGN_POINTER (FixupData, sizeof (UINT64));\r
-        if (*(UINT64 *) FixupData == *F64) {\r
-          *F64 = *F64 + (UINT64)Adjust;\r
+        if (*(UINT64 *) FixupData == *Fixup64) {\r
+          *Fixup64 = *Fixup64 + (UINT64)Adjust;\r
         }\r
 \r
         FixupData = FixupData + sizeof (UINT64);\r

diff --git a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
index 2f0b9b850c812a083f1a9eb4277c4e19732a2c2d..9d86e58e3a7dbf60d9184d3cef3f71aadaa39e07 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
+++ b/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
@@ -43,20 +43,20 @@
 #define IMM64_IC_INST_WORD_POS_X        12\r
 #define IMM64_IC_VAL_POS_X              21\r
 \r
-#define IMM64_IMM41a_INST_WORD_X        1\r
-#define IMM64_IMM41a_SIZE_X             10\r
-#define IMM64_IMM41a_INST_WORD_POS_X    14\r
-#define IMM64_IMM41a_VAL_POS_X          22\r
+#define IMM64_IMM41A_INST_WORD_X        1\r
+#define IMM64_IMM41A_SIZE_X             10\r
+#define IMM64_IMM41A_INST_WORD_POS_X    14\r
+#define IMM64_IMM41A_VAL_POS_X          22\r
 \r
-#define IMM64_IMM41b_INST_WORD_X        1\r
-#define IMM64_IMM41b_SIZE_X             8\r
-#define IMM64_IMM41b_INST_WORD_POS_X    24\r
-#define IMM64_IMM41b_VAL_POS_X          32\r
+#define IMM64_IMM41B_INST_WORD_X        1\r
+#define IMM64_IMM41B_SIZE_X             8\r
+#define IMM64_IMM41B_INST_WORD_POS_X    24\r
+#define IMM64_IMM41B_VAL_POS_X          32\r
 \r
-#define IMM64_IMM41c_INST_WORD_X        2\r
-#define IMM64_IMM41c_SIZE_X             23\r
-#define IMM64_IMM41c_INST_WORD_POS_X    0\r
-#define IMM64_IMM41c_VAL_POS_X          40\r
+#define IMM64_IMM41C_INST_WORD_X        2\r
+#define IMM64_IMM41C_SIZE_X             23\r
+#define IMM64_IMM41C_INST_WORD_POS_X    0\r
+#define IMM64_IMM41C_VAL_POS_X          40\r
 \r
 #define IMM64_SIGN_INST_WORD_X          3\r
 #define IMM64_SIGN_SIZE_X               1\r
@@ -83,7 +83,7 @@ PeCoffLoaderRelocateImageEx (
   IN UINT64      Adjust\r
   )\r
 {\r
-  UINT64      *F64;\r
+  UINT64      *Fixup64;\r
   UINT64      FixupVal;\r
 \r
   switch ((*Reloc) >> 12) {\r
@@ -129,10 +129,10 @@ PeCoffLoaderRelocateImageEx (
                 );\r
 \r
       EXT_IMM64(FixupVal,\r
-                (UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X,\r
-                IMM64_IMM41a_SIZE_X,\r
-                IMM64_IMM41a_INST_WORD_POS_X,\r
-                IMM64_IMM41a_VAL_POS_X\r
+                (UINT32 *)Fixup + IMM64_IMM41A_INST_WORD_X,\r
+                IMM64_IMM41A_SIZE_X,\r
+                IMM64_IMM41A_INST_WORD_POS_X,\r
+                IMM64_IMM41A_VAL_POS_X\r
                 );\r
 \r
       //\r
@@ -172,24 +172,24 @@ PeCoffLoaderRelocateImageEx (
                 );\r
 \r
       INS_IMM64(FixupVal,\r
-                ((UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X),\r
-                IMM64_IMM41a_SIZE_X,\r
-                IMM64_IMM41a_INST_WORD_POS_X,\r
-                IMM64_IMM41a_VAL_POS_X\r
+                ((UINT32 *)Fixup + IMM64_IMM41A_INST_WORD_X),\r
+                IMM64_IMM41A_SIZE_X,\r
+                IMM64_IMM41A_INST_WORD_POS_X,\r
+                IMM64_IMM41A_VAL_POS_X\r
                 );\r
 \r
       INS_IMM64(FixupVal,\r
-                ((UINT32 *)Fixup + IMM64_IMM41b_INST_WORD_X),\r
-                IMM64_IMM41b_SIZE_X,\r
-                IMM64_IMM41b_INST_WORD_POS_X,\r
-                IMM64_IMM41b_VAL_POS_X\r
+                ((UINT32 *)Fixup + IMM64_IMM41B_INST_WORD_X),\r
+                IMM64_IMM41B_SIZE_X,\r
+                IMM64_IMM41B_INST_WORD_POS_X,\r
+                IMM64_IMM41B_VAL_POS_X\r
                 );\r
 \r
       INS_IMM64(FixupVal,\r
-                ((UINT32 *)Fixup + IMM64_IMM41c_INST_WORD_X),\r
-                IMM64_IMM41c_SIZE_X,\r
-                IMM64_IMM41c_INST_WORD_POS_X,\r
-                IMM64_IMM41c_VAL_POS_X\r
+                ((UINT32 *)Fixup + IMM64_IMM41C_INST_WORD_X),\r
+                IMM64_IMM41C_SIZE_X,\r
+                IMM64_IMM41C_INST_WORD_POS_X,\r
+                IMM64_IMM41C_VAL_POS_X\r
                 );\r
 \r
       INS_IMM64(FixupVal,\r
@@ -199,10 +199,10 @@ PeCoffLoaderRelocateImageEx (
                 IMM64_SIGN_VAL_POS_X\r
                 );\r
 \r
-      F64 = (UINT64 *) Fixup;\r
+      Fixup64 = (UINT64 *) Fixup;\r
       if (*FixupData != NULL) {\r
         *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));\r
-        *(UINT64 *)(*FixupData) = *F64;\r
+        *(UINT64 *)(*FixupData) = *Fixup64;\r
         *FixupData = *FixupData + sizeof(UINT64);\r
       }\r
       break;\r
@@ -267,24 +267,24 @@ PeHotRelocateImageEx (
   IN UINT64      Adjust\r
   )\r
 {\r
-  UINT64  *F64;\r
+  UINT64  *Fixup64;\r
   UINT64  FixupVal;\r
 \r
   switch ((*Reloc) >> 12) {\r
   case EFI_IMAGE_REL_BASED_DIR64:\r
-    F64         = (UINT64 *) Fixup;\r
+    Fixup64     = (UINT64 *) Fixup;\r
     *FixupData  = ALIGN_POINTER (*FixupData, sizeof (UINT64));\r
-    if (*(UINT64 *) (*FixupData) == *F64) {\r
-      *F64 = *F64 + (UINT64) Adjust;\r
+    if (*(UINT64 *) (*FixupData) == *Fixup64) {\r
+      *Fixup64 = *Fixup64 + (UINT64) Adjust;\r
     }\r
 \r
     *FixupData = *FixupData + sizeof (UINT64);\r
     break;\r
 \r
   case EFI_IMAGE_REL_BASED_IA64_IMM64:\r
-    F64         = (UINT64 *) Fixup;\r
+    Fixup64     = (UINT64 *) Fixup;\r
     *FixupData  = ALIGN_POINTER (*FixupData, sizeof (UINT64));\r
-    if (*(UINT64 *) (*FixupData) == *F64) {\r
+    if (*(UINT64 *) (*FixupData) == *Fixup64) {\r
       //\r
       // Align it to bundle address before fixing up the\r
       // 64-bit immediate value of the movl instruction.\r
@@ -330,10 +330,10 @@ PeHotRelocateImageEx (
 \r
       EXT_IMM64 (\r
         FixupVal,\r
-        (UINT32 *) Fixup + IMM64_IMM41a_INST_WORD_X,\r
-        IMM64_IMM41a_SIZE_X,\r
-        IMM64_IMM41a_INST_WORD_POS_X,\r
-        IMM64_IMM41a_VAL_POS_X\r
+        (UINT32 *) Fixup + IMM64_IMM41A_INST_WORD_X,\r
+        IMM64_IMM41A_SIZE_X,\r
+        IMM64_IMM41A_INST_WORD_POS_X,\r
+        IMM64_IMM41A_VAL_POS_X\r
         );\r
 \r
       //\r
@@ -378,26 +378,26 @@ PeHotRelocateImageEx (
 \r
       INS_IMM64 (\r
         FixupVal,\r
-        ((UINT32 *) Fixup + IMM64_IMM41a_INST_WORD_X),\r
-        IMM64_IMM41a_SIZE_X,\r
-        IMM64_IMM41a_INST_WORD_POS_X,\r
-        IMM64_IMM41a_VAL_POS_X\r
+        ((UINT32 *) Fixup + IMM64_IMM41A_INST_WORD_X),\r
+        IMM64_IMM41A_SIZE_X,\r
+        IMM64_IMM41A_INST_WORD_POS_X,\r
+        IMM64_IMM41A_VAL_POS_X\r
         );\r
 \r
       INS_IMM64 (\r
         FixupVal,\r
-        ((UINT32 *) Fixup + IMM64_IMM41b_INST_WORD_X),\r
-        IMM64_IMM41b_SIZE_X,\r
-        IMM64_IMM41b_INST_WORD_POS_X,\r
-        IMM64_IMM41b_VAL_POS_X\r
+        ((UINT32 *) Fixup + IMM64_IMM41B_INST_WORD_X),\r
+        IMM64_IMM41B_SIZE_X,\r
+        IMM64_IMM41B_INST_WORD_POS_X,\r
+        IMM64_IMM41B_VAL_POS_X\r
         );\r
 \r
       INS_IMM64 (\r
         FixupVal,\r
-        ((UINT32 *) Fixup + IMM64_IMM41c_INST_WORD_X),\r
-        IMM64_IMM41c_SIZE_X,\r
-        IMM64_IMM41c_INST_WORD_POS_X,\r
-        IMM64_IMM41c_VAL_POS_X\r
+        ((UINT32 *) Fixup + IMM64_IMM41C_INST_WORD_X),\r
+        IMM64_IMM41C_SIZE_X,\r
+        IMM64_IMM41C_INST_WORD_POS_X,\r
+        IMM64_IMM41C_VAL_POS_X\r
         );\r
 \r
       INS_IMM64 (\r
@@ -408,7 +408,7 @@ PeHotRelocateImageEx (
         IMM64_SIGN_VAL_POS_X\r
         );\r
 \r
-      *(UINT64 *) (*FixupData) = *F64;\r
+      *(UINT64 *) (*FixupData) = *Fixup64;\r
     }\r
 \r
     *FixupData = *FixupData + sizeof (UINT64);\r