1.Fix SetMem64.S to not use SSE3 instruction

2.Make sure NULL-terminator can be appended.

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

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
index 2535a61aca49e232980eed7b759b8e5ee7155e87..fa60007f5ae09d6f24edc48641f3e8e0195a6a87 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
@@ -1,63 +1,59 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, Intel Corporation
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-# Module Name:
-#
-#   SetMem64.asm
-#
-# Abstract:
-#
-#   SetMem64 function
-#
-# Notes:
-#
-#------------------------------------------------------------------------------
-
-    .686: 
-    #.MODEL flat,C
-    .xmm: 
-    .code: 
-
-#------------------------------------------------------------------------------
-#  VOID *
-#  _mem_SetMem64 (
-#    IN VOID   *Buffer,
-#    IN UINTN  Count,
-#    IN UINT64 Value
-#    )
-#------------------------------------------------------------------------------
-.global _InternalMemSetMem64
-_InternalMemSetMem64:
-    push    %edi
-    movl    12(%esp), %ecx
-    movl    8(%esp), %edi
-    testl   $8, %edi
-    movddup 16(%esp), %xmm0
-    jz      L0
-    movq    %xmm0, (%edi)
-    addl    $8, %edi
-    decl    %ecx
-L0: 
-    movl    %ecx, %edx
-    shrl    %ecx
-    jz      @SetQwords
-L1: 
-    movntdq %xmm0, (%edi)
-    addl    $16, %edi
-    loop    L1
-    mfence
-@SetQwords: 
-    testb   $1, %dl
-    jz      L2
-    movq    %xmm0, (%edi)
-L2: 
-    pop     %edi
-    ret
+#------------------------------------------------------------------------------\r
+#\r
+# Copyright (c) 2006, Intel Corporation\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+# Module Name:\r
+#\r
+#   SetMem64.S\r
+#\r
+# Abstract:\r
+#\r
+#   SetMem64 function\r
+#\r
+# Notes:\r
+#\r
+#------------------------------------------------------------------------------\r
+\r
+#------------------------------------------------------------------------------\r
+#  VOID *\r
+#  InternalMemSetMem64 (\r
+#    IN VOID   *Buffer,\r
+#    IN UINTN  Count,\r
+#    IN UINT64 Value\r
+#    )\r
+#------------------------------------------------------------------------------\r
+.globl _InternalMemSetMem64\r
+_InternalMemSetMem64:\r
+    movl    4(%esp), %eax\r
+    movl    8(%esp), %ecx\r
+    testb   $8, %al\r
+    movl    %eax, %edx\r
+    movq    0xc(%esp), %xmm0\r
+    jz      L1\r
+    movq    %xmm0, (%edx)\r
+    addl    $8, %edx\r
+    decl    %ecx\r
+L1: \r
+    shrl    %ecx\r
+    jz      @SetQwords\r
+    movlhps %xmm0, %xmm0\r
+L2: \r
+    movntdq %xmm0, (%edx)\r
+    leal    16(%edx), %edx\r
+    loop    L2\r
+    mfence\r
+@SetQwords: \r
+    jnc     L3\r
+    movq    %xmm0, (%edx)\r
+L3: \r
+    ret\r
+\r
+\r
+\r

diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/MdePkg/Library/BasePrintLib/PrintLib.c
index 6b4f1fad4a49f6a561357d674b064d52f32af4dc..455fd60526f4d894ef055c4db2e58286e7cddcad 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLib.c
+++ b/MdePkg/Library/BasePrintLib/PrintLib.c
@@ -550,7 +550,7 @@ BasePrintLibVSPrint (
   //\r
   // Null terminate the Unicode or ASCII string\r
   //\r
-  BasePrintLibFillBuffer (Buffer, EndBuffer, 1, 0, BytesPerOutputCharacter);\r
+  BasePrintLibFillBuffer (Buffer, EndBuffer + BytesPerOutputCharacter, 1, 0, BytesPerOutputCharacter);\r
   //\r
   // Make sure output buffer cannot contain more than PcdMaximumUnicodeStringLength\r
   // Unicode characters if PcdMaximumUnicodeStringLength is not zero. \r

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 0a75a3c58114e04614d0ec31c3b136602798d6c1..a52e1d4a6a3171f499f1cd1560c9035e35eb6319 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -193,7 +193,7 @@ BasePrintLibConvertValueToString (
     }\r
   }\r
 \r
-  BasePrintLibFillBuffer (Buffer, EndBuffer, 1, 0, Increment);\r
+  BasePrintLibFillBuffer (Buffer, EndBuffer + Increment, 1, 0, Increment);\r
 \r
   return ((Buffer - OriginalBuffer) / Increment);\r
 }\r