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
This commit is contained in:
bxing
2006-07-28 07:28:19 +00:00
parent 27169a56e6
commit eb227e96bd
106 changed files with 1006 additions and 457 deletions

View File

@@ -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

View File

@@ -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]

View File

@@ -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 %edi, %ecx
andl $15, %ecx # ecx + edi aligns on 16-byte boundary
@@ -56,16 +53,16 @@ L0:
subl %ecx, %edx # edx <- remaining bytes to copy
rep
movsb
L1:
L1:
movl %edx, %ecx
andl $15, %edx
shrl $4, %ecx # ecx <- # of DQwords to copy
jz @CopyBytes
addl $-16, %esp
movdqu %xmm0, (%esp)
L2:
L2:
movdqu (%esi), %xmm0
movntdq %xmm0, (%edi)
movntdq %xmm0, (%edi)
addl $16, %esi
addl $16, %edi
loop L2
@@ -73,11 +70,11 @@ L2:
movdqu (%esp),%xmm0
addl $16, %esp # 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

View File

@@ -28,20 +28,20 @@
;------------------------------------------------------------------------------
; VOID *
; _mem_CopyMem (
; 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
@@ -70,8 +70,8 @@ InternalMemCopyMem PROC USES esi edi
add esp, 16 ; 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

View File

@@ -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

View File

@@ -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]

View File

@@ -27,17 +27,23 @@
#
#------------------------------------------------------------------------------
.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
movl 8(%esp), %edi
movl 16(%esp), %eax
repnz scasl
repne scasl
leal -4(%edi), %eax
cmovnz %ecx, %eax
pop %edi

View File

@@ -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]

View File

@@ -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

View File

@@ -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]

View File

@@ -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

View File

@@ -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]

View File

@@ -21,10 +21,10 @@
#
#------------------------------------------------------------------------------
.686:
.686:
#.MODEL flat,C
.xmm:
.code:
.xmm:
.code:
#------------------------------------------------------------------------------
# VOID *
@@ -32,7 +32,7 @@
# IN VOID *Buffer,
# IN UINTN Count,
# IN UINT8 Value
# )
# );
#------------------------------------------------------------------------------
.global _InternalMemSetMem
_InternalMemSetMem:
@@ -49,7 +49,7 @@ _InternalMemSetMem:
subl %ecx, %edx
rep
stosb
L0:
L0:
movl %edx, %ecx
andl $15, %edx
shrl $4, %ecx # ecx <- # of DQwords to set
@@ -60,14 +60,14 @@ L0:
movd %eax, %xmm0
pshuflw $0, %xmm0, %xmm0
movlhps %xmm0, %xmm0
L1:
L1:
movntdq %xmm0, (%edi)
addl $16, %edi
loop L1
mfence
movdqu (%esp), %xmm0
addl $16, %esp # stack cleanup
@SetBytes:
@SetBytes:
movl %edx, %ecx
rep
stosb

View File

@@ -28,11 +28,12 @@
;------------------------------------------------------------------------------
; VOID *
; _mem_SetMem (
; EFIAPI
; InternalMemSetMem (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT8 Value
; )
; );
;------------------------------------------------------------------------------
InternalMemSetMem PROC USES edi
mov edx, [esp + 12] ; edx <- Count

View File

@@ -21,20 +21,17 @@
#
#------------------------------------------------------------------------------
.686:
#.MODEL flat,C
.xmm:
.code:
.global _InternalMemSetMem16
#------------------------------------------------------------------------------
# VOID *
# _mem_SetMem16 (
# EFIAPI
# InternalMemSetMem16 (
# IN VOID *Buffer,
# IN UINTN Count,
# IN UINT16 Value
# )
#------------------------------------------------------------------------------
.global _InternalMemSetMem16
_InternalMemSetMem16:
push %edi
movl 12(%esp), %edx
@@ -50,7 +47,7 @@ _InternalMemSetMem16:
subl %ecx, %edx
rep
stosw
L0:
L0:
movl %edx, %ecx
andl $7, %edx
shrl $3, %ecx
@@ -63,7 +60,7 @@ L1:
addl $16, %edi
loop L1
mfence
@SetWords:
@SetWords:
movl %edx, %ecx
rep
stosw

View File

