[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH] ucrtbase: Add ilogb* functions.
From:       Piotr Caban <piotr () codeweavers ! com>
Date:       2019-02-28 20:08:13
Message-ID: 7ecc54a5-872f-1e87-00a3-59940bdbf98d () codeweavers ! com
[Download RAW message or body]

From: Nikolay Sivov <nsivov@codeweavers.com>

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
---
  configure.ac                                  |  2 ++
  .../api-ms-win-crt-math-l1-1-0.spec           |  6 ++--
  dlls/msvcr120/msvcr120.spec                   |  6 ++--
  dlls/msvcr120_app/msvcr120_app.spec           |  6 ++--
  dlls/msvcrt/math.c                            | 31 +++++++++++++++++++
  dlls/msvcrt/msvcrt.h                          |  4 +++
  dlls/ucrtbase/ucrtbase.spec                   |  6 ++--
  7 files changed, 49 insertions(+), 12 deletions(-)



["0001-ucrtbase-Add-ilogb-functions.txt" (text/x-patch)]

diff --git a/configure.ac b/configure.ac
index c978477a51..a55d2f825a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2743,6 +2743,8 @@ AC_CHECK_FUNCS(\
 	exp2f \
 	expm1 \
 	expm1f \
+	ilogb \
+	ilogbf \
 	j0 \
 	j1 \
 	jn \
diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec \
b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index \
                f5e4fb1f8f..dea5094a91 100644
--- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
@@ -254,9 +254,9 @@
 @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) ucrtbase.fmodf
 @ cdecl frexp(double ptr) ucrtbase.frexp
 @ cdecl hypot(double double) ucrtbase.hypot
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) ucrtbase.ilogb
+@ cdecl ilogbf(float) ucrtbase.ilogbf
+@ cdecl ilogbl(double) ucrtbase.ilogbl
 @ cdecl ldexp(double long) ucrtbase.ldexp
 @ cdecl lgamma(double) ucrtbase.lgamma
 @ cdecl lgammaf(float) ucrtbase.lgammaf
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 7dfcabf461..0e3d7bbc37 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2207,9 +2207,9 @@
 @ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) MSVCR120_ilogb
+@ cdecl ilogbf(float) MSVCR120_ilogbf
+@ cdecl ilogbl(double) MSVCR120_ilogbl
 @ stub imaxabs
 @ stub imaxdiv
 @ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcr120_app/msvcr120_app.spec \
b/dlls/msvcr120_app/msvcr120_app.spec index d78d26f81b..5b1549b35b 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1871,9 +1871,9 @@
 @ cdecl gets_s(ptr long) msvcr120.gets_s
 @ cdecl getwc(ptr) msvcr120.getwc
 @ cdecl getwchar() msvcr120.getwchar
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) msvcr120.ilogb
+@ cdecl ilogbf(float) msvcr120.ilogbf
+@ cdecl ilogbl(double) msvcr120.ilogbl
 @ stub imaxabs
 @ stub imaxdiv
 @ cdecl isalnum(long) msvcr120.isalnum
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index dc12cb1185..ca181d907b 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -3433,4 +3433,35 @@ double CDECL MSVCR120_creal(_Dcomplex z)
     return z.x;
 }
 
+int CDECL MSVCR120_ilogb(double x)
+{
+    if (!x) return MSVCRT_FP_ILOGB0;
+    if (isnan(x)) return MSVCRT_FP_ILOGBNAN;
+    if (isinf(x)) return MSVCRT_INT_MAX;
+
+#ifdef HAVE_ILOGB
+    return ilogb(x);
+#else
+    return logb(x);
+#endif
+}
+
+int CDECL MSVCR120_ilogbf(float x)
+{
+    if (!x) return MSVCRT_FP_ILOGB0;
+    if (isnan(x)) return MSVCRT_FP_ILOGBNAN;
+    if (isinf(x)) return MSVCRT_INT_MAX;
+
+#ifdef HAVE_ILOGBF
+    return ilogbf(x);
+#else
+    return logbf(x);
+#endif
+}
+
+int CDECL MSVCR120_ilogbl(LDOUBLE x)
+{
+    return MSVCR120_ilogb(x);
+}
+
 #endif /* _MSVCR_VER>=120 */
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index eba545f4bf..aad8c9563b 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -41,6 +41,7 @@
 #include "windef.h"
 #include "winbase.h"
 
+#define MSVCRT_INT_MAX     0x7fffffff
 #define MSVCRT_LONG_MAX    0x7fffffff
 #define MSVCRT_LONG_MIN    (-MSVCRT_LONG_MAX-1)
 #define MSVCRT_ULONG_MAX   0xffffffff
@@ -1187,6 +1188,9 @@ printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*) \
DECLSPEC_HIDDEN;  #define MSVCRT__OVERFLOW  3
 #define MSVCRT__UNDERFLOW 4
 
+#define MSVCRT_FP_ILOGB0 (-MSVCRT_INT_MAX - 1)
+#define MSVCRT_FP_ILOGBNAN MSVCRT_INT_MAX
+
 typedef struct
 {
     float f;
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 00c806483e..f4ad66c752 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2341,9 +2341,9 @@
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl hypot(double double) _hypot
-@ stub ilogb
-@ stub ilogbf
-@ stub ilogbl
+@ cdecl ilogb(double) MSVCR120_ilogb
+@ cdecl ilogbf(float) MSVCR120_ilogbf
+@ cdecl ilogbl(double) MSVCR120_ilogbl
 @ stub imaxabs
 @ stub imaxdiv
 @ cdecl is_wctype(long long) ntdll.iswctype


[Attachment #4 (text/plain)]




[prev in list] [next in list] [prev in thread] [next in thread]