move Ia32DivS64x64Remainder.c to Ia32/DivS64x64Remainder.c.

remove #ifdef _MS_EXTENTION_, since those files has been assigned to MS compiler in INF file.

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

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index f78f10568ae48410831cd4e80e262024e8424d22..f8f442ce58abd32a8cc7cf592ff6dade7b1f9cdd 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -354,7 +354,7 @@
   Ia32/LShiftU64.S | GCC \r
   SynchronizationGcc.c  | GCC\r
 \r
-  Ia32DivS64x64Remainder.c\r
+  Ia32/DivS64x64Remainder.c\r
   Ia32/InternalSwitchStack.c\r
   Ia32/Non-existing.c\r
   Unaligned.c\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index fc10461ec591f797224f8fedfaf296659946c991..237b9fe182c9b74fc20115e208499f454580828a 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
@@ -12,11 +12,8 @@
 \r
 **/\r
 \r
-\r
 #include <BaseLibInternals.h>\r
 \r
-#if _MSC_EXTENSIONS\r
-\r
 /**\r
   Disables the 32-bit paging mode on the CPU.\r
 \r
@@ -78,5 +75,3 @@ InternalX86DisablePaging32 (
     jmp     $                           // EntryPoint() should not return\r
   }\r
 }\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index c5e894f28794d5497dd5369de78601b3118a8749..ca150c878bb3f90dc49db4280aa42ebdbfa91e68 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -12,7 +12,7 @@
 \r
 **/\r
 \r
-#include "BaseLibInternals.h"\r
+#include <BaseLibInternals.h>\r
 \r
 /**\r
   Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and\r

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index 8d963e15d0c32fae26588ff8a5b2e266e6c58df2..e20dcd175fcf5f8cd270da0b4b11e30980cf523c 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
@@ -1,7 +1,7 @@
 /** @file\r
   AsmEnablePaging32 function\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
@@ -12,11 +12,8 @@
 \r
 **/\r
 \r
-\r
 #include <BaseLibInternals.h>\r
 \r
-#if _MSC_EXTENSIONS\r
-\r
 /**\r
   Enables the 32-bit paging mode on the CPU.\r
 \r
@@ -82,4 +79,3 @@ InternalX86EnablePaging32 (
   }\r
 }\r
 \r
-#endif\r

diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index 0af0f6b24d0a12226b7294038e9228df3df5a255..73355c0ea6080da5da8bf75446f34ea107651485 100644 (file)
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
@@ -12,10 +12,8 @@
 \r
 **/\r
 \r
-\r
 #include <BaseLibInternals.h>\r
 \r
-\r
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r

diff --git a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
deleted file mode 100644 (file)
index c5e894f..0000000
--- a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file\r
-  Integer division worker functions for Ia32.\r
-\r
-  Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
-**/\r
-\r
-#include "BaseLibInternals.h"\r
-\r
-/**\r
-  Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and\r
-  generates a  64-bit signed result and a optional 64-bit signed remainder.\r
-\r
-  This function divides the 64-bit signed value Dividend by the 64-bit\r
-  signed value Divisor and generates a 64-bit signed quotient. If Remainder\r
-  is not NULL, then the 64-bit signed remainder is returned in Remainder.\r
-  This function returns the 64-bit signed quotient.\r
-\r
-  @param  Dividend  A 64-bit signed value.\r
-  @param  Divisor   A 64-bit signed value.\r
-  @param  Remainder A pointer to a 64-bit signed value. This parameter is\r
-                    optional and may be NULL.\r
-\r
-  @return Dividend / Divisor\r
-\r
-**/\r
-INT64\r
-EFIAPI\r
-InternalMathDivRemS64x64 (\r
-  IN      INT64                     Dividend,\r
-  IN      INT64                     Divisor,\r
-  OUT     INT64                     *Remainder  OPTIONAL\r
-  )\r
-{\r
-  INT64                             Quot;\r
-\r
-  Quot = InternalMathDivRemU64x64 (\r
-           Dividend >= 0 ? Dividend : -Dividend,\r
-           Divisor >= 0 ? Divisor : -Divisor,\r
-           (UINT64 *) Remainder\r
-           );\r
-  if (Remainder != NULL && Dividend < 0) {\r
-    *Remainder = -*Remainder;\r
-  }\r
-  return (Dividend ^ Divisor) >= 0 ? Quot : -Quot;\r
-}\r