Piotr Caban : msvcp90: Added complex trigonometric functions implementation .

24 Jan 2013

Module: wine
Branch: master
Commit: ed0e16ae3dfaa0e68f00a345f41661ca3267b40b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed0e16ae3dfaa0e68f00a345f4...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Thu Jan 24 12:28:47 2013 +0100

msvcp90: Added complex trigonometric functions implementation.

---

 dlls/msvcp90/math.c       |   62 +++++++++++++++++++++++++++++++++++++++++++++
 dlls/msvcp90/msvcp90.spec |   36 +++++++++++++-------------
 2 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c
index 9f75cd4..c13fd3c 100644
--- a/dlls/msvcp90/math.c
+++ b/dlls/msvcp90/math.c
@@ -1312,6 +1312,34 @@ complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_floa
     return ret;
 }
 
+/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */
+/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */
+complex_float* __cdecl complex_float_cos(complex_float *ret, const complex_float *c)
+{
+    ret->real = cos(c->real)*cosh(c->imag);
+    ret->imag = -sin(c->real)*sinh(c->imag);
+    return ret;
+}
+
+/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */
+/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */
+complex_float* __cdecl complex_float_sin(complex_float *ret, const complex_float *c)
+{
+    ret->real = sin(c->real)*cosh(c->imag);
+    ret->imag = cos(c->real)*sinh(c->imag);
+    return ret;
+}
+
+/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */
+/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */
+complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float *c)
+{
+    double denom = cos(2*c->real) + cosh(2*c->imag);
+    ret->real = sin(2*c->real) / denom;
+    ret->imag = sinh(2*c->imag) / denom;
+    return ret;
+}
+
 /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */
 /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */
 /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */
@@ -1820,3 +1848,37 @@ complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_d
     ret->imag = -c->imag;
     return ret;
 }
+
+/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */
+/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */
+/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */
+/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */
+complex_double* __cdecl complex_double_cos(complex_double *ret, const complex_double *c)
+{
+    ret->real = cos(c->real)*cosh(c->imag);
+    ret->imag = -sin(c->real)*sinh(c->imag);
+    return ret;
+}
+
+/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */
+/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */
+/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */
+/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */
+complex_double* __cdecl complex_double_sin(complex_double *ret, const complex_double *c)
+{
+    ret->real = sin(c->real)*cosh(c->imag);
+    ret->imag = cos(c->real)*sinh(c->imag);
+    return ret;
+}
+
+/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */
+/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */
+/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */
+/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */
+complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_double *c)
+{
+    double denom = cos(2*c->real) + cosh(2*c->imag);
+    ret->real = sin(2*c->real) / denom;
+    ret->imag = sinh(2*c->imag) / denom;
+    return ret;
+}
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 5e53c6d..3022505 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -368,12 +368,12 @@
 @ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj
 @ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj
 @ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj
-@ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
-@ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
-@ stub -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z
-@ stub -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z
+@ cdecl -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_cos
+@ cdecl -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_cos
+@ cdecl -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_cos
+@ cdecl -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cos
+@ cdecl -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cos
+@ cdecl -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cos
 @ stub -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
 @ stub -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
 @ stub -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
@@ -464,12 +464,12 @@
 @ cdecl -arch=win64 ??$real(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_real
 @ cdecl -arch=win32 ??$real(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_real
 @ cdecl -arch=win64 ??$real(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_real
-@ stub -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
-@ stub -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
-@ stub -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z
-@ stub -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z
+@ cdecl -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_sin
+@ cdecl -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_sin
+@ cdecl -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_sin
+@ cdecl -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sin
+@ cdecl -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sin
+@ cdecl -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sin
 @ stub -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
 @ stub -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
 @ stub -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
@@ -482,12 +482,12 @@
 @ stub -arch=win64 ??$sqrt(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z
 @ stub -arch=win32 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z
 @ stub -arch=win64 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
-@ stub -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z
-@ stub -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z
-@ stub -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z
-@ stub -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z
+@ cdecl -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_tan
+@ cdecl -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_tan
+@ cdecl -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_tan
+@ cdecl -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tan
+@ cdecl -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tan
+@ cdecl -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tan
 @ stub -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z
 @ stub -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z
 @ stub -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

    

Alexandre Julliard

tags

participants (1)