diff options
| author | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-20 10:22:09 +0000 |
|---|---|---|
| committer | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-20 10:22:09 +0000 |
| commit | 132f41f0a92082775d931067089a63ca50367225 (patch) | |
| tree | e6905780bf1ed9ea99b37a3e3e4868fae2c7a64b /MdePkg/Library/BaseLib/X64 | |
| parent | b20d41df13fc3f25678c34c0eb6902e2faebb032 (diff) | |
| download | edk2-platforms-132f41f0a92082775d931067089a63ca50367225.tar.xz | |
Replace .globl with ASM_GLOBAL
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8346 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BaseLib/X64')
| -rw-r--r-- | MdePkg/Library/BaseLib/X64/DisableCache.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/X64/EnableCache.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/X64/Thunk16.S | 32 |
3 files changed, 18 insertions, 18 deletions
diff --git a/MdePkg/Library/BaseLib/X64/DisableCache.S b/MdePkg/Library/BaseLib/X64/DisableCache.S index 678290888e..44705f3bc6 100644 --- a/MdePkg/Library/BaseLib/X64/DisableCache.S +++ b/MdePkg/Library/BaseLib/X64/DisableCache.S @@ -29,7 +29,7 @@ # VOID
# );
#------------------------------------------------------------------------------
-.globl ASM_PFX(AsmDisableCache)
+ASM_GLOBAL ASM_PFX(AsmDisableCache)
ASM_PFX(AsmDisableCache):
movq %cr0, %rax
btsq $30, %rax
diff --git a/MdePkg/Library/BaseLib/X64/EnableCache.S b/MdePkg/Library/BaseLib/X64/EnableCache.S index 5c28b43857..42cd9eb24c 100644 --- a/MdePkg/Library/BaseLib/X64/EnableCache.S +++ b/MdePkg/Library/BaseLib/X64/EnableCache.S @@ -29,7 +29,7 @@ # VOID
# );
#------------------------------------------------------------------------------
-.globl ASM_PFX(AsmEnableCache)
+ASM_GLOBAL ASM_PFX(AsmEnableCache)
ASM_PFX(AsmEnableCache):
wbinvd
movq %cr0, %rax
diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.S b/MdePkg/Library/BaseLib/X64/Thunk16.S index f9770b258c..a1af5128f2 100644 --- a/MdePkg/Library/BaseLib/X64/Thunk16.S +++ b/MdePkg/Library/BaseLib/X64/Thunk16.S @@ -21,13 +21,13 @@ #include <Library/BaseLib.h>
-.globl ASM_PFX(m16Start)
-.globl ASM_PFX(m16Size)
-.globl ASM_PFX(mThunk16Attr)
-.globl ASM_PFX(m16Gdt)
-.globl ASM_PFX(m16GdtrBase)
-.globl ASM_PFX(mTransition)
-.globl ASM_PFX(InternalAsmThunk16)
+ASM_GLOBAL ASM_PFX(m16Start)
+ASM_GLOBAL ASM_PFX(m16Size)
+ASM_GLOBAL ASM_PFX(mThunk16Attr)
+ASM_GLOBAL ASM_PFX(m16Gdt)
+ASM_GLOBAL ASM_PFX(m16GdtrBase)
+ASM_GLOBAL ASM_PFX(mTransition)
+ASM_GLOBAL ASM_PFX(InternalAsmThunk16)
# define the structure of IA32_REGS
.equ _EDI, 0 #size 4
@@ -66,7 +66,7 @@ SavedGdt: .space 10 # _BackFromUserCode() takes control in real mode after 'retf' has been executed
# by user code. It will be shadowed to somewhere in memory below 1MB.
#------------------------------------------------------------------------------
-.globl ASM_PFX(BackFromUserCode)
+ASM_GLOBAL ASM_PFX(BackFromUserCode)
ASM_PFX(BackFromUserCode):
#
# The order of saved registers on the stack matches the order they appears
@@ -156,7 +156,7 @@ _16Idtr: .word 0x3ff # _ToUserCode() takes control in real mode before passing control to user code.
# It will be shadowed to somewhere in memory below 1MB.
#------------------------------------------------------------------------------
-.globl ASM_PFX(ToUserCode)
+ASM_GLOBAL ASM_PFX(ToUserCode)
ASM_PFX(ToUserCode):
movl %edx,%ss # set new segment selectors
movl %edx,%ds
@@ -231,7 +231,7 @@ ASM_PFX(_32Data): # );
#------------------------------------------------------------------------------
-.globl ASM_PFX(InternalAsmThunk16)
+ASM_GLOBAL ASM_PFX(InternalAsmThunk16)
ASM_PFX(InternalAsmThunk16):
pushq %rbp
pushq %rbx
@@ -293,12 +293,12 @@ L_RetFromRealMode: .byte 0x0f, 0xa9 # pop gs
.byte 0x0f, 0xa1 # pop fs
- popq %rbx - movq %rbx, %ss - popq %rbx - movq %rbx, %es - popq %rbx - movq %rbx, %ds + popq %rbx
+ movq %rbx, %ss
+ popq %rbx
+ movq %rbx, %es
+ popq %rbx
+ movq %rbx, %ds
popq %rdi
popq %rsi
|