Resync the GNU assembly to the MASM code.

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

diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.s b/MdePkg/Library/BaseLib/Ia32/DivU64x32.s
index 689c7092c06442787bd849efef57e4fcb93a6e67..89d754614afd81759222eb273c7e51b843cd741d 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.s
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32.s
@@ -1,39 +1,35 @@
-#------------------------------------------------------------------------------\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
-#   DivU64x32.asm\r
-#\r
-# Abstract:\r
-#\r
-#   Calculate the quotient of a 64-bit integer by a 32-bit integer\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-\r
-     \r
-\r
-.global _DivU64x32\r
-_DivU64x32: \r
-    movl    8(%esp),%eax\r
-    movl    12(%esp),%ecx\r
-    xorl    %edx,%edx\r
-    divl    %ecx\r
-    pushl   %eax\r
-    movl    8(%esp),%eax\r
-    divl    %ecx\r
-    popl    %edx\r
-    ret\r
-\r
-\r
-\r
+#------------------------------------------------------------------------------
+#
+# 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:
+#
+#   DivU64x32.asm
+#
+# Abstract:
+#
+#   Calculate the quotient of a 64-bit integer by a 32-bit integer
+#
+#------------------------------------------------------------------------------
+
+    .386: 
+    .code: 
+
+.global _InternalMathDivU64x32
+_InternalMathDivU64x32:
+    movl    8(%esp),%eax
+    movl    12(%esp),%ecx
+    xorl    %edx,%edx
+    divl    %ecx
+    pushl   %eax
+    movl    8(%esp),%eax
+    divl    %ecx
+    popl    %edx
+    ret

diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.s b/MdePkg/Library/BaseLib/Ia32/LShiftU64.s
index 94cbc12265fcf101c34d949183d50d8dd4e63f4c..4aa17c637dfdbafca4e9b85777719f9d4b4a22de 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.s
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.s
@@ -1,39 +1,36 @@
-#------------------------------------------------------------------------------\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
-#   LShiftU64.asm\r
-#\r
-# Abstract:\r
-#\r
-#   64-bit left shift function for IA-32\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-\r
-     \r
-\r
-.global _LShiftU64\r
-_LShiftU64: \r
-    movb    12(%esp),%cl\r
-    xorl    %eax,%eax\r
-    movl    4(%esp),%edx\r
-    testb   $32,%cl\r
-    cmovz   %edx, %eax\r
-    cmovz   8(%esp), %edx\r
-    shldl   %cl,%eax,%edx\r
-    shll    %cl,%eax\r
-    ret\r
-\r
-\r
-\r
+#------------------------------------------------------------------------------
+#
+# 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:
+#
+#   LShiftU64.asm
+#
+# Abstract:
+#
+#   64-bit left shift function for IA-32
+#
+#------------------------------------------------------------------------------
+
+    .686: 
+    #.MODEL flat,C
+    .code: 
+
+.global _InternalMathLShiftU64
+_InternalMathLShiftU64:
+    movb    12(%esp), %cl
+    xorl    %eax, %eax
+    movl    4(%esp), %edx
+    testb   $32, %cl
+    cmovz   %edx, %eax
+    cmovz   0x8(%esp), %edx
+    shld    %cl,%eax,%edx
+    shl     %cl, %eax
+    ret

diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.s b/MdePkg/Library/BaseLib/Ia32/MultU64x32.s
index 03c520bcf7169782e33a9c485986a182a8a98300..572a312de8f4ad2341c7438b19e3f9cf4969ac56 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.s
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.s
@@ -1,36 +1,32 @@
-#------------------------------------------------------------------------------\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
-#   MultU64x32.asm\r
-#\r
-# Abstract:\r
-#\r
-#   Calculate the product of a 64-bit integer and a 32-bit integer\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-\r
-     \r
-\r
-.global _MultU64x32\r
-_MultU64x32: \r
-    movl    12(%esp),%ecx\r
-    movl    %ecx,%eax\r
-    imull   8(%esp),%ecx\r
-    mull    4(%esp)\r
-    addl    %ecx,%edx\r
-    ret\r
-\r
-\r
-\r
+#------------------------------------------------------------------------------
+#
+# 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:
+#
+#   MultU64x32.asm
+#
+# Abstract:
+#
+#   Calculate the product of a 64-bit integer and a 32-bit integer
+#
+#------------------------------------------------------------------------------
+
+    .386: 
+    .code: 
+
+.global _InternalMathMultU64x32
+_InternalMathMultU64x32:
+    movl    12(%esp),%ecx
+    movl    %ecx,%eax
+    imull   8(%esp),%ecx
+    mull   0x4(%esp)
+    addl    %ecx,%edx
+    ret

diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.s b/MdePkg/Library/BaseLib/Ia32/RShiftU64.s
index 5b681e391be237d2b92cd6bb65089759c17bcaa8..efedcf751b41d026d8b92ea267eca9b5fb064a5c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.s
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.s
@@ -1,39 +1,35 @@
-#------------------------------------------------------------------------------\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
-#   RShiftU64.asm\r
-#\r
-# Abstract:\r
-#\r
-#   64-bit logical right shift function for IA-32\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-\r
-     \r
-\r
-.global _RShiftU64\r
-_RShiftU64: \r
-    movb    12(%esp),%cl\r
-    xorl    %edx,%edx\r
-    movl    8(%esp),%eax\r
-    testb   $32,%cl\r
-    cmovz   %eax, %edx\r
-    cmovz   4(%esp), %eax\r
-    shrdl   %cl,%edx,%eax\r
-    shrl    %cl,%edx\r
-    ret\r
-\r
-\r
-\r
+#------------------------------------------------------------------------------
+#
+# 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:
+#
+#   RShiftU64.asm
+#
+# Abstract:
+#
+#   64-bit logical right shift function for IA-32
+#
+#------------------------------------------------------------------------------
+
+    .686: 
+    .code: 
+
+.global InternalMathRShiftU64
+_InternalMathRShiftU64:
+    movb    12(%esp),%cl
+    xorl    %edx,%edx
+    movl    8(%esp),%eax
+    testb   $32,%cl
+    cmovz   %eax, %edx
+    cmovz   0x4(%esp), %eax
+    shrdl   %cl,%edx,%eax
+    shr     %cl,%edx
+    ret