1. Remove .extern from GCC assembly.

2. Define macro for .global/.globl in GCC assembly.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8344 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xli24
2009-05-20 09:42:59 +00:00
parent dedfc3bbc9
commit d5172f911d
89 changed files with 107 additions and 98 deletions

View File

@@ -19,7 +19,7 @@
#
#------------------------------------------------------------------------------
.global ASM_PFX(CpuBreakpoint)
ASM_GLOBAL ASM_PFX(CpuBreakpoint)
ASM_PFX(CpuBreakpoint):
int $0x3
ret

View File

@@ -32,7 +32,7 @@
# OUT UINT32 *RegisterOutEdx OPTIONAL
# )
#------------------------------------------------------------------------------
.global ASM_PFX(AsmCpuid)
ASM_GLOBAL ASM_PFX(AsmCpuid)
ASM_PFX(AsmCpuid):
push %rbx
mov %ecx, %eax

View File

@@ -33,7 +33,7 @@
# OUT UINT32 *RegisterOutEdx OPTIONAL
# )
#------------------------------------------------------------------------------
.global ASM_PFX(AsmCpuidEx)
ASM_GLOBAL ASM_PFX(AsmCpuidEx)
ASM_PFX(AsmCpuidEx):
push %rbx
movl %ecx,%eax

View File

@@ -28,7 +28,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(CpuPause)
ASM_GLOBAL ASM_PFX(CpuPause)
ASM_PFX(CpuPause):
pause
ret

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(DisableInterrupts)
ASM_GLOBAL ASM_PFX(DisableInterrupts)
ASM_PFX(DisableInterrupts):
cli
ret

View File

@@ -35,7 +35,7 @@
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86DisablePaging64)
ASM_GLOBAL ASM_PFX(InternalX86DisablePaging64)
ASM_PFX(InternalX86DisablePaging64):
cli
shl $0x20,%rcx # rcx[32..47] <- Cs

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(EnableDisableInterrupts)
ASM_GLOBAL ASM_PFX(EnableDisableInterrupts)
.align 16
ASM_PFX(EnableDisableInterrupts):
sti

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(EnableInterrupts)
ASM_GLOBAL ASM_PFX(EnableInterrupts)
ASM_PFX(EnableInterrupts):
sti
ret

View File

@@ -29,7 +29,7 @@
# IN VOID *LinearAddress
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmFlushCacheLine)
ASM_GLOBAL ASM_PFX(AsmFlushCacheLine)
ASM_PFX(AsmFlushCacheLine):
clflush (%rcx)
mov %rcx, %rax

View File

@@ -29,7 +29,7 @@
# IN CONST IA32_FX_BUFFER *Buffer
# )#
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86FxRestore)
ASM_GLOBAL ASM_PFX(InternalX86FxRestore)
ASM_PFX(InternalX86FxRestore):
fxrstor (%rcx)
ret

View File

@@ -29,7 +29,7 @@
# OUT IA32_FX_BUFFER *Buffer
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86FxSave)
ASM_GLOBAL ASM_PFX(InternalX86FxSave)
ASM_PFX(InternalX86FxSave):
fxsave (%rcx)
ret

View File

@@ -29,7 +29,7 @@
# VOID
# )#
#------------------------------------------------------------------------------
.global ASM_PFX(AsmInvd)
ASM_GLOBAL ASM_PFX(AsmInvd)
ASM_PFX(AsmInvd):
invd
ret

View File

@@ -27,7 +27,7 @@
# IN UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalLongJump)
ASM_GLOBAL ASM_PFX(InternalLongJump)
ASM_PFX(InternalLongJump):
mov (%rcx), %rbx
mov 0x8(%rcx), %rsp

View File

@@ -31,7 +31,7 @@
# IN UINTN Edx
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmMonitor)
ASM_GLOBAL ASM_PFX(AsmMonitor)
.align 16
ASM_PFX(AsmMonitor):
mov %ecx,%eax

View File

