diff options
| author | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-28 07:28:19 +0000 |
|---|---|---|
| committer | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-28 07:28:19 +0000 |
| commit | eb227e96bd06a5b0f2f933187a679e7fb3382cd9 (patch) | |
| tree | b16e46f494d8d9d8552d8d0e882ad78019934071 /MdePkg/Library/BaseMemoryLibMmx/Ia32 | |
| parent | 27169a56e67556796ab0410c8917436dc9aa2abf (diff) | |
| download | edk2-platforms-eb227e96bd06a5b0f2f933187a679e7fb3382cd9.tar.xz | |
1. Updated function headers for all assembly function
2. Optimized register usage in SetMemXX functions in all lib instances
3. Fixed a logical error in CopyMem for all lib instances
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1139 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BaseMemoryLibMmx/Ia32')
22 files changed, 236 insertions, 191 deletions
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S index c7e0b8a2a1..7901b82a44 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S @@ -27,11 +27,17 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .code: - .global _InternalMemCompareMem + +#------------------------------------------------------------------------------ +# INTN +# EFIAPI +# InternalMemCompareMem ( +# IN CONST VOID *DestinationBuffer, +# IN CONST VOID *SourceBuffer, +# IN UINTN Length +# ); +#------------------------------------------------------------------------------ _InternalMemCompareMem: push %esi push %edi @@ -45,5 +51,3 @@ _InternalMemCompareMem: pop %edi pop %esi ret - - diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm index 3cf6fe7f73..1d0e7fad39 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm @@ -31,6 +31,15 @@ .model flat,C
.code
+;------------------------------------------------------------------------------
+; INTN
+; EFIAPI
+; InternalMemCompareMem (
+; IN CONST VOID *DestinationBuffer,
+; IN CONST VOID *SourceBuffer,
+; IN UINTN Length
+; );
+;------------------------------------------------------------------------------
InternalMemCompareMem PROC USES esi edi
mov esi, [esp + 12]
mov edi, [esp + 16]
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S index fff8bde5ea..d644b34675 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S @@ -21,32 +21,29 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemCopyMem #------------------------------------------------------------------------------ # VOID * -# _mem_CopyMem ( +# EFIAPI +# InternalMemCopyMem ( # IN VOID *Destination, # IN VOID *Source, # IN UINTN Count -# ) +# ); #------------------------------------------------------------------------------ -.global _InternalMemCopyMem _InternalMemCopyMem: push %esi push %edi movl 16(%esp), %esi # esi <- Source movl 12(%esp), %edi # edi <- Destination movl 20(%esp), %edx # edx <- Count - leal -1(%edi,%edx,), %eax # eax <- End of Destination + leal -1(%esi,%edx,), %eax # eax <- End of Source cmpl %edi, %esi jae L0 - cmpl %esi, %eax # Overlapped? + cmpl %edi, %eax # Overlapped? jae @CopyBackward # Copy backward if overlapped -L0: +L0: xorl %ecx, %ecx subl %esi, %ecx andl $7, %ecx # ecx + esi aligns on 8-byte boundary @@ -56,7 +53,7 @@ L0: subl %ecx, %edx # edx <- remaining bytes to copy rep movsb -L1: +L1: movl %edx, %ecx andl $7, %edx shrl $3, %ecx # ecx <- # of Qwords to copy @@ -64,22 +61,21 @@ L1: pushl %eax pushl %eax movq %mm0, (%esp) # save mm0 -L2: +L2: movq (%esi), %mm0 - movntq %mm0, (%edi) + movq %mm0, (%edi) addl $8, %esi addl $8, %edi loop L2 - mfence movq (%esp), %mm0 # restore mm0 popl %ecx # stack cleanup popl %ecx # stack cleanup jmp @CopyBytes -@CopyBackward: - movl %eax, %edi # edi <- Last byte in Destination - leal -1(%esi,%edx,), %esi # esi <- Last byte in Source +@CopyBackward: + movl %eax, %esi # esi <- Last byte in Source + leal -1(%edi,%edx,), %edi # edi <- Last byte in Destination std -@CopyBytes: +@CopyBytes: movl %edx, %ecx rep movsb diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm index b709a809d5..1b8b3c5dcd 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm @@ -23,36 +23,28 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_CopyMem (
+; EFIAPI
+; InternalMemCopyMem (
; IN VOID *Destination,
; IN VOID *Source,
; IN UINTN Count
-; )
+; );
;------------------------------------------------------------------------------
InternalMemCopyMem PROC USES esi edi
mov esi, [esp + 16] ; esi <- Source
mov edi, [esp + 12] ; edi <- Destination
mov edx, [esp + 20] ; edx <- Count
- lea eax, [edi + edx - 1] ; eax <- End of Destination
+ lea eax, [esi + edx - 1] ; eax <- End of Source
cmp esi, edi
jae @F
- cmp eax, esi ; Overlapped?
+ cmp eax, edi ; Overlapped?
jae @CopyBackward ; Copy backward if overlapped
@@:
- xor ecx, ecx
- sub ecx, esi
- and ecx, 7 ; ecx + esi aligns on 8-byte boundary
- jz @F
- cmp ecx, edx
- cmova ecx, edx
- sub edx, ecx ; edx <- remaining bytes to copy
- rep movsb
-@@:
mov ecx, edx
and edx, 7
shr ecx, 3 ; ecx <- # of Qwords to copy
@@ -62,18 +54,17 @@ InternalMemCopyMem PROC USES esi edi movq [esp], mm0 ; save mm0
@@:
movq mm0, [esi]
- movntq [edi], mm0
+ movq [edi], mm0
add esi, 8
add edi, 8
loop @B
- mfence
movq mm0, [esp] ; restore mm0
pop ecx ; stack cleanup
pop ecx ; stack cleanup
jmp @CopyBytes
@CopyBackward:
- mov edi, eax ; edi <- Last byte in Destination
- lea esi, [esi + edx - 1] ; esi <- Last byte in Source
+ mov esi, eax ; esi <- Last byte in Source
+ lea edi, [edi + edx - 1] ; edi <- Last byte in Destination
std
@CopyBytes:
mov ecx, edx
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S index e23799e773..1e83064573 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S @@ -27,11 +27,17 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .code: - .global _InternalMemScanMem16 + +#------------------------------------------------------------------------------ +# CONST VOID * +# EFIAPI +# InternalMemScanMem16 ( +# IN CONST VOID *Buffer, +# IN UINTN Length, +# IN UINT16 Value +# ); +#------------------------------------------------------------------------------ _InternalMemScanMem16: push %edi movl 12(%esp), %ecx @@ -42,5 +48,3 @@ _InternalMemScanMem16: cmovnz %ecx, %eax pop %edi ret - - diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm index 7071942ede..57fab61b77 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm @@ -31,6 +31,15 @@ .model flat,C
.code
+;------------------------------------------------------------------------------
+; CONST VOID *
+; EFIAPI
+; InternalMemScanMem16 (
+; IN CONST VOID *Buffer,
+; IN UINTN Length,
+; IN UINT16 Value
+; );
+;------------------------------------------------------------------------------
InternalMemScanMem16 PROC USES edi
mov ecx, [esp + 12]
mov edi, [esp + 8]
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S index 6b4a919dde..b7b93d9c0c 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S @@ -27,11 +27,17 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .code: - .global _InternalMemScanMem32 + +#------------------------------------------------------------------------------ +# CONST VOID * +# EFIAPI +# InternalMemScanMem32 ( +# IN CONST VOID *Buffer, +# IN UINTN Length, +# IN UINT32 Value +# ); +#------------------------------------------------------------------------------ _InternalMemScanMem32: push %edi movl 12(%esp), %ecx diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm index e6aaf02bc3..6ac857ce16 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm @@ -31,6 +31,15 @@ .model flat,C
.code
+;------------------------------------------------------------------------------
+; CONST VOID *
+; EFIAPI
+; InternalMemScanMem32 (
+; IN CONST VOID *Buffer,
+; IN UINTN Length,
+; IN UINT32 Value
+; );
+;------------------------------------------------------------------------------
InternalMemScanMem32 PROC USES edi
mov ecx, [esp + 12]
mov edi, [esp + 8]
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S index 00f6d74436..6bbb18a334 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S @@ -27,18 +27,24 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .code: - .global _InternalMemScanMem64 + +#------------------------------------------------------------------------------ +# CONST VOID * +# EFIAPI +# InternalMemScanMem64 ( +# IN CONST VOID *Buffer, +# IN UINTN Length, +# IN UINT64 Value +# ); +#------------------------------------------------------------------------------ _InternalMemScanMem64: push %edi movl 12(%esp), %ecx movl 16(%esp), %eax movl 20(%esp), %edx movl 8(%esp), %edi -L0: +L0: cmpl (%edi), %eax leal 8(%edi), %edi loopne L0 @@ -46,7 +52,7 @@ L0: cmpl -4(%edi), %edx jecxz L1 jne L0 -L1: +L1: leal -8(%edi), %eax cmovne %ecx, %eax pop %edi diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm index f9725a4a5d..ca54f13738 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm @@ -31,6 +31,15 @@ .model flat,C
.code
+;------------------------------------------------------------------------------
+; CONST VOID *
+; EFIAPI
+; InternalMemScanMem64 (
+; IN CONST VOID *Buffer,
+; IN UINTN Length,
+; IN UINT64 Value
+; );
+;------------------------------------------------------------------------------
InternalMemScanMem64 PROC USES edi
mov ecx, [esp + 12]
mov eax, [esp + 16]
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S index 57640378b4..fe678fac26 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S @@ -27,11 +27,17 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .code: - .global _InternalMemScanMem8 + +#------------------------------------------------------------------------------ +# CONST VOID * +# EFIAPI +# InternalMemScanMem8 ( +# IN CONST VOID *Buffer, +# IN UINTN Length, +# IN UINT8 Value +# ); +#------------------------------------------------------------------------------ _InternalMemScanMem8: push %edi movl 12(%esp), %ecx diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm index 6ae1900189..a3f65b64fa 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm @@ -31,6 +31,15 @@ .model flat,C
.code
+;------------------------------------------------------------------------------
+; CONST VOID *
+; EFIAPI
+; InternalMemScanMem8 (
+; IN CONST VOID *Buffer,
+; IN UINTN Length,
+; IN UINT8 Value
+; );
+;------------------------------------------------------------------------------
InternalMemScanMem8 PROC USES edi
mov ecx, [esp + 12]
mov edi, [esp + 8]
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S index 8a893f893a..4e93915caa 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S @@ -21,44 +21,43 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemSetMem #------------------------------------------------------------------------------ # VOID * -# _mem_SetMem ( +# InternalMemSetMem ( # IN VOID *Buffer, # IN UINTN Count, # IN UINT8 Value # ) #------------------------------------------------------------------------------ -.global _InternalMemSetMem _InternalMemSetMem: push %edi + movb 16(%esp), %al + movb %al, %ah + shrdl $16, %eax, %edx + shldl $16, %edx, %eax movl 12(%esp), %ecx # ecx <- Count movl 8(%esp), %edi # edi <- Buffer movl %ecx, %edx + andl $7, %edx shrl $3, %ecx # # of Qwords to set - movb 16(%esp), %al # al <- Value - jz @SetBytes - movb %al, %ah # ax <- Value | (Value << 8) - pushl %ecx - pushl %ecx + jz L1 + addl $0x-10, %esp movq %mm0, (%esp) # save mm0 + movq %mm1, 8(%esp) # save mm1 movd %eax, %mm0 - pshufw $0x0,%mm0,%mm0 -L0: - movntq %mm0, (%edi) + movd %eax, %mm1 + psllq $32, %mm0 + por %mm1, %mm0 # fill mm0 with 8 Value's +L0: + movq %mm0, (%edi) addl $8, %edi - loop L0 - mfence + loopl L0 movq (%esp), %mm0 # restore mm0 - popl %ecx # stack cleanup - popl %ecx -@SetBytes: - andl $7, %edx + movq 8(%esp), %mm1 # restore mm1 + addl $0x10, %esp # stack cleanup +L1: movl %edx, %ecx rep stosb diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm index f2c55f1296..c9c48ecf9d 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm @@ -23,40 +23,44 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_SetMem (
+; EFIAPI
+; InternalMemSetMem (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT8 Value
; )
;------------------------------------------------------------------------------
InternalMemSetMem PROC USES edi
+ mov al, [esp + 16]
+ mov ah, al
+ shrd edx, eax, 16
+ shld eax, edx, 16
mov ecx, [esp + 12] ; ecx <- Count
mov edi, [esp + 8] ; edi <- Buffer
mov edx, ecx
+ and edx, 7
shr ecx, 3 ; # of Qwords to set
- mov al, [esp + 16] ; al <- Value
jz @SetBytes
- mov ah, al ; ax <- Value | (Value << 8)
- push ecx
- push ecx
+ add esp, -10h
movq [esp], mm0 ; save mm0
+ movq [esp + 8], mm1 ; save mm1
movd mm0, eax
- pshufw mm0, mm0, 0 ; fill mm0 with 8 Value's
+ movd mm1, eax
+ psllq mm0, 32
+ por mm0, mm1 ; fill mm0 with 8 Value's
@@:
- movntq [edi], mm0
+ movq [edi], mm0
add edi, 8
loop @B
- mfence
movq mm0, [esp] ; restore mm0
- pop ecx ; stack cleanup
- pop ecx
+ movq mm1, [esp + 8] ; restore mm1
+ add esp, 10h ; stack cleanup
@SetBytes:
- and edx, 7
mov ecx, edx
rep stosb
mov eax, [esp + 8] ; eax <- Buffer as return value
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S index bcbd49e442..9898d28f98 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S @@ -21,37 +21,36 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemSetMem16 #------------------------------------------------------------------------------ # VOID * -# _mem_SetMem16 ( +# InternalMemSetMem16 ( # IN VOID *Buffer, # IN UINTN Count, # IN UINT16 Value # ) #------------------------------------------------------------------------------ -.global _InternalMemSetMem16 _InternalMemSetMem16: push %edi + movl 16(%esp), %eax + shrdl $16, %eax, %edx + shldl $16, %edx, %eax movl 12(%esp), %edx movl 8(%esp), %edi movl %edx, %ecx andl $3, %edx shrl $2, %ecx - movl 16(%esp), %eax - jz @SetWords + jz L1 movd %eax, %mm0 - pshufw $0, %mm0, %mm0 -L0: - movntq %mm0, (%edi) + movd %eax, %mm1 + psllq $32, %mm0 + por %mm1, %mm0 +L0: + movq %mm0, (%edi) addl $8, %edi - loop L0 - mfence -@SetWords: + loopl L0 +L1: movl %edx, %ecx rep stosw diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm index f9dc533fd8..e934226658 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm @@ -23,32 +23,36 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_SetMem16 (
+; EFIAPI
+; InternalMemSetMem16 (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT16 Value
; )
;------------------------------------------------------------------------------
InternalMemSetMem16 PROC USES edi
+ mov eax, [esp + 16]
+ shrd edx, eax, 16
+ shld eax, edx, 16
mov edx, [esp + 12]
mov edi, [esp + 8]
mov ecx, edx
and edx, 3
shr ecx, 2
- mov eax, [esp + 16]
jz @SetWords
movd mm0, eax
- pshufw mm0, mm0, 0
+ movd mm1, eax
+ psllq mm0, 32
+ por mm0, mm1
@@:
- movntq [edi], mm0
+ movq [edi], mm0
add edi, 8
loop @B
- mfence
@SetWords:
mov ecx, edx
rep stosw
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S index 27fd6174bd..8281652ad9 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S @@ -21,39 +21,32 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemSetMem32 #------------------------------------------------------------------------------ # VOID * -# _mem_SetMem32 ( +# InternalMemSetMem32 ( # IN VOID *Buffer, # IN UINTN Count, # IN UINT32 Value # ) #------------------------------------------------------------------------------ -.global _InternalMemSetMem32 _InternalMemSetMem32: - push %edi - movl 12(%esp), %edx - movl 8(%esp), %edi - movl %edx, %ecx + movl 4(%esp), %eax + movl 8(%esp), %ecx + movd 12(%esp), %mm0 shrl %ecx - movd 16(%esp), %mm0 - movl %edi, %eax - jz @SetDwords - pshufw $0x44, %mm0, %mm0 -L0: - movntq %mm0, (%edi) - addl $8, %edi - loopl L0 - mfence -@SetDwords: - testb $1, %dl + movl %eax, %edx jz L1 - movd %mm0, (%edi) -L1: - pop %edi + movq %mm0, %mm1 + psllq $32, %mm1 + por %mm1, %mm0 +L0: + movq %mm0, (%edx) + lea 8(%edx), %edx + loopl L0 +L1: + jnc L2 + movd %mm0, (%edx) +L2: ret diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm index 7f24fcd744..c2e4869e47 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm @@ -23,35 +23,35 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_SetMem32 (
+; EFIAPI
+; InternalMemSetMem32 (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT32 Value
-; )
+; );
;------------------------------------------------------------------------------
-InternalMemSetMem32 PROC USES edi
- mov edx, [esp + 12]
- mov edi, [esp + 8]
- mov ecx, edx
- shr ecx, 1
- movd mm0, [esp + 16]
- mov eax, edi
+InternalMemSetMem32 PROC
+ mov eax, [esp + 4] ; eax <- Buffer as return value
+ mov ecx, [esp + 8] ; ecx <- Count
+ movd mm0, [esp + 12] ; mm0 <- Value
+ shr ecx, 1 ; ecx <- number of qwords to set
+ mov edx, eax ; edx <- Buffer
jz @SetDwords
- pshufw mm0, mm0, 44h
+ movq mm1, mm0
+ psllq mm1, 32
+ por mm0, mm1
@@:
- movntq [edi], mm0
- add edi, 8
+ movq [edx], mm0
+ lea edx, [edx + 8] ; use "lea" to avoid change in flags
loop @B
- mfence
@SetDwords:
- test dl, 1
- jz @F
- movd [edi], mm0
+ jnc @F
+ movd [edx], mm0
@@:
ret
InternalMemSetMem32 ENDP
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S index 9699581606..5eef027e57 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S @@ -21,30 +21,23 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemSetMem64 #------------------------------------------------------------------------------ # VOID * -# _mem_SetMem64 ( +# InternalMemSetMem64 ( # IN VOID *Buffer, # IN UINTN Count, # IN UINT64 Value # ) #------------------------------------------------------------------------------ -.global _InternalMemSetMem64 _InternalMemSetMem64: - push %edi - movq 16(%esp), %mm0 - movl 12(%esp), %ecx - movl 8(%esp), %edi - movl %edi, %eax -L0: - movntq %mm0, (%edi) - addl $8, %edi + movl 4(%esp), %eax + movl 8(%esp), %ecx + movq 12(%esp), %mm0 + movl %eax, %edx +L0: + movq %mm0, (%edx) + lea 8(%edx), %edx loopl L0 - mfence - pop %edi ret diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm index 310f418d0c..027483ba3f 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm @@ -23,12 +23,13 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_SetMem64 (
+; EFIAPI
+; InternalMemSetMem64 (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT64 Value
@@ -40,10 +41,9 @@ InternalMemSetMem64 PROC movq mm0, [esp + 12]
mov edx, eax
@@:
- movntq [edx], mm0
+ movq [edx], mm0
add edx, 8
loop @B
- mfence
ret
InternalMemSetMem64 ENDP
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S index 0bb19c7da2..f51ce8f98e 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S @@ -21,19 +21,16 @@ # #------------------------------------------------------------------------------ - .686: - #.MODEL flat,C - .xmm: - .code: +.global _InternalMemZeroMem #------------------------------------------------------------------------------ # VOID * -# _mem_ZeroMem ( +# EFIAPI +# InternalMemZeroMem ( # IN VOID *Buffer, # IN UINTN Count -# ) +# ); #------------------------------------------------------------------------------ -.global _InternalMemZeroMem _InternalMemZeroMem: push %edi movl 8(%esp), %edi @@ -42,12 +39,11 @@ _InternalMemZeroMem: shrl $3, %ecx jz @ZeroBytes pxor %mm0, %mm0 -L0: - movntq %mm0, (%edi) +L0: + movq %mm0, (%edi) addl $8, %edi loop L0 - mfence -@ZeroBytes: +@ZeroBytes: andl $7, %edx xorl %eax, %eax movl %edx, %ecx diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm index 31ef120525..a75480bd40 100644 --- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm +++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm @@ -23,15 +23,15 @@ .686
.model flat,C
- .xmm
+ .mmx
.code
;------------------------------------------------------------------------------
; VOID *
-; _mem_ZeroMem (
+; InternalMemZeroMem (
; IN VOID *Buffer,
; IN UINTN Count
-; )
+; );
;------------------------------------------------------------------------------
InternalMemZeroMem PROC USES edi
mov edi, [esp + 8]
@@ -41,10 +41,9 @@ InternalMemZeroMem PROC USES edi jz @ZeroBytes
pxor mm0, mm0
@@:
- movntq [edi], mm0
+ movq [edi], mm0
add edi, 8
loop @B
- mfence
@ZeroBytes:
and edx, 7
xor eax, eax
|