diff options
author | Liming Gao <liming.gao@intel.com> | 2018-06-04 13:35:58 +0800 |
---|---|---|
committer | Liming Gao <liming.gao@intel.com> | 2018-06-07 15:26:27 +0800 |
commit | 6d614649abfb4fc80d303467bc1a30851e191fdd (patch) | |
tree | 593f2ff08a633ce6c6208f82a307c01e08026884 /MdeModulePkg/Core/DxeIplPeim | |
parent | 13688930ae9ad5101f10d28f650382058e449616 (diff) | |
download | edk2-6d614649abfb4fc80d303467bc1a30851e191fdd.tar.gz edk2-6d614649abfb4fc80d303467bc1a30851e191fdd.tar.bz2 edk2-6d614649abfb4fc80d303467bc1a30851e191fdd.zip |
MdeModulePkg: Remove X86 ASM and S files
NASM has replaced ASM and S files.
1. Remove ASM from all modules.
2. Remove S files from the drivers only.
3. https://bugzilla.tianocore.org/show_bug.cgi?id=881
After NASM is updated, S files can be removed from Library.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Diffstat (limited to 'MdeModulePkg/Core/DxeIplPeim')
-rw-r--r-- | MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 4 | ||||
-rw-r--r-- | MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S | 80 | ||||
-rw-r--r-- | MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm | 88 |
3 files changed, 1 insertions, 171 deletions
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf index ba1d9c6b05..7deeb8f270 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -5,7 +5,7 @@ # PPI to discover and dispatch the DXE Foundation and components that are
# needed to run the DXE Foundation.
#
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
#
# This program and the accompanying materials
@@ -43,8 +43,6 @@ X64/VirtualMemory.c
Ia32/DxeLoadFunc.c
Ia32/IdtVectorAsm.nasm
- Ia32/IdtVectorAsm.asm
- Ia32/IdtVectorAsm.S
[Sources.X64]
X64/VirtualMemory.h
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S b/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S deleted file mode 100644 index 96a3acbac1..0000000000 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S +++ /dev/null @@ -1,80 +0,0 @@ -#/** @file
-#
-# IDT vector entry.
-#
-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
-# 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.
-#
-#**/
-
- .text
- .code32
-
-
- .p2align 3
- ASM_GLOBAL ASM_PFX(AsmGetVectorTemplatInfo)
- ASM_GLOBAL ASM_PFX(AsmVectorFixup)
-/*
-;
-;-----------------------------------------------------------------------
-; Template of IDT Vector Handlers.
-;
-;-----------------------------------------------------------------------
-*/
-VectorTemplateBase:
- pushl %eax
- .byte 0x6a # push #VectorNum
-VectorNum:
- .byte 0
- movl CommonInterruptEntry, %eax
- jmp *%eax
-VectorTemplateEnd:
-
-
-ASM_PFX(AsmGetVectorTemplatInfo):
- movl 4(%esp), %ecx
- movl $VectorTemplateBase, (%ecx)
- movl $(VectorTemplateEnd - VectorTemplateBase), %eax
- ret
-
-ASM_PFX(AsmVectorFixup):
- movl 8(%esp), %eax
- movl 4(%esp), %ecx
- movb %al, (VectorNum - VectorTemplateBase)(%ecx)
- ret
-
-/*
-; The follow algorithm is used for the common interrupt routine.
-
-;
-; +---------------------+ <-- 16-byte aligned ensured by processor
-; + Old SS +
-; +---------------------+
-; + Old RSP +
-; +---------------------+
-; + RFlags +
-; +---------------------+
-; + CS +
-; +---------------------+
-; + RIP +
-; +---------------------+
-; + Error Code +
-; +---------------------+
-; + Vector Number +
-; +---------------------+
-*/
-
-CommonInterruptEntry:
- cli
-1:
- jmp 1b
-
-
-
-
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm b/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm deleted file mode 100644 index 69fb9a15e7..0000000000 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm +++ /dev/null @@ -1,88 +0,0 @@ -;/** @file
-;
-; IDT vector entry.
-;
-; Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
-; 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.
-;
-;**/
-
- .686p
- .model flat,C
- .code
-
-;
-;------------------------------------------------------------------------------
-; Generic IDT Vector Handlers for the Host.
-;
-;------------------------------------------------------------------------------
-
-ALIGN 8
-PUBLIC AsmGetVectorTemplatInfo
-PUBLIC AsmVectorFixup
-
-PUBLIC AsmVectorFixup
-
-@VectorTemplateBase:
- push eax
- db 6ah ; push #VectorNumber
-@VectorNum:
- db 0
- mov eax, CommonInterruptEntry
- jmp eax
-@VectorTemplateEnd:
-
-
-AsmGetVectorTemplatInfo PROC
- mov ecx, [esp + 4]
- mov [ecx], @VectorTemplateBase
- mov eax, (@VectorTemplateEnd - @VectorTemplateBase)
- ret
-AsmGetVectorTemplatInfo ENDP
-
-
-AsmVectorFixup PROC
- mov eax, dword ptr [esp + 8]
- mov ecx, [esp + 4]
- mov [ecx + (@VectorNum - @VectorTemplateBase)], al
- ret
-AsmVectorFixup ENDP
-
-
-;---------------------------------------;
-; CommonInterruptEntry ;
-;---------------------------------------;
-; The follow algorithm is used for the common interrupt routine.
-
-;
-; +---------------------+ <-- 16-byte aligned ensured by processor
-; + Old SS +
-; +---------------------+
-; + Old RSP +
-; +---------------------+
-; + RFlags +
-; +---------------------+
-; + CS +
-; +---------------------+
-; + RIP +
-; +---------------------+
-; + Error Code +
-; +---------------------+
-; + Vector Number +
-; +---------------------+
-
-CommonInterruptEntry PROC
- cli
-
- jmp $
-CommonInterruptEntry ENDP
-
-END
-
-
|