@@ -30,7 +30,7 @@
# IN UINTN Ecx
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmMwait)
ASM_GLOBAL ASM_PFX(AsmMwait)
.align 16
ASM_PFX(AsmMwait):
mov %ecx,%eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadCr0)
ASM_GLOBAL ASM_PFX(AsmReadCr0)
.align 16
ASM_PFX(AsmReadCr0):
mov %cr0, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadCr2)
ASM_GLOBAL ASM_PFX(AsmReadCr2)
.align 16
ASM_PFX(AsmReadCr2):
mov %cr2, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadCr3)
ASM_GLOBAL ASM_PFX(AsmReadCr3)
.align 16
ASM_PFX(AsmReadCr3):
mov %cr3, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadCr4)
ASM_GLOBAL ASM_PFX(AsmReadCr4)
.align 16
ASM_PFX(AsmReadCr4):
mov %cr4, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadCs)
ASM_GLOBAL ASM_PFX(AsmReadCs)
.align 16
ASM_PFX(AsmReadCs):
mov %cs, %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr0)
ASM_GLOBAL ASM_PFX(AsmReadDr0)
.align 16
ASM_PFX(AsmReadDr0):
mov %dr0, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr1)
ASM_GLOBAL ASM_PFX(AsmReadDr1)
.align 16
ASM_PFX(AsmReadDr1):
mov %dr1, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr2)
ASM_GLOBAL ASM_PFX(AsmReadDr2)
.align 16
ASM_PFX(AsmReadDr2):
mov %dr2, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr3)
ASM_GLOBAL ASM_PFX(AsmReadDr3)
.align 16
ASM_PFX(AsmReadDr3):
mov %dr3, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr4)
ASM_GLOBAL ASM_PFX(AsmReadDr4)
.align 16
ASM_PFX(AsmReadDr4):
#DB 0fh, 21h, 0e0h

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr5)
ASM_GLOBAL ASM_PFX(AsmReadDr5)
.align 16
ASM_PFX(AsmReadDr5):
mov %dr5, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr6)
ASM_GLOBAL ASM_PFX(AsmReadDr6)
.align 16
ASM_PFX(AsmReadDr6):
mov %dr6, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDr7)
ASM_GLOBAL ASM_PFX(AsmReadDr7)
.align 16
ASM_PFX(AsmReadDr7):
mov %dr7, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadDs)
ASM_GLOBAL ASM_PFX(AsmReadDs)
.align 16
ASM_PFX(AsmReadDs):
movl %ds, %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadEflags)
ASM_GLOBAL ASM_PFX(AsmReadEflags)
.align 16
ASM_PFX(AsmReadEflags):
pushfq

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadEs)
ASM_GLOBAL ASM_PFX(AsmReadEs)
.align 16
ASM_PFX(AsmReadEs):
mov %es, %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadFs)
ASM_GLOBAL ASM_PFX(AsmReadFs)
.align 16
ASM_PFX(AsmReadFs):
mov %fs, %eax

View File

@@ -29,7 +29,7 @@
# OUT IA32_DESCRIPTOR *Gdtr
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86ReadGdtr)
ASM_GLOBAL ASM_PFX(InternalX86ReadGdtr)
.align 16
ASM_PFX(InternalX86ReadGdtr):
sgdt (%rcx)

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadGs)
ASM_GLOBAL ASM_PFX(AsmReadGs)
.align 16
ASM_PFX(AsmReadGs):
mov %gs, %eax

View File

@@ -29,7 +29,7 @@
# OUT IA32_DESCRIPTOR *Idtr
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86ReadIdtr)
ASM_GLOBAL ASM_PFX(InternalX86ReadIdtr)
.align 16
ASM_PFX(InternalX86ReadIdtr):
sidt (%rcx)

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadLdtr)
ASM_GLOBAL ASM_PFX(AsmReadLdtr)
.align 16
ASM_PFX(AsmReadLdtr):
sldt %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm0)
ASM_GLOBAL ASM_PFX(AsmReadMm0)
.align 16
ASM_PFX(AsmReadMm0):
movd %mm0, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm1)
ASM_GLOBAL ASM_PFX(AsmReadMm1)
.align 16
ASM_PFX(AsmReadMm1):
movd %mm1, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm2)
ASM_GLOBAL ASM_PFX(AsmReadMm2)
.align 16
ASM_PFX(AsmReadMm2):
movd %mm2, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm3)
ASM_GLOBAL ASM_PFX(AsmReadMm3)
.align 16
ASM_PFX(AsmReadMm3):
movd %mm3, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm4)
ASM_GLOBAL ASM_PFX(AsmReadMm4)
.align 16
ASM_PFX(AsmReadMm4):
movd %mm4, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm5)
ASM_GLOBAL ASM_PFX(AsmReadMm5)
.align 16
ASM_PFX(AsmReadMm5):
movd %mm5, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm6)
ASM_GLOBAL ASM_PFX(AsmReadMm6)
.align 16
ASM_PFX(AsmReadMm6):
movd %mm6, %rax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMm7)
ASM_GLOBAL ASM_PFX(AsmReadMm7)
.align 16
ASM_PFX(AsmReadMm7):
movd %mm7, %rax

