Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / Ebc / Dxe / Ipf / EbcSupport.c

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
index eceb59185bd9b9aaad522e58b6d75c2a04bb4091..283cdaa038540dab4320a0469755b4ea243bcdfb 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
@@ -76,6 +76,7 @@ PushU64 (
   *(UINT64 *) VmPtr->R[0] = Arg;\r
 }\r
 \r
+STATIC\r
 UINT64\r
 EbcInterpret (\r
   UINT64      Arg1,\r
@@ -468,14 +469,14 @@ Returns:
   //\r
   // Next is jumbled data, including opcode and rest of address\r
   //\r
-  Code[2] = LShiftU64 (Imm7b, 13)\r
-          | LShiftU64 (0x00, 20)   // vc\r
-          | LShiftU64 (Ic, 21)\r
-          | LShiftU64 (Imm5c, 22)\r
-          | LShiftU64 (Imm9d, 27)\r
-          | LShiftU64 (I, 36)\r
-          | LShiftU64 ((UINT64)MOVL_OPCODE, 37)\r
-          | LShiftU64 ((RegNum & 0x7F), 6);\r
+  Code[2] = LShiftU64 (Imm7b, 13);\r
+  Code[2] = Code[2] | LShiftU64 (0x00, 20);   // vc\r
+  Code[2] = Code[2] | LShiftU64 (Ic, 21);\r
+  Code[2] = Code[2] | LShiftU64 (Imm5c, 22);\r
+  Code[2] = Code[2] | LShiftU64 (Imm9d, 27);\r
+  Code[2] = Code[2] | LShiftU64 (I, 36);\r
+  Code[2] = Code[2] | LShiftU64 ((UINT64)MOVL_OPCODE, 37);\r
+  Code[2] = Code[2] | LShiftU64 ((RegNum & 0x7F), 6);\r
 \r
   WriteBundle ((VOID *) Ptr, 0x05, Code[0], Code[1], Code[2]);\r
 \r
@@ -533,14 +534,14 @@ Returns:
   //\r
   // Next is jumbled data, including opcode and rest of address\r
   //\r
-  Code[2] = LShiftU64 (Imm7b, 13)\r
-          | LShiftU64 (0x00, 20)   // vc\r
-          | LShiftU64 (Ic, 21)\r
-          | LShiftU64 (Imm5c, 22)\r
-          | LShiftU64 (Imm9d, 27)\r
-          | LShiftU64 (I, 36)\r
-          | LShiftU64 ((UINT64)MOVL_OPCODE, 37)\r
-          | LShiftU64 ((RegNum & 0x7F), 6);\r
+  Code[2] = LShiftU64 (Imm7b, 13);\r
+  Code[2] = Code[2] | LShiftU64 (0x00, 20);   // vc\r
+  Code[2] = Code[2] | LShiftU64 (Ic, 21);\r
+  Code[2] = Code[2] | LShiftU64 (Imm5c, 22);\r
+  Code[2] = Code[2] | LShiftU64 (Imm9d, 27);\r
+  Code[2] = Code[2] | LShiftU64 (I, 36);\r
+  Code[2] = Code[2] | LShiftU64 ((UINT64)MOVL_OPCODE, 37);\r
+  Code[2] = Code[2] | LShiftU64 ((RegNum & 0x7F), 6);\r
 \r
   WriteBundle ((VOID *) Ptr, 0x05, Code[0], Code[1], Code[2]);\r
 \r
@@ -604,14 +605,14 @@ Returns:
   //\r
   // Next is jumbled data, including opcode and rest of address\r
   //\r
-  Code[2] =   LShiftU64(Imm7b, 13)\r
-          | LShiftU64 (0x00, 20)   // vc\r
-          | LShiftU64 (Ic, 21)\r
-          | LShiftU64 (Imm5c, 22)\r
-          | LShiftU64 (Imm9d, 27)\r
-          | LShiftU64 (I, 36)\r
-          | LShiftU64 ((UINT64)MOVL_OPCODE, 37)\r
-          | LShiftU64 ((RegNum & 0x7F), 6);\r
+  Code[2] =   LShiftU64(Imm7b, 13);\r
+  Code[2] = Code[2] | LShiftU64 (0x00, 20);   // vc\r
+  Code[2] = Code[2] | LShiftU64 (Ic, 21);\r
+  Code[2] = Code[2] | LShiftU64 (Imm5c, 22);\r
+  Code[2] = Code[2] | LShiftU64 (Imm9d, 27);\r
+  Code[2] = Code[2] | LShiftU64 (I, 36);\r
+  Code[2] = Code[2] | LShiftU64 ((UINT64)MOVL_OPCODE, 37);\r
+  Code[2] = Code[2] | LShiftU64 ((RegNum & 0x7F), 6);\r
 \r
   WriteBundle ((VOID *) Ptr, 0x05, Code[0], Code[1], Code[2]);\r
 \r
@@ -722,8 +723,11 @@ Returns:
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Low64   = LShiftU64 (Slot1, 46) | LShiftU64 (Slot0, 5) | Template;\r
-  High64  = RShiftU64 (Slot1, 18) | LShiftU64 (Slot2, 23);\r
+  Low64   = LShiftU64 (Slot1, 46);\r
+  Low64   = Low64 | LShiftU64 (Slot0, 5) | Template;\r
+\r
+  High64  = RShiftU64 (Slot1, 18);\r
+  High64  = High64 | LShiftU64 (Slot2, 23);\r
 \r
   //\r
   // Now write it all out\r
@@ -816,14 +820,13 @@ Returns:
   CodeTwo5c = RShiftU64 (*((UINT64 *)CalleeAddr + 3), 45) & 0x1F;\r
   CodeTwo9d = RShiftU64 (*((UINT64 *)CalleeAddr + 3), 50) & 0x1FF;\r
 \r
-  TargetEbcAddr = CodeTwo7b\r
-                  | LShiftU64 (CodeTwo9d, 7)\r
-                  | LShiftU64 (CodeTwo5c, 16)\r
-                  | LShiftU64 (CodeTwoIc, 21)\r
-                  | LShiftU64 (CodeOne18, 22)\r
-                  | LShiftU64 (CodeOne23, 40)\r
-                  | LShiftU64 (CodeTwoI, 63)\r
-                  ;\r
+  TargetEbcAddr = CodeTwo7b;\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeTwo9d, 7);\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeTwo5c, 16);\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeTwoIc, 21);\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeOne18, 22);\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeOne23, 40);\r
+  TargetEbcAddr = TargetEbcAddr | LShiftU64 (CodeTwoI, 63);\r
 \r
 Action:\r
   if (IsThunk == 1){\r