[ros-diffs] [tfaber] 56961: [CRT][NTDLL] - Separate some _CI* functions into their own files and export them from ntdll. Patch by Vincenzo Cotugno. See issue #7085 for more details.

Author: tfaber
Date: Tue Jul 24 16:45:50 2012
New Revision: 56961

URL: http://svn.reactos.org/svn/reactos?rev=56961&view=rev
Log:
[CRT][NTDLL]
- Separate some _CI* functions into their own files and export them from ntdll. Patch by
Vincenzo Cotugno.
See issue #7085 for more details.

Added:
    trunk/reactos/lib/sdk/crt/math/i386/cicos.c
      - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c
    trunk/reactos/lib/sdk/crt/math/i386/cilog.c
      - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c
    trunk/reactos/lib/sdk/crt/math/i386/cipow.c
      - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c
    trunk/reactos/lib/sdk/crt/math/i386/cisin.c
      - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c
    trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c
      - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c
Modified:
    trunk/reactos/dll/ntdll/def/ntdll.spec
    trunk/reactos/lib/sdk/crt/crt.cmake
    trunk/reactos/lib/sdk/crt/include/internal/math.h
    trunk/reactos/lib/sdk/crt/libcntpr.cmake
    trunk/reactos/lib/sdk/crt/math/i386/ci.c
    trunk/reactos/lib/sdk/crt/msvcrtex.cmake

Modified: trunk/reactos/dll/ntdll/def/ntdll.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r…
==============================================================================
--- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1292,11 +1292,11 @@
 @ stdcall ZwWriteRequestData(ptr ptr long ptr long ptr)
 @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr)
 @ stdcall ZwYieldExecution()
-;@ cdecl _CIcos
-;@ cdecl _CIlog
-;@ cdecl -private -arch=i386 _CIpow()
-;@ cdecl _CIsin
-;@ cdecl _CIsqrt
+@ cdecl -arch=i386 _CIcos()
+@ cdecl -arch=i386 _CIlog()
+@ cdecl -arch=i386 _CIpow()
+@ cdecl -arch=i386 _CIsin()
+@ cdecl -arch=i386 _CIsqrt()
 @ cdecl -arch=x86_64 __C_specific_handler(ptr long ptr ptr)
 @ cdecl __isascii(long)
 @ cdecl __iscsym(long)

Modified: trunk/reactos/lib/sdk/crt/crt.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=…
==============================================================================
--- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -131,11 +131,11 @@
     misc/stubs.c
     misc/tls.c
     printf/_cprintf.c
-	printf/_cwprintf.c
+    printf/_cwprintf.c
     printf/_snprintf.c
     printf/_snwprintf.c
     printf/_vcprintf.c
-	printf/_vcwprintf.c
+    printf/_vcwprintf.c
     printf/_vscprintf.c
     printf/_vscwprintf.c
     printf/_vsnprintf.c
@@ -377,6 +377,11 @@
         math/i386/tan_asm.s
         math/i386/atan2_asm.s
         math/i386/ci.c
+        math/i386/cicos.c
+        math/i386/cilog.c
+        math/i386/cipow.c
+        math/i386/cisin.c
+        math/i386/cisqrt.c
         math/i386/exp_asm.s
         math/i386/fmod_asm.s
         math/i386/fmodf_asm.s