View File

@@ -29,7 +29,7 @@
# IN UINT32 Index
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadMsr64)
ASM_GLOBAL ASM_PFX(AsmReadMsr64)
.align 16
ASM_PFX(AsmReadMsr64):
rdmsr # edx & eax are zero extended

View File

@@ -29,7 +29,7 @@
# IN UINT32 PmcIndex
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadPmc)
ASM_GLOBAL ASM_PFX(AsmReadPmc)
.align 16
ASM_PFX(AsmReadPmc):
rdpmc

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadSs)
ASM_GLOBAL ASM_PFX(AsmReadSs)
.align 16
ASM_PFX(AsmReadSs):
movl %ss, %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadTr)
ASM_GLOBAL ASM_PFX(AsmReadTr)
.align 16
ASM_PFX(AsmReadTr):
str %eax

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmReadTsc)
ASM_GLOBAL ASM_PFX(AsmReadTsc)
.align 16
ASM_PFX(AsmReadTsc):
rdtsc

View File

@@ -19,8 +19,7 @@
#
#------------------------------------------------------------------------------
.extern ASM_PFX(InternalAssertJumpBuffer)
.global ASM_PFX(SetJump)
ASM_GLOBAL ASM_PFX(SetJump)
ASM_PFX(SetJump):
push %rcx
add $0xffffffffffffffe0,%rsp

View File

@@ -35,7 +35,7 @@
# None
#
#------------------------------------------------------------------------------
.global ASM_PFX(InternalSwitchStack)
ASM_GLOBAL ASM_PFX(InternalSwitchStack)
ASM_PFX(InternalSwitchStack):
mov %rcx, %rax
mov %rdx, %rcx

View File

@@ -29,7 +29,7 @@
# VOID
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWbinvd)
ASM_GLOBAL ASM_PFX(AsmWbinvd)
.align 16
ASM_PFX(AsmWbinvd):
wbinvd

View File

@@ -29,7 +29,7 @@
# UINTN Cr0
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteCr0)
ASM_GLOBAL ASM_PFX(AsmWriteCr0)
ASM_PFX(AsmWriteCr0):
mov %rcx,%cr0
mov %rcx,%rax

View File

@@ -29,7 +29,7 @@
# UINTN Cr2
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteCr2)
ASM_GLOBAL ASM_PFX(AsmWriteCr2)
ASM_PFX(AsmWriteCr2):
mov %rcx,%cr2
mov %rcx,%rax

View File

@@ -29,7 +29,7 @@
# UINTN Cr3
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteCr3)
ASM_GLOBAL ASM_PFX(AsmWriteCr3)
ASM_PFX(AsmWriteCr3):
mov %rcx,%cr3
mov %rcx,%rax

View File

@@ -29,7 +29,7 @@
# UINTN Cr4
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteCr4)
ASM_GLOBAL ASM_PFX(AsmWriteCr4)
ASM_PFX(AsmWriteCr4):
mov %rcx,%cr4
mov %rcx,%rax

View File

@@ -29,7 +29,7 @@
# UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr0)
ASM_GLOBAL ASM_PFX(AsmWriteDr0)
.align 16
ASM_PFX(AsmWriteDr0):
mov %rcx, %dr0

View File

@@ -29,7 +29,7 @@
# UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr1)
ASM_GLOBAL ASM_PFX(AsmWriteDr1)
.align 16
ASM_PFX(AsmWriteDr1):
mov %rcx, %dr1

