1. Added '#pragma pack' directive in BaseLib.h for the structure IA32_DESCRIPTOR

2. Updated SetMem64.asm's to remove any SSE3 instructions.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@901 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 55 insertions, 55 deletions

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index ca3fdbf3fe..ea61da14ca 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -134,7 +134,7 @@ typedef struct {
   If Source is NULL, then ASSERT().

   If Source and Destination overlap, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than

-  PcdMaximumUnicodeStringLength Unicode characters not including the 

+  PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

 

   @param  Destination Pointer to a Null-terminated Unicode string.

@@ -166,7 +166,7 @@ StrCpy (
   If Source is NULL, then ASSERT().

   If Source and Destination overlap, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than

-  PcdMaximumUnicodeStringLength Unicode characters not including the 

+  PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

 

   @param  Destination Pointer to a Null-terminated Unicode string.

@@ -191,7 +191,7 @@ StrnCpy (
 

   If String is NULL, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and String contains more than

-  PcdMaximumUnicodeStringLength Unicode characters not including the 

+  PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

 

   @param  String  Pointer to a Null-terminated Unicode string.

@@ -213,7 +213,7 @@ StrLen (
 

   If String is NULL, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and String contains more than

-  PcdMaximumUnicodeStringLength Unicode characters not including the 

+  PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

 

   @param  String  Pointer to a Null-terminated Unicode string.

@@ -239,10 +239,10 @@ StrSize (
   If FirstString is NULL, then ASSERT().

   If SecondString is NULL, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more

-  than PcdMaximumUnicodeStringLength Unicode characters not including the 

+  than PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

   If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more

-  than PcdMaximumUnicodeStringLength Unicode characters not including the 

+  than PcdMaximumUnicodeStringLength Unicode characters not including the

   Null-terminator, then ASSERT().

 

   @param  FirstString   Pointer to a Null-terminated Unicode string.

@@ -751,7 +751,7 @@ InitializeListHead (
   If Entry is NULL, then ASSERT().

   If ListHead was not initialized with InitializeListHead(), then ASSERT().

   If PcdMaximumLinkedListLenth is not zero, and prior to insertion the number

-  of nodes in ListHead, including the ListHead node, is greater than or 

+  of nodes in ListHead, including the ListHead node, is greater than or

   equal to PcdMaximumLinkedListLength, then ASSERT().

 

   @param  ListHead  A pointer to the head node of a doubly linked list.

@@ -779,7 +779,7 @@ InsertHeadList (
   If Entry is NULL, then ASSERT().

   If ListHead was not initialized with InitializeListHead(), then ASSERT().

   If PcdMaximumLinkedListLenth is not zero, and prior to insertion the number

-  of nodes in ListHead, including the ListHead node, is greater than or 

+  of nodes in ListHead, including the ListHead node, is greater than or

   equal to PcdMaximumLinkedListLength, then ASSERT().

 

   @param  ListHead  A pointer to the head node of a doubly linked list.

@@ -805,8 +805,8 @@ InsertTailList (
 

   If List is NULL, then ASSERT().

   If List was not initialized with InitializeListHead(), then ASSERT().

-  If PcdMaximumLinkedListLenth is not zero, and the number of nodes 

-  in List, including the List node, is greater than or equal to 

+  If PcdMaximumLinkedListLenth is not zero, and the number of nodes

+  in List, including the List node, is greater than or equal to

   PcdMaximumLinkedListLength, then ASSERT().

 

   @param  List  A pointer to the head node of a doubly linked list.

@@ -857,8 +857,8 @@ GetNextNode (
 

   If ListHead is NULL, then ASSERT().

   If ListHead was not initialized with InitializeListHead(), then ASSERT().

-  If PcdMaximumLinkedListLenth is not zero, and the number of nodes 

-  in List, including the List node, is greater than or equal to 

+  If PcdMaximumLinkedListLenth is not zero, and the number of nodes

+  in List, including the List node, is greater than or equal to

   PcdMaximumLinkedListLength, then ASSERT().

 

   @param  ListHead  A pointer to the head node of a doubly linked list.

@@ -883,8 +883,8 @@ IsListEmpty (
   If List is NULL, then ASSERT().

   If Node is NULL, then ASSERT().

   If List was not initialized with InitializeListHead(), then ASSERT().

-  If PcdMaximumLinkedListLenth is not zero, and the number of nodes 

-  in List, including the List node, is greater than or equal to 

+  If PcdMaximumLinkedListLenth is not zero, and the number of nodes

+  in List, including the List node, is greater than or equal to

   PcdMaximumLinkedListLength, then ASSERT().

   If Node is not a node in List and Node is not equal to List, then ASSERT().

 

@@ -912,8 +912,8 @@ IsNull (
   If List is NULL, then ASSERT().

   If Node is NULL, then ASSERT().

   If List was not initialized with InitializeListHead(), then ASSERT().

-  If PcdMaximumLinkedListLenth is not zero, and the number of nodes 

-  in List, including the List node, is greater than or equal to 

+  If PcdMaximumLinkedListLenth is not zero, and the number of nodes

+  in List, including the List node, is greater than or equal to

   PcdMaximumLinkedListLength, then ASSERT().

   If Node is not a node in List, then ASSERT().

 

@@ -947,7 +947,7 @@ IsNodeAtEnd (
   If SecondEntry and FirstEntry are not in the same linked list, then ASSERT().

   If PcdMaximumLinkedListLength is not zero, and the number of nodes in the

   linked list containing the FirstEntry and SecondEntry nodes, including

-  the FirstEntry and SecondEntry nodes, is greater than or equal to 

+  the FirstEntry and SecondEntry nodes, is greater than or equal to

   PcdMaximumLinkedListLength, then ASSERT().

 

   @param  FirstEntry  A pointer to a node in a linked list.

@@ -973,8 +973,8 @@ SwapListEntries (
 

   If Entry is NULL, then ASSERT().

   If Entry is the head node of an empty list, then ASSERT().

-  If PcdMaximumLinkedListLength is not zero, and the number of nodes in the 

-  linked list containing Entry, including the Entry node, is greater than 

+  If PcdMaximumLinkedListLength is not zero, and the number of nodes in the

+  linked list containing Entry, including the Entry node, is greater than

   or equal to PcdMaximumLinkedListLength, then ASSERT().

 

   @param  Entry A pointer to a node in a linked list

@@ -2905,10 +2905,12 @@ typedef union {
 // Byte packed structure for an IDTR, GDTR, LDTR descriptor

 /// @bug  How to make this structure byte-packed in a compiler independent way?

 //

+#pragma pack (1)

 typedef struct {

   UINT16  Limit;

   UINTN   Base;

 } IA32_DESCRIPTOR;

+#pragma pack ()

 

 #define IA32_IDT_GATE_TYPE_TASK          0x85

 #define IA32_IDT_GATE_TYPE_INTERRUPT_16  0x86

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
index b607608505..310f418d0c 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
@@ -34,14 +34,14 @@
 ;    IN UINT64 Value

 ;    )

 ;------------------------------------------------------------------------------

-InternalMemSetMem64 PROC    USES    edi

-    movq    mm0, [esp + 16]

-    mov     ecx, [esp + 12]

-    mov     edi, [esp + 8]

-    mov     eax, edi

+InternalMemSetMem64 PROC

+    mov     eax, [esp + 4]

+    mov     ecx, [esp + 8]

+    movq    mm0, [esp + 12]

+    mov     edx, eax

 @@:

-    movntq  [edi], mm0

-    add     edi, 8

+    movntq  [edx], mm0

+    add     edx, 8

     loop    @B

     mfence

     ret

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index 1ddc7ea191..c5d75c6f2b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
@@ -28,34 +28,34 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem64 (

+;  InternalMemSetMem64 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT64 Value

 ;    )

 ;------------------------------------------------------------------------------

-InternalMemSetMem64 PROC    USES    edi

-    mov     ecx, [esp + 12]

-    mov     edi, [esp + 8]

-    test    edi, 8

-    DB      0f2h, 0fh, 12h, 44h, 24h, 16    ; movddup xmm0, [esp + 16]

+InternalMemSetMem64 PROC

+    mov     eax, [esp + 4]

+    mov     ecx, [esp + 8]

+    test    al, 8

+    mov     edx, eax

+    movq    xmm0, [esp + 12]

     jz      @F

-    movq    [edi], xmm0

-    add     edi, 8

+    movq    [edx], xmm0

+    add     edx, 8

     dec     ecx

 @@:

-    mov     edx, ecx

     shr     ecx, 1

     jz      @SetQwords

+    movlhps xmm0, xmm0

 @@:

-    movntdq [edi], xmm0

-    add     edi, 16

+    movntdq [edx], xmm0

+    lea     edx, [edx + 16]

     loop    @B

     mfence

 @SetQwords:

-    test    dl, 1

-    jz      @F

-    movq    [edi], xmm0

+    jnc     @F

+    movq    [edx], xmm0

 @@:

     ret

 InternalMemSetMem64 ENDP

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
index 8b33386ad0..ef94c562b5 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
@@ -25,35 +25,33 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem64 (

+;  InternalMemSetMem64 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

-;    IN UINT8  Value

+;    IN UINT64 Value

 ;    )

 ;------------------------------------------------------------------------------

-InternalMemSetMem64 PROC    USES    rdi

-    mov     rdi, rcx

-    mov     r9, rcx

-    test    cl, 8

+InternalMemSetMem64 PROC

+    mov     rax, rcx

+    test    dl, 8

+    xchg    rcx, rdx

     jz      @F

-    mov     [rdi], r8

-    add     rdi, 8

-    dec     rdx

+    mov     [rdx], r8

+    add     rdx, 8

+    dec     rcx

 @@:

-    mov     rcx, rdx

     shr     rcx, 1

     jz      @SetQwords

     movd    xmm0, r8

     movlhps xmm0, xmm0

 @@:

-    movntdq [rdi], xmm0

-    add     rdi, 16

+    movntdq [rdx], xmm0

+    lea     rdx, [rdx + 16]

     loop    @B

     mfence

 @SetQwords:

-    test    dl, 1

-    jz      @F

-    mov     [rdi], r8

+    jnc     @F

+    mov     [rdx], r8

 @@:

     ret

 InternalMemSetMem64 ENDP