Modified: trunk/reactos/lib/sdk/crt/include/internal/math.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern…
==============================================================================
--- trunk/reactos/lib/sdk/crt/include/internal/math.h [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/include/internal/math.h [iso-8859-1] Tue Jul 24 16:45:50
2012
@@ -9,4 +9,18 @@
 int     _isnanl         (long double); /* not exported */
 int     _isinfl         (long double); /* not exported */
 
+#if defined(__GNUC__)
+#define FPU_DOUBLE(var) double var; \
+    __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
+#define FPU_DOUBLES(var1,var2) double var1,var2; \
+    __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
+    __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
+#elif defined(_MSC_VER)
+#define FPU_DOUBLE(var) double var; \
+    __asm { fstp [var] }; __asm { fwait };
+#define FPU_DOUBLES(var1,var2) double var1,var2; \
+    __asm { fstp [var1] }; __asm { fwait }; \
+    __asm { fstp [var2] }; __asm { fwait };
 #endif
+
+#endif

Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake…
==============================================================================
--- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -94,6 +94,11 @@
         math/i386/sqrt_asm.s
         math/i386/tan_asm.s
         math/i386/ci.c
+        math/i386/cicos.c
+        math/i386/cilog.c
+        math/i386/cipow.c
+        math/i386/cisin.c
+        math/i386/cisqrt.c
         misc/i386/readcr4.S)
     if(NOT MSVC)
         list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_ms.s)

Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,36 +1,5 @@
 #include <precomp.h>
