From 4fc416a69b8996f427f5ef2c562b6a19e92afff8 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 30 May 2016 18:51:58 -0700 Subject: [PATCH] MdePkg BaseLib: Convert Ia32/EnablePaging32.asm to NASM The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert Ia32/EnablePaging32.asm to Ia32/EnablePaging32.nasm Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen --- MdePkg/Library/BaseLib/BaseLib.inf | 2 + .../Library/BaseLib/Ia32/EnablePaging32.nasm | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 MdePkg/Library/BaseLib/Ia32/EnablePaging32.nasm diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf index 52e82bd74d..5f8cd45d4f 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -315,6 +315,7 @@ Ia32/FxSave.asm | INTEL Ia32/FlushCacheLine.nasm| INTEL Ia32/FlushCacheLine.asm | INTEL + Ia32/EnablePaging32.nasm| INTEL Ia32/EnablePaging32.asm | INTEL Ia32/EnableInterrupts.asm | INTEL Ia32/EnableDisableInterrupts.asm | INTEL @@ -345,6 +346,7 @@ Ia32/EnablePaging64.nasm| GCC Ia32/EnablePaging64.S | GCC Ia32/DisablePaging32.S | GCC + Ia32/EnablePaging32.nasm| GCC Ia32/EnablePaging32.S | GCC Ia32/Mwait.nasm| GCC Ia32/Mwait.S | GCC diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.nasm b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.nasm new file mode 100644 index 0000000000..0855f8dcbe --- /dev/null +++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.nasm @@ -0,0 +1,54 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; This program and the accompanying materials +; are licensed and made available under the terms and conditions of the BSD License +; which accompanies this distribution. The full text of the license may be found at +; http://opensource.org/licenses/bsd-license.php. +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; +; Module Name: +; +; EnablePaging32.Asm +; +; Abstract: +; +; AsmEnablePaging32 function +; +; Notes: +; +;------------------------------------------------------------------------------ + + SECTION .text + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; InternalX86EnablePaging32 ( +; IN SWITCH_STACK_ENTRY_POINT EntryPoint, +; IN VOID *Context1, OPTIONAL +; IN VOID *Context2, OPTIONAL +; IN VOID *NewStack +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(InternalX86EnablePaging32) +ASM_PFX(InternalX86EnablePaging32): + mov ebx, [esp + 4] + mov ecx, [esp + 8] + mov edx, [esp + 12] + pushfd + pop edi ; save flags in edi + cli + mov eax, cr0 + bts eax, 31 + mov esp, [esp + 16] + mov cr0, eax + push edi + popfd ; restore flags + push edx + push ecx + call ebx + jmp $ +