Added a 64-bit version of EnablePaging64() on X64. AsmEnablePaging64() is the transit...

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

diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index 3f0224ba3b5be258c9c3ad5d12e2b7a2cfde1cc3..403c6e3b8c4bf8512ed183c3eb2228b259f5c6b0 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -378,6 +378,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename SupArchList="X64">X64/ReadPmc.asm</Filename>\r
     <Filename SupArchList="X64">X64/Monitor.asm</Filename>\r
     <Filename SupArchList="X64">X64/Mwait.asm</Filename>\r
+    <Filename SupArchList="X64">X64/EnablePaging64.asm</Filename>\r
     <Filename SupArchList="X64">X64/DisablePaging64.asm</Filename>\r
     <Filename SupArchList="X64">X64/Wbinvd.asm</Filename>\r
     <Filename SupArchList="X64">X64/Invd.asm</Filename>\r

diff --git a/MdePkg/Library/BaseLib/X64/EnablePaging64.asm b/MdePkg/Library/BaseLib/X64/EnablePaging64.asm
new file mode 100644 (file)
index 0000000..0d64c55
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/EnablePaging64.asm
@@ -0,0 +1,61 @@
+;------------------------------------------------------------------------------\r
+;\r
+; Copyright (c) 2006, Intel Corporation\r
+; All rights reserved. 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
+;\r
+; Module Name:\r
+;\r
+;   EnablePaging64.Asm\r
+;\r
+; Abstract:\r
+;\r
+;   AsmEnablePaging64 function\r
+;\r
+; Notes:\r
+;\r
+;------------------------------------------------------------------------------\r
+\r
+    .code\r
+\r
+;------------------------------------------------------------------------------\r
+; VOID\r
+; EFIAPI\r
+; InternalX86EnablePaging64 (\r
+;   IN      UINT16                    Cs,\r
+;   IN      UINT64                    EntryPoint,\r
+;   IN      UINT64                    Context1,  OPTIONAL\r
+;   IN      UINT64                    Context2,  OPTIONAL\r
+;   IN      UINT64                    NewStack\r
+;   );\r
+;------------------------------------------------------------------------------\r
+InternalX86EnablePaging64 PROC\r
+    cli\r
+    mov     dword ptr [rsp], @F         ; offset for far retf, seg is the 1st arg\r
+    mov     rax, cr4                    ; mov eax, cr4\r
+    or      al, (1 SHL 5)\r
+    mov     cr4, rax                    ; enable PAE\r
+    mov     ecx, 0c0000080h\r
+    rdmsr\r
+    or      ah, 1                       ; set LME\r
+    wrmsr\r
+    mov     rax, cr0                    ; mov eax, cr0\r
+    bts     eax, 31\r
+    mov     cr0, rax                    ; enable paging\r
+    retf\r
+@@:                                     ; long mode starts here\r
+    mov     rbx, [esp]\r
+    mov     rcx, [esp + 8]\r
+    mov     rdx, [esp + 10h]\r
+    mov     rsp, [esp + 18h]\r
+    add     rsp, -20h\r
+    call    rbx\r
+    jmp     $                           ; halt processor if EntryPoint() returned\r
+InternalX86EnablePaging64 ENDP\r
+\r
+    END\r

diff --git a/MdePkg/Library/BaseLib/X64/Non-existing.c b/MdePkg/Library/BaseLib/X64/Non-existing.c
index a1c4677dad0d0977d9e97e90e75733e83bd8b1fe..4f0c9323801b68c2da7883394634878de0db6452 100644 (file)
--- a/MdePkg/Library/BaseLib/X64/Non-existing.c
+++ b/MdePkg/Library/BaseLib/X64/Non-existing.c
@@ -108,46 +108,3 @@ InternalX86DisablePaging32 (
   //\r
   ASSERT (FALSE);\r
 }\r
-\r
-/**\r
-  Enables the 64-bit paging mode on the CPU.\r
-\r
-  Enables the 64-bit paging mode on the CPU. CR0, CR3, CR4, and the page tables\r
-  must be properly initialized prior to calling this service. This function\r
-  assumes the current execution mode is 32-bit protected mode with flat\r
-  descriptors. This function is only available on IA-32. After the 64-bit\r
-  paging mode is enabled, control is transferred to the function specified by\r
-  EntryPoint using the new stack specified by NewStack and passing in the\r
-  parameters specified by Context1 and Context2. Context1 and Context2 are\r
-  optional and may be 0. The function EntryPoint must never return.\r
-\r
-  @param  Cs          The 16-bit selector to load in the CS before EntryPoint\r
-                      is called. The descriptor in the GDT that this selector\r
-                      references must be setup for long mode.\r
-  @param  EntryPoint  The 64-bit virtual address of the function to call with\r
-                      the new stack after paging is enabled.\r
-  @param  Context1    The 64-bit virtual address of the context to pass into\r
-                      the EntryPoint function as the first parameter after\r
-                      paging is enabled.\r
-  @param  Context2    The 64-bit virtual address of the context to pass into\r
-                      the EntryPoint function as the second parameter after\r
-                      paging is enabled.\r
-  @param  NewStack    The 64-bit virtual address of the new stack to use for\r
-                      the EntryPoint function after paging is enabled.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-InternalX86EnablePaging64 (\r
-  IN      UINT16                    Cs,\r
-  IN      UINT64                    EntryPoint,\r
-  IN      UINT64                    Context1,  OPTIONAL\r
-  IN      UINT64                    Context2,  OPTIONAL\r
-  IN      UINT64                    NewStack\r
-  )\r
-{\r
-  //\r
-  // This function cannot work on X64 platform\r
-  //\r
-  ASSERT (FALSE);\r
-}\r