@@ -28,11 +28,12 @@
;------------------------------------------------------------------------------
; VOID *
; _mem_SetMem16 (
; EFIAPI
; InternalMemSetMem16 (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT16 Value
; )
; );
;------------------------------------------------------------------------------
InternalMemSetMem16 PROC USES edi
mov edx, [esp + 12]

View File

@@ -21,20 +21,17 @@
#
#------------------------------------------------------------------------------
.686:
#.MODEL flat,C
.xmm:
.code:
.global _InternalMemSetMem32
#------------------------------------------------------------------------------
# VOID *
# _mem_SetMem32 (
# EFIAPI
# InternalMemSetMem32 (
# IN VOID *Buffer,
# IN UINTN Count,
# IN UINT32 Value
# )
# );
#------------------------------------------------------------------------------
.global _InternalMemSetMem32
_InternalMemSetMem32:
push %edi
movl 12(%esp), %edx
@@ -50,19 +47,19 @@ _InternalMemSetMem32:
subl %ecx, %edx
rep
stosl
L0:
L0:
movl %edx, %ecx
andl $3, %edx
shrl $2, %ecx
jz @SetDwords
movd %eax, %xmm0
pshufd $0, %xmm0, %xmm0
L1:
L1:
movntdq %xmm0, (%edi)
addl $16, %edi
loop L1
mfence
@SetDwords:
@SetDwords:
movl %edx, %ecx
rep
stosl

View File

@@ -28,11 +28,12 @@
;------------------------------------------------------------------------------
; VOID *
; _mem_SetMem32 (
; EFIAPI
; InternalMemSetMem32 (
; IN VOID *Buffer,
; IN UINTN Count,
; IN UINT32 Value
; )
; );
;------------------------------------------------------------------------------
InternalMemSetMem32 PROC USES edi
mov edx, [esp + 12]

View File

@@ -21,15 +21,17 @@
#
#------------------------------------------------------------------------------
.globl _InternalMemSetMem64
#------------------------------------------------------------------------------
# VOID *
# EFIAPI
# InternalMemSetMem64 (
# IN VOID *Buffer,
# IN UINTN Count,
# IN UINT64 Value
# )
# );
#------------------------------------------------------------------------------
.globl _InternalMemSetMem64
_InternalMemSetMem64:
movl 4(%esp), %eax
movl 8(%esp), %ecx
@@ -40,20 +42,17 @@ _InternalMemSetMem64:
movq %xmm0, (%edx)
addl $8, %edx
decl %ecx
L1:
L1:
shrl %ecx
jz @SetQwords
movlhps %xmm0, %xmm0
L2:
L2:
movntdq %xmm0, (%edx)
leal 16(%edx), %edx
loop L2
mfence
@SetQwords:
@SetQwords:
jnc L3
movq %xmm0, (%edx)
L3:
L3:
ret

View File

@@ -28,6 +28,7 @@
;------------------------------------------------------------------------------
; VOID *
; EFIAPI
; InternalMemSetMem64 (
; IN VOID *Buffer,
; IN UINTN Count,
@@ -35,8 +36,8 @@
; )
;------------------------------------------------------------------------------
InternalMemSetMem64 PROC
mov eax, [esp + 4]
mov ecx, [esp + 8]
mov eax, [esp + 4] ; eax <- Buffer
mov ecx, [esp + 8] ; ecx <- Count
test al, 8
mov edx, eax
movq xmm0, [esp + 12]

View File

@@ -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
@@ -48,18 +45,18 @@ _InternalMemZeroMem:
subl %ecx, %edx
rep
stosb
L0:
L0:
movl %edx, %ecx
andl $15, %edx
shrl $4, %ecx
jz @ZeroBytes
pxor %xmm0, %xmm0
L1:
L1:
movntdq %xmm0, (%edi)
addl $16, %edi
loop L1
mfence
@ZeroBytes:
@ZeroBytes:
movl %edx, %ecx
rep
stosb

View File

@@ -28,10 +28,11 @@
;------------------------------------------------------------------------------
; VOID *
; _mem_ZeroMem (
; EFIAPI
; InternalMemZeroMem (
; IN VOID *Buffer,
; IN UINTN Count
; )
; );
;------------------------------------------------------------------------------
InternalMemZeroMem PROC USES edi
mov edi, [esp + 8]