summaryrefslogtreecommitdiff
path: root/MdeModulePkg
diff options
context:
space:
mode:
Diffstat (limited to 'MdeModulePkg')
-rw-r--r--MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S4
-rw-r--r--MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S20
-rw-r--r--MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s20
-rw-r--r--MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S20
-rw-r--r--MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S10
5 files changed, 37 insertions, 37 deletions
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S b/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
index a152b5033c..cf39bd6eb2 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
@@ -18,8 +18,8 @@
.align 8
- .globl ASM_PFX(AsmGetVectorTemplatInfo)
- .globl ASM_PFX(AsmVectorFixup)
+ ASM_GLOBAL ASM_PFX(AsmGetVectorTemplatInfo)
+ ASM_GLOBAL ASM_PFX(AsmVectorFixup)
/*
;
;-----------------------------------------------------------------------
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
index 03fc6c98ba..671c8dbdf3 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
@@ -12,11 +12,11 @@
#
#**/
-.globl ASM_PFX(OrigVector)
-.globl ASM_PFX(InterruptEntryStub)
-.globl ASM_PFX(StubSize)
-.globl ASM_PFX(CommonIdtEntry)
-.globl ASM_PFX(FxStorSupport)
+ASM_GLOBAL ASM_PFX(OrigVector)
+ASM_GLOBAL ASM_PFX(InterruptEntryStub)
+ASM_GLOBAL ASM_PFX(StubSize)
+ASM_GLOBAL ASM_PFX(CommonIdtEntry)
+ASM_GLOBAL ASM_PFX(FxStorSupport)
ASM_PFX(StubSize): .long ASM_PFX(InterruptEntryStubEnd) - ASM_PFX(InterruptEntryStub)
ASM_PFX(AppEsp): .long 0x11111111 # ?
@@ -34,7 +34,7 @@ ASM_PFX(OrigVector): .long 0x66666666 # ?
#
# Abstract: Returns TRUE if FxStor instructions are supported
#
-.globl ASM_PFX(FxStorSupport)
+ASM_GLOBAL ASM_PFX(FxStorSupport)
ASM_PFX(FxStorSupport):
#
# cpuid corrupts ebx which must be preserved per the C calling convention
@@ -57,7 +57,7 @@ ASM_PFX(FxStorSupport):
# Abstract: Encodes an IDT descriptor with the given physical address
#
-.globl ASM_PFX(Vect2Desc)
+ASM_GLOBAL ASM_PFX(Vect2Desc)
ASM_PFX(Vect2Desc):
push %ebp
mov %esp,%ebp
@@ -71,13 +71,13 @@ ASM_PFX(Vect2Desc):
leave
ret
-.globl ASM_PFX(InterruptEntryStub)
+ASM_GLOBAL ASM_PFX(InterruptEntryStub)
ASM_PFX(InterruptEntryStub):
mov %esp,0x0 # save stack top
mov $0x0,%esp # switch to debugger stack
push $0x0 # push vector number - will be modified before installed
jmp ASM_PFX(CommonIdtEntry) # jump CommonIdtEntry
-.globl ASM_PFX(InterruptEntryStubEnd)
+ASM_GLOBAL ASM_PFX(InterruptEntryStubEnd)
ASM_PFX(InterruptEntryStubEnd):
#------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ ASM_PFX(InterruptEntryStubEnd):
# Abstract: This code is not a function, but is the common part for all IDT
# vectors.
#
-.globl ASM_PFX(CommonIdtEntry)
+ASM_GLOBAL ASM_PFX(CommonIdtEntry)
ASM_PFX(CommonIdtEntry):
##
## At this point, the stub has saved the current application stack esp into AppEsp
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
index aa497707c4..fc744c9268 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
@@ -16,10 +16,10 @@
#include "Common.i"
#include "Ds64Macros.i"
-.globl PatchSaveBuffer
-.globl IpfContextBuf
-.globl CommonHandler
-.globl ExternalInterruptCount
+ASM_GLOBAL PatchSaveBuffer
+ASM_GLOBAL IpfContextBuf
+ASM_GLOBAL CommonHandler
+ASM_GLOBAL ExternalInterruptCount
/////////////////////////////////////////////
@@ -30,7 +30,7 @@
// Description:
// Flushes instruction cache for specified number of bytes
//
- .globl InstructionCacheFlush
+ ASM_GLOBAL InstructionCacheFlush
.proc InstructionCacheFlush
.align 32
InstructionCacheFlush::
@@ -158,7 +158,7 @@ LoopBack: // $L143:
// Notes:
//
//
- .globl ChainHandler
+ ASM_GLOBAL ChainHandler
.proc ChainHandler
ChainHandler:
@@ -233,7 +233,7 @@ ChainHandlerDone:
// Notes:
//
//
- .globl UnchainHandler
+ ASM_GLOBAL UnchainHandler
.proc UnchainHandler
UnchainHandler:
@@ -666,7 +666,7 @@ SetSlotDone:
// Returns:
// Current value if IVA
- .globl GetIva
+ ASM_GLOBAL GetIva
.proc GetIva
GetIva:
mov r8=cr2;;
@@ -686,7 +686,7 @@ GetIva:
// Returns:
// Previous state of psr.ic
//
- .globl ProgramInterruptFlags
+ ASM_GLOBAL ProgramInterruptFlags
.proc ProgramInterruptFlags
ProgramInterruptFlags:
alloc loc0=1,2,0,0;;
@@ -1272,7 +1272,7 @@ EndHookHandler:
// Saves IVT index to SCRATCH_REG1 (immediate value is fixed up when code is copied
// to the IVT entry.
- .globl HookStub
+ ASM_GLOBAL HookStub
.proc HookStub
HookStub:
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
index 7c854c1c88..44efd231fb 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
@@ -14,11 +14,11 @@
.intel_syntax noprefix
-.globl ASM_PFX(OrigVector)
-.globl ASM_PFX(InterruptEntryStub)
-.globl ASM_PFX(StubSize)
-.globl ASM_PFX(CommonIdtEntry)
-.globl ASM_PFX(FxStorSupport)
+ASM_GLOBAL ASM_PFX(OrigVector)
+ASM_GLOBAL ASM_PFX(InterruptEntryStub)
+ASM_GLOBAL ASM_PFX(StubSize)
+ASM_GLOBAL ASM_PFX(CommonIdtEntry)
+ASM_GLOBAL ASM_PFX(FxStorSupport)
.data
@@ -94,7 +94,7 @@ DebugStackBegin : .ascii "<<<< DbgStkBegin" # initial debug ESP == DebugSta
#
# Abstract: Returns TRUE if FxStor instructions are supported
#
-.globl ASM_PFX(FxStorSupport)
+ASM_GLOBAL ASM_PFX(FxStorSupport)
ASM_PFX(FxStorSupport):
#
# cpuid corrupts rbx which must be preserved per the C calling convention
@@ -116,7 +116,7 @@ ASM_PFX(FxStorSupport):
#
# Abstract: Encodes an IDT descriptor with the given physical address
#
-.globl ASM_PFX(Vect2Desc)
+ASM_GLOBAL ASM_PFX(Vect2Desc)
ASM_PFX(Vect2Desc):
mov rax, rdx
mov word ptr [rcx], ax # write bits 15..0 of offset
@@ -136,13 +136,13 @@ ASM_PFX(Vect2Desc):
# Abstract: This code is not a function, but is a small piece of code that is
# copied and fixed up once for each IDT entry that is hooked.
#
-.globl ASM_PFX(InterruptEntryStub)
+ASM_GLOBAL ASM_PFX(InterruptEntryStub)
ASM_PFX(InterruptEntryStub):
push 0 # push vector number - will be modified before installed
jmp ASM_PFX(CommonIdtEntry)
-.globl ASM_PFX(InterruptEntryStubEnd)
+ASM_GLOBAL ASM_PFX(InterruptEntryStubEnd)
ASM_PFX(InterruptEntryStubEnd):
#------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ ASM_PFX(InterruptEntryStubEnd):
# Abstract: This code is not a function, but is the common part for all IDT
# vectors.
#
-.globl ASM_PFX(CommonIdtEntry)
+ASM_GLOBAL ASM_PFX(CommonIdtEntry)
##
## At this point, the stub has saved the current application stack esp into AppRsp
## and switched stacks to the debug stack, where it pushed the vector number
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
index add2f49670..8b787143b5 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
+++ b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
@@ -13,9 +13,9 @@
#
#**/
-.globl ASM_PFX(CopyMem)
+ASM_GLOBAL ASM_PFX(CopyMem)
-.globl ASM_PFX(EbcLLCALLEXNative)
+ASM_GLOBAL ASM_PFX(EbcLLCALLEXNative)
ASM_PFX(EbcLLCALLEXNative):
push %ebp
push %ebx
@@ -42,16 +42,16 @@ ASM_PFX(EbcLLCALLEXNative):
pop %ebp
ret
-.globl ASM_PFX(EbcLLGetEbcEntryPoint)
+ASM_GLOBAL ASM_PFX(EbcLLGetEbcEntryPoint)
ASM_PFX(EbcLLGetEbcEntryPoint):
ret
-.globl ASM_PFX(EbcLLGetStackPointer)
+ASM_GLOBAL ASM_PFX(EbcLLGetStackPointer)
ASM_PFX(EbcLLGetStackPointer):
mov %esp,%eax
add $0x4,%eax
ret
-.globl ASM_PFX(EbcLLGetReturnValue)
+ASM_GLOBAL ASM_PFX(EbcLLGetReturnValue)
ASM_PFX(EbcLLGetReturnValue):
ret