1. Add Assert in SetJump.S

2. Rename internal function of ModU64x32.S to avoid collision.

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

diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S b/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
index ed9c2fee258e9c04d126673f391cd2c43698685a..a8e9574b2dabb921d7917004a068bc7579648a33 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
+++ b/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
@@ -11,7 +11,7 @@
 #\r
 # Module Name:\r
 #\r
-#   DivU64x32.asm\r
+#   DivU64x32.S\r
 #\r
 # Abstract:\r
 #\r
@@ -23,8 +23,8 @@
 \r
      \r
 \r
-.global _ModU64x32\r
-_ModU64x32: \r
+.global _InternalMathModU64x32\r
+_InternalMathModU64x32: \r
     movl    8(%esp),%eax\r
     movl    12(%esp),%ecx\r
     xorl    %edx,%edx\r

diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.S b/MdePkg/Library/BaseLib/Ia32/SetJump.S
index b1b6a84f631f7f9c00f4fda1a2dd43a64c1b4f25..05acc4ab2620fb7b7cdff8cd7e19e859d695da3c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.S
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.S
@@ -23,8 +23,11 @@
 \r
      \r
 \r
-.global _SetJump\r
+.global _SetJump, _InternalAssertJumpBuffer\r
 _SetJump: \r
+    pushl   0x4(%esp)\r
+    call    _InternalAssertJumpBuffer\r
+    popl    %ecx\r
     popl    %ecx\r
     movl    (%esp),%edx\r
     movl    %ebx,(%edx)\r