win32/include/math.h: rint/trunc: pop fp stack

... in order to avoid fp stack overflow (see test below). #include <math.h> #include <stdio.h> int main() { printf("%f %f %f %f\n", trunc(1.2), rint(1.2), trunc(1.2), rint(1.2)); printf("%f %f %f %f\n", trunc(1.2), rint(1.2), trunc(1.2), rint(1.2)); printf("%f %f %f %f\n", trunc(1.2), rint(1.2), trunc(1.2), rintl(1.2)); } Also in rintl: - 'long double' is not a ten-byte float on windows.

grischka committed 6 years ago

Commit d0195861 parent 024214a1 file · +9 −4Browse files

Unified · Split

win32/include/math.h+9−4

     __asm__ (
       "fldl    %1\n"
       "frndint   \n"
-      "fstl    %0\n" : "=m" (retval) : "m" (x));
+      "fstpl    %0\n" : "=m" (retval) : "m" (x));
     return retval;
   }
     __asm__ (
       "flds    %1\n"
       "frndint   \n"
-      "fsts    %0\n" : "=m" (retval) : "m" (x));
+      "fstps    %0\n" : "=m" (retval) : "m" (x));
     return retval;
   }
   __CRT_INLINE long double __cdecl rintl (long double x)
   {
+#ifdef _WIN32
+    //  on win32 'long double' is double internally
+    return rint(x);
+#else
     long double retval;
     __asm__ (
       "fldt    %1\n"
       "frndint   \n"
-      "fstt    %0\n" : "=m" (retval) : "m" (x));
+      "fstpt    %0\n" : "=m" (retval) : "m" (x));
     return retval;
+#endif
   }
   /* 7.12.9.5 */
     __asm__ ("fldcw %0;" : : "m" (tmp_cw));
     __asm__ ("fldl  %1;"
              "frndint;"
-             "fstl  %0;" : "=m" (retval)  : "m" (_x)); /* round towards zero */
+             "fstpl  %0;" : "=m" (retval)  : "m" (_x)); /* round towards zero */
     __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
     return retval;
   }

win32/include/math.h: rint/trunc: pop fp stack

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code