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

6 files changed, 3 insertions, 67 deletions

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index f78f10568a..f8f442ce58 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -354,7 +354,7 @@
   Ia32/LShiftU64.S | GCC 

   SynchronizationGcc.c  | GCC

 

-  Ia32DivS64x64Remainder.c

+  Ia32/DivS64x64Remainder.c

   Ia32/InternalSwitchStack.c

   Ia32/Non-existing.c

   Unaligned.c

diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index fc10461ec5..237b9fe182 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
@@ -12,11 +12,8 @@
 

 **/

 

-

 #include <BaseLibInternals.h>

 

-#if _MSC_EXTENSIONS

-

 /**

   Disables the 32-bit paging mode on the CPU.

 

@@ -78,5 +75,3 @@ InternalX86DisablePaging32 (
     jmp     $                           // EntryPoint() should not return

   }

 }

-

-#endif

diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index c5e894f287..ca150c878b 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -12,7 +12,7 @@
 

 **/

 

-#include "BaseLibInternals.h"

+#include <BaseLibInternals.h>

 

 /**

   Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and

diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index 8d963e15d0..e20dcd175f 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
@@ -1,7 +1,7 @@
 /** @file

   AsmEnablePaging32 function

 

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>

+  Copyright (c) 2006 - 2008, Intel Corporation<BR>

   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

@@ -12,11 +12,8 @@
 

 **/

 

-

 #include <BaseLibInternals.h>

 

-#if _MSC_EXTENSIONS

-

 /**

   Enables the 32-bit paging mode on the CPU.

 

@@ -82,4 +79,3 @@ InternalX86EnablePaging32 (
   }

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index 0af0f6b24d..73355c0ea6 100644
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
@@ -12,10 +12,8 @@
 

 **/

 

-

 #include <BaseLibInternals.h>

 

-

 /**

   Transfers control to a function starting with a new stack.

 

diff --git a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
deleted file mode 100644
index c5e894f287..0000000000
--- a/MdePkg/Library/BaseLib/Ia32DivS64x64Remainder.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file

-  Integer division worker functions for Ia32.

-

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  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.

-

-**/

-

-#include "BaseLibInternals.h"

-

-/**

-  Worker function that Divides a 64-bit signed integer by a 64-bit signed integer and

-  generates a  64-bit signed result and a optional 64-bit signed remainder.

-

-  This function divides the 64-bit signed value Dividend by the 64-bit

-  signed value Divisor and generates a 64-bit signed quotient. If Remainder

-  is not NULL, then the 64-bit signed remainder is returned in Remainder.

-  This function returns the 64-bit signed quotient.

-

-  @param  Dividend  A 64-bit signed value.

-  @param  Divisor   A 64-bit signed value.

-  @param  Remainder A pointer to a 64-bit signed value. This parameter is

-                    optional and may be NULL.

-

-  @return Dividend / Divisor

-

-**/

-INT64

-EFIAPI

-InternalMathDivRemS64x64 (

-  IN      INT64                     Dividend,

-  IN      INT64                     Divisor,

-  OUT     INT64                     *Remainder  OPTIONAL

-  )

-{

-  INT64                             Quot;

-

-  Quot = InternalMathDivRemU64x64 (

-           Dividend >= 0 ? Dividend : -Dividend,

-           Divisor >= 0 ? Divisor : -Divisor,

-           (UINT64 *) Remainder

-           );

-  if (Remainder != NULL && Dividend < 0) {

-    *Remainder = -*Remainder;

-  }

-  return (Dividend ^ Divisor) >= 0 ? Quot : -Quot;

-}