-#include <math.h>
 
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
-
-/*
- * @implemented
- */
-double	CDECL	_CIsin(void)
-{
-	FPU_DOUBLE(x);
-	return sin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcos(void)
-{
-	FPU_DOUBLE(x);
-	return cos(x);
-}
 /*
  * @implemented
  */
@@ -106,34 +75,10 @@
 /*
  * @implemented
  */
-double	CDECL	_CIlog(void)
-{
-	FPU_DOUBLE(x);
-	return log(x);
-}
-/*
- * @implemented
- */
 double	CDECL	_CIlog10(void)
 {
 	FPU_DOUBLE(x);
 	return log10(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIpow(void)
-{
-	FPU_DOUBLES(x, y);
-	return pow(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsqrt(void)
-{
-	FPU_DOUBLE(x);
-	return sqrt(x);
 }
 /*
  * @implemented

Copied: trunk/reactos/lib/sdk/crt/math/i386/cicos.c (from r56958,
trunk/reactos/lib/sdk/crt/math/i386/ci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cico…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/cicos.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,28 +1,5 @@
 #include <precomp.h>
-#include <math.h>
 
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
-
-/*
- * @implemented
- */
-double	CDECL	_CIsin(void)
-{
-	FPU_DOUBLE(x);
-	return sin(x);
-}
 /*
  * @implemented
  */
@@ -31,115 +8,3 @@
 	FPU_DOUBLE(x);
 	return cos(x);
 }
-/*
- * @implemented
- */
-double	CDECL	_CItan(void)
-{
-	FPU_DOUBLE(x);
-	return tan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsinh(void)
-{
-	FPU_DOUBLE(x);
-	return sinh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcosh(void)
-{
-	FPU_DOUBLE(x);
-	return cosh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItanh(void)
-{
-	FPU_DOUBLE(x);
-	return tanh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIasin(void)
-{
-	FPU_DOUBLE(x);
-	return asin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIacos(void)
-{
-	FPU_DOUBLE(x);
-	return acos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan(void)
-{
-	FPU_DOUBLE(x);
-	return atan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan2(void)
-{
-	FPU_DOUBLES(x, y);
-	return atan2(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIexp(void)
-{
-	FPU_DOUBLE(x);
-	return exp(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog(void)
-{
-	FPU_DOUBLE(x);
-	return log(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog10(void)
-{
-	FPU_DOUBLE(x);
-	return log10(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIpow(void)
-{
-	FPU_DOUBLES(x, y);
-	return pow(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsqrt(void)
-{
-	FPU_DOUBLE(x);
-	return sqrt(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIfmod(void)
-{
-	FPU_DOUBLES(x, y);
-	return fmod(x, y);
-}

Copied: trunk/reactos/lib/sdk/crt/math/i386/cilog.c (from r56958,
trunk/reactos/lib/sdk/crt/math/i386/ci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cilo…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/cilog.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,108 +1,5 @@
 #include <precomp.h>
-#include <math.h>
 
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
-
-/*
- * @implemented
- */
-double	CDECL	_CIsin(void)
-{
-	FPU_DOUBLE(x);
-	return sin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcos(void)
-{
-	FPU_DOUBLE(x);
-	return cos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItan(void)
-{
-	FPU_DOUBLE(x);
-	return tan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsinh(void)
-{
-	FPU_DOUBLE(x);
-	return sinh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcosh(void)
-{
-	FPU_DOUBLE(x);
-	return cosh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItanh(void)
-{
-	FPU_DOUBLE(x);
-	return tanh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIasin(void)
-{
-	FPU_DOUBLE(x);
-	return asin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIacos(void)
-{
-	FPU_DOUBLE(x);
-	return acos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan(void)
-{
-	FPU_DOUBLE(x);
-	return atan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan2(void)
-{
-	FPU_DOUBLES(x, y);
-	return atan2(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIexp(void)
-{
-	FPU_DOUBLE(x);
-	return exp(x);
-}
 /*
  * @implemented
  */
@@ -111,35 +8,3 @@
 	FPU_DOUBLE(x);
 	return log(x);
 }
-/*
- * @implemented
- */
-double	CDECL	_CIlog10(void)
-{
-	FPU_DOUBLE(x);
-	return log10(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIpow(void)
-{
-	FPU_DOUBLES(x, y);
-	return pow(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsqrt(void)
-{
-	FPU_DOUBLE(x);
-	return sqrt(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIfmod(void)
-{
-	FPU_DOUBLES(x, y);
-	return fmod(x, y);
-}

Copied: trunk/reactos/lib/sdk/crt/math/i386/cipow.c (from r56958,
trunk/reactos/lib/sdk/crt/math/i386/ci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cipo…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/cipow.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,124 +1,5 @@
 #include <precomp.h>
-#include <math.h>
 
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
-
-/*
- * @implemented
- */
-double	CDECL	_CIsin(void)
-{
-	FPU_DOUBLE(x);
-	return sin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcos(void)
-{
-	FPU_DOUBLE(x);
-	return cos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItan(void)
-{
-	FPU_DOUBLE(x);
-	return tan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsinh(void)
-{
-	FPU_DOUBLE(x);
-	return sinh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcosh(void)
-{
-	FPU_DOUBLE(x);
-	return cosh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItanh(void)
-{
-	FPU_DOUBLE(x);
-	return tanh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIasin(void)
-{
-	FPU_DOUBLE(x);
-	return asin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIacos(void)
-{
-	FPU_DOUBLE(x);
-	return acos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan(void)
-{
-	FPU_DOUBLE(x);
-	return atan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan2(void)
-{
-	FPU_DOUBLES(x, y);
-	return atan2(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIexp(void)
-{
-	FPU_DOUBLE(x);
-	return exp(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog(void)
-{
-	FPU_DOUBLE(x);
-	return log(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog10(void)
-{
-	FPU_DOUBLE(x);
-	return log10(x);
-}
 /*
  * @implemented
  */
@@ -127,19 +8,3 @@
 	FPU_DOUBLES(x, y);
 	return pow(x, y);
 }
-/*
- * @implemented
- */
-double	CDECL	_CIsqrt(void)
-{
-	FPU_DOUBLE(x);
-	return sqrt(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIfmod(void)
-{
-	FPU_DOUBLES(x, y);
-	return fmod(x, y);
-}

Copied: trunk/reactos/lib/sdk/crt/math/i386/cisin.c (from r56958,
trunk/reactos/lib/sdk/crt/math/i386/ci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cisi…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/cisin.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,19 +1,4 @@
 #include <precomp.h>
-#include <math.h>
-
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
 
 /*
  * @implemented
@@ -23,123 +8,3 @@
 	FPU_DOUBLE(x);
 	return sin(x);
 }
-/*
- * @implemented
- */
-double	CDECL	_CIcos(void)
-{
-	FPU_DOUBLE(x);
-	return cos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItan(void)
-{
-	FPU_DOUBLE(x);
-	return tan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsinh(void)
-{
-	FPU_DOUBLE(x);
-	return sinh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcosh(void)
-{
-	FPU_DOUBLE(x);
-	return cosh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItanh(void)
-{
-	FPU_DOUBLE(x);
-	return tanh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIasin(void)
-{
-	FPU_DOUBLE(x);
-	return asin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIacos(void)
-{
-	FPU_DOUBLE(x);
-	return acos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan(void)
-{
-	FPU_DOUBLE(x);
-	return atan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan2(void)
-{
-	FPU_DOUBLES(x, y);
-	return atan2(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIexp(void)
-{
-	FPU_DOUBLE(x);
-	return exp(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog(void)
-{
-	FPU_DOUBLE(x);
-	return log(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog10(void)
-{
-	FPU_DOUBLE(x);
-	return log10(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIpow(void)
-{
-	FPU_DOUBLES(x, y);
-	return pow(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsqrt(void)
-{
-	FPU_DOUBLE(x);
-	return sqrt(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIfmod(void)
-{
-	FPU_DOUBLES(x, y);
-	return fmod(x, y);
-}

Copied: trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c (from r56958,
trunk/reactos/lib/sdk/crt/math/i386/ci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cisq…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -1,132 +1,5 @@
 #include <precomp.h>
-#include <math.h>
 
-#if defined(__GNUC__)
-#define FPU_DOUBLE(var) double var; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : )
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
-	__asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
-#elif defined(_MSC_VER)
-#define FPU_DOUBLE(var) double var; \
-	__asm { fstp [var] }; __asm { fwait };
-#define FPU_DOUBLES(var1,var2) double var1,var2; \
-	__asm { fstp [var1] }; __asm { fwait }; \
-	__asm { fstp [var2] }; __asm { fwait };
-#endif
-
-/*
- * @implemented
- */
-double	CDECL	_CIsin(void)
-{
-	FPU_DOUBLE(x);
-	return sin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcos(void)
-{
-	FPU_DOUBLE(x);
-	return cos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItan(void)
-{
-	FPU_DOUBLE(x);
-	return tan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIsinh(void)
-{
-	FPU_DOUBLE(x);
-	return sinh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIcosh(void)
-{
-	FPU_DOUBLE(x);
-	return cosh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CItanh(void)
-{
-	FPU_DOUBLE(x);
-	return tanh(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIasin(void)
-{
-	FPU_DOUBLE(x);
-	return asin(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIacos(void)
-{
-	FPU_DOUBLE(x);
-	return acos(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan(void)
-{
-	FPU_DOUBLE(x);
-	return atan(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIatan2(void)
-{
-	FPU_DOUBLES(x, y);
-	return atan2(x, y);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIexp(void)
-{
-	FPU_DOUBLE(x);
-	return exp(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog(void)
-{
-	FPU_DOUBLE(x);
-	return log(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIlog10(void)
-{
-	FPU_DOUBLE(x);
-	return log10(x);
-}
-/*
- * @implemented
- */
-double	CDECL	_CIpow(void)
-{
-	FPU_DOUBLES(x, y);
-	return pow(x, y);
-}
 /*
  * @implemented
  */
@@ -135,11 +8,3 @@
 	FPU_DOUBLE(x);
 	return sqrt(x);
 }
-/*
- * @implemented
- */
-double	CDECL	_CIfmod(void)
-{
-	FPU_DOUBLES(x, y);
-	return fmod(x, y);
-}

Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake…
==============================================================================
--- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012
@@ -50,6 +50,11 @@
         except/i386/chkstk_asm.s
         except/i386/chkstk_ms.s
         math/i386/ci.c
+        math/i386/cicos.c
+        math/i386/cilog.c
+        math/i386/cipow.c
+        math/i386/cisin.c
+        math/i386/cisqrt.c
         math/i386/ftol2_asm.s
         math/i386/alldiv_asm.s)
 elseif(ARCH MATCHES amd64)