View File

@@ -29,7 +29,7 @@
# UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr2)
ASM_GLOBAL ASM_PFX(AsmWriteDr2)
.align 16
ASM_PFX(AsmWriteDr2):
mov %rcx, %dr2

View File

@@ -29,7 +29,7 @@
# UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr3)
ASM_GLOBAL ASM_PFX(AsmWriteDr3)
.align 16
ASM_PFX(AsmWriteDr3):
mov %rcx, %dr3

View File

@@ -29,7 +29,7 @@
# IN UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr4)
ASM_GLOBAL ASM_PFX(AsmWriteDr4)
ASM_PFX(AsmWriteDr4):
mov %rcx, %dr4
mov %rcx, %rax

View File

@@ -29,7 +29,7 @@
# IN UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr5)
ASM_GLOBAL ASM_PFX(AsmWriteDr5)
ASM_PFX(AsmWriteDr5):
mov %rcx, %dr5
mov %rcx, %rax

View File

@@ -29,7 +29,7 @@
# IN UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr6)
ASM_GLOBAL ASM_PFX(AsmWriteDr6)
ASM_PFX(AsmWriteDr6):
mov %rcx, %dr6
mov %rcx, %rax

View File

@@ -29,7 +29,7 @@
# IN UINTN Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteDr7)
ASM_GLOBAL ASM_PFX(AsmWriteDr7)
ASM_PFX(AsmWriteDr7):
mov %rcx, %dr7
mov %rcx, %rax

View File

@@ -29,7 +29,7 @@
# IN CONST IA32_DESCRIPTOR *Idtr
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86WriteGdtr)
ASM_GLOBAL ASM_PFX(InternalX86WriteGdtr)
ASM_PFX(InternalX86WriteGdtr):
lgdt (%rcx)
ret

View File

@@ -29,7 +29,7 @@
# IN CONST IA32_DESCRIPTOR *Idtr
# );
#------------------------------------------------------------------------------
.global ASM_PFX(InternalX86WriteIdtr)
ASM_GLOBAL ASM_PFX(InternalX86WriteIdtr)
.align 16
ASM_PFX(InternalX86WriteIdtr):
lidt (%rcx)

View File

@@ -29,7 +29,7 @@
# IN UINT16 Ldtr
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteLdtr)
ASM_GLOBAL ASM_PFX(AsmWriteLdtr)
.align 16
ASM_PFX(AsmWriteLdtr):
lldt %cx

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm0)
ASM_GLOBAL ASM_PFX(AsmWriteMm0)
ASM_PFX(AsmWriteMm0):
movd %rcx, %mm0
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm1)
ASM_GLOBAL ASM_PFX(AsmWriteMm1)
ASM_PFX(AsmWriteMm1):
movd %rcx, %mm1
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm2)
ASM_GLOBAL ASM_PFX(AsmWriteMm2)
ASM_PFX(AsmWriteMm2):
movd %rcx, %mm2
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm3)
ASM_GLOBAL ASM_PFX(AsmWriteMm3)
ASM_PFX(AsmWriteMm3):
movd %rcx, %mm3
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm4)
ASM_GLOBAL ASM_PFX(AsmWriteMm4)
ASM_PFX(AsmWriteMm4):
movd %rcx, %mm4
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm5)
ASM_GLOBAL ASM_PFX(AsmWriteMm5)
ASM_PFX(AsmWriteMm5):
movd %rcx, %mm5
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm6)
ASM_GLOBAL ASM_PFX(AsmWriteMm6)
ASM_PFX(AsmWriteMm6):
movd %rcx, %mm6
ret

View File

@@ -29,7 +29,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMm7)
ASM_GLOBAL ASM_PFX(AsmWriteMm7)
ASM_PFX(AsmWriteMm7):
movd %rcx, %mm7
ret

View File

@@ -30,7 +30,7 @@
# IN UINT64 Value
# );
#------------------------------------------------------------------------------
.global ASM_PFX(AsmWriteMsr64)
ASM_GLOBAL ASM_PFX(AsmWriteMsr64)
.align 16
ASM_PFX(AsmWriteMsr64):
mov %rdx, %rax # meanwhile, rax <- return value