diff options
| author | Gao, Liming <liming.gao@intel.com> | 2014-08-11 07:05:49 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-11 07:05:49 +0000 |
| commit | 1be8039054d81cd5e5f602a6f3cd13a062cc2900 (patch) | |
| tree | 619b29b40a4279154026f184c4f82a2fa5cb2185 | |
| parent | 31122d8c9ac34b8936cf09649cad6a8cbc93bbb9 (diff) | |
| download | edk2-platforms-1be8039054d81cd5e5f602a6f3cd13a062cc2900.tar.xz | |
MdePkg: Fix Clang build failure
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15784 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/CpuIdEx.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/EnablePaging64.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/MultU64x32.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Ia32/RShiftU64.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S | 4 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S index 67b54926d6..0d34c56162 100644 --- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S +++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S @@ -21,7 +21,7 @@ #
#------------------------------------------------------------------------------
- .686:
+
.code:
#------------------------------------------------------------------------------
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S index 44fedc0ffb..f4df094195 100644 --- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S +++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S @@ -37,7 +37,7 @@ ASM_PFX(InternalMathDivRemU64x64): jnz Hard # call _@DivRemU64x64 if Divisor > 2^32
movl 20(%esp), %ecx
jecxz L1
- and $0, 4(%ecx) # zero high dword of remainder
+ andl $0, 4(%ecx) # zero high dword of remainder
movl %ecx, 16(%esp) # set up stack frame to match DivRemU64x32
L1:
jmp ASM_PFX(InternalMathDivRemU64x32)
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S index 3adf55a08a..08950ce0e2 100644 --- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S +++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S @@ -58,6 +58,6 @@ LongStart: # long mode starts here .byte 0x67, 0x48
movl 0x18(%esp), %esp # mov rsp, [esp + 18h]
.byte 0x48
- addl $0x-0x20, %esp # add rsp, -20h
+ addl $-0x20, %esp # add rsp, -20h
call *%ebx # call rbx
jmp . # no one should get here
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S index b74fbfc4f2..8e3f6f5560 100644 --- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S +++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.S @@ -19,7 +19,7 @@ #
#------------------------------------------------------------------------------
- .386:
+
.code:
ASM_GLOBAL ASM_PFX(InternalMathMultU64x32)
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S index c12489ff45..17cdedb212 100644 --- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S +++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.S @@ -19,7 +19,7 @@ #
#------------------------------------------------------------------------------
- .686:
+
.code:
ASM_GLOBAL ASM_PFX(InternalMathRShiftU64)
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S index c7330a9266..7329d6818d 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S @@ -43,7 +43,7 @@ ASM_PFX(InternalMemSetMem): andl $7, %edx
shrl $3, %ecx # # of Qwords to set
jz L1
- addl $0x-10, %esp
+ addl $-16, %esp
movq %mm0, (%esp) # save mm0
movq %mm1, 8(%esp) # save mm1
movd %eax, %mm0
@@ -53,7 +53,7 @@ ASM_PFX(InternalMemSetMem): L0:
movq %mm0, (%edi)
addl $8, %edi
- loopl L0
+ loop L0
movq (%esp), %mm0 # restore mm0
movq 8(%esp), %mm1 # restore mm1
addl $0x10, %esp # stack cleanup
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S index 0ba631860a..4d84bebba9 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S @@ -49,7 +49,7 @@ ASM_PFX(InternalMemSetMem16): L0:
movq %mm0, (%edi)
addl $8, %edi
- loopl L0
+ loop L0
L1:
movl %edx, %ecx
rep
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S index 36291de500..fb0d0788f9 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S @@ -44,7 +44,7 @@ ASM_PFX(InternalMemSetMem32): L0:
movq %mm0, (%edx)
lea 8(%edx), %edx
- loopl L0
+ loop L0
L1:
jnc L2
movd %mm0, (%edx)
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S index 2f514444c8..53379ad0ef 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S @@ -39,5 +39,5 @@ ASM_PFX(InternalMemSetMem64): L0:
movq %mm0, (%edx)
lea 8(%edx), %edx
- loopl L0
+ loop L0
ret
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S index d642028c9d..a4c7d8cb62 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.S @@ -36,7 +36,7 @@ ASM_GLOBAL ASM_PFX(InternalMemSetMem64)
ASM_PFX(InternalMemSetMem64):
movd %r8, %mm0 #Value
- movw %rcx, %rax #rax <- Buffer
+ movq %rcx, %rax #rax <- Buffer
xchg %rdx, %rcx #rcx <- Count
L0:
movntq %mm0, (%rdx)
diff --git a/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S index 10d0ac5094..6721693a20 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/X64/SetMem64.S @@ -40,7 +40,7 @@ ASM_PFX(InternalMemSetMem64): movq %r8, %rax
xchgq %rdx, %rcx
rep stosq
- movw %rdx, %rax
+ movq %rdx, %rax
popq %rdi
ret
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S index fdaf1f01c0..9b1f1cb60c 100644 --- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S @@ -21,7 +21,7 @@ #
#------------------------------------------------------------------------------
- .386:
+
.code:
ASM_GLOBAL ASM_PFX(InternalMemSetMem)
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S index 59ef940d8e..63e2a993e7 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S @@ -21,7 +21,7 @@ #
#------------------------------------------------------------------------------
- .686:
+
#.MODEL flat,C
.xmm:
.code:
|