Perfect the msa of the following modules, DiskIo, Partition, English and Ebc.

[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..d60ab09d8a0630ec2abcec56a277999716f13c4c 100644 (file)
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
@@ -22,34 +22,7 @@ Abstract:
 \r
 #include "EbcInt.h"\r
 #include "EbcExecute.h"\r
-\r
-#define VM_STACK_SIZE   (1024 * 32)\r
-\r
-#define EBC_THUNK_SIZE  128\r
-\r
-//\r
-// For code execution, thunks must be aligned on 16-byte boundary\r
-//\r
-#define EBC_THUNK_ALIGNMENT 16\r
-\r
-//\r
-// Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing\r
-// bits) to insert a jump to the interpreter.\r
-//\r
-#define OPCODE_NOP              (UINT64) 0x00008000000\r
-#define OPCODE_BR_COND_SPTK_FEW (UINT64) 0x00100000000\r
-#define OPCODE_MOV_BX_RX        (UINT64) 0x00E00100000\r
-\r
-//\r
-// Opcode for MOVL instruction\r
-//\r
-#define MOVL_OPCODE 0x06\r
-\r
-VOID\r
-EbcAsmLLCALLEX (\r
-  IN UINTN    CallAddr,\r
-  IN UINTN    EbcSp\r
-  );\r
+#include "EbcSupport.h"\r
 \r
 STATIC\r
 EFI_STATUS\r
@@ -76,6 +49,7 @@ PushU64 (
   *(UINT64 *) VmPtr->R[0] = Arg;\r
 }\r
 \r
+STATIC\r
 UINT64\r
 EbcInterpret (\r
   UINT64      Arg1,\r
@@ -188,6 +162,7 @@ EbcInterpret (
   return (UINT64) VmContext.R[7];\r
 }\r
 \r
+STATIC\r
 UINT64\r
 ExecuteEbcImageEntryPoint (\r
   IN EFI_HANDLE           ImageHandle,\r
@@ -344,7 +319,6 @@ Returns:
   UINT64      *Data64Ptr;\r
   UINT32      ThunkSize;\r
   UINT32      Size;\r
-  EFI_STATUS  Status;\r
 \r
   //\r
   // Check alignment of pointer to EBC code, which must always be aligned\r
@@ -360,12 +334,9 @@ Returns:
   //\r
   Size      = EBC_THUNK_SIZE + EBC_THUNK_ALIGNMENT - 1;\r
   ThunkSize = Size;\r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  Size,\r
-                  (VOID *) &Ptr\r
-                  );\r
-  if (Status != EFI_SUCCESS) {\r
+  Ptr = AllocatePool (Size);\r
+\r
+  if (Ptr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
@@ -468,14 +439,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 +504,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 +575,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 +693,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 +790,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
@@ -895,6 +868,6 @@ Returns:
   Source      = (VOID *) EbcSp;\r
   Destination = (VOID *) ((UINT8 *) EbcSp - FrameSize - CPU_STACK_ALIGNMENT);\r
   Destination = (VOID *) ((UINTN) ((UINTN) Destination + CPU_STACK_ALIGNMENT - 1) &~((UINTN) CPU_STACK_ALIGNMENT - 1));\r
-  gBS->CopyMem (Destination, Source, FrameSize);\r
+  CopyMem (Destination, Source, FrameSize);\r
   EbcAsmLLCALLEX ((UINTN) CallAddr, (UINTN) Destination);\r
 }\r