From 16e864a270e895dc12b1f64d8d61733170b61de8 Mon Sep 17 00:00:00 2001 From: gikidy Date: Mon, 17 Aug 2009 06:16:40 +0000 Subject: [PATCH] Remove ".intel_syntax", convert MASM to GAS. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9080 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/Sec/Ia32/SecEntry.S | 13 ++++++------- OvmfPkg/Sec/X64/SecEntry.S | 11 +++++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/Sec/Ia32/SecEntry.S b/OvmfPkg/Sec/Ia32/SecEntry.S index 9fefebca5f..50ba5aa99e 100644 --- a/OvmfPkg/Sec/Ia32/SecEntry.S +++ b/OvmfPkg/Sec/Ia32/SecEntry.S @@ -37,7 +37,6 @@ # @return None # # -.intel_syntax ASM_GLOBAL ASM_PFX(_ModuleEntryPoint) ASM_PFX(_ModuleEntryPoint): @@ -45,17 +44,17 @@ ASM_PFX(_ModuleEntryPoint): # Load temporary stack top at very low memory. The C code # can reload to a better address. # - mov eax, INITIAL_TOP_OF_STACK - mov esp, eax + movl $INITIAL_TOP_OF_STACK, %eax + movl %eax, %esp nop # # Call into C code # - push eax - push edi - push esi - push ebp + pushl %eax + pushl %edi + pushl %esi + pushl %ebp call ASM_PFX(SecCoreStartupWithStack) diff --git a/OvmfPkg/Sec/X64/SecEntry.S b/OvmfPkg/Sec/X64/SecEntry.S index 42b3022170..9855ea9d81 100644 --- a/OvmfPkg/Sec/X64/SecEntry.S +++ b/OvmfPkg/Sec/X64/SecEntry.S @@ -34,7 +34,6 @@ # @return None # # -.intel_syntax ASM_GLOBAL ASM_PFX(_ModuleEntryPoint) ASM_PFX(_ModuleEntryPoint): @@ -42,7 +41,7 @@ ASM_PFX(_ModuleEntryPoint): # Load temporary stack top at very low memory. The C code # can reload to a better address. # - mov %rsp, INITIAL_TOP_OF_STACK + movq $INITIAL_TOP_OF_STACK, %rsp nop # @@ -52,9 +51,9 @@ ASM_PFX(_ModuleEntryPoint): # r8: PeiCoreEntryPoint # r9: TopOfCurrentStack # - mov %rcx, %rbp - mov %rdx, %rsi - mov %r8, %rdi - mov %r9, %rsp + movq %rbp, %rcx + movq %rsi, %rdx + movq %rdi, %r8 + movq %rsp, %r9 call ASM_PFX(SecCoreStartupWithStack) -- 2.39.2