Changeset 10005 for trunk/src/msvcrt/misc.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/misc.c (modified) (6 diffs)

trunk/src/msvcrt/misc.c

@@ -21 +21 @@
 #include "msvcrt.h"
 #include <stdlib.h>
-
+#include <string.h>
+#include <math.h>
+#include "emxheader.h"
 #include "msvcrt/stdlib.h"
 
@@ -50 +52 @@
  *              _sleep (MSVCRT.@)
  */
-void _sleep(unsigned long timeout)
+void MSVCRT__sleep(unsigned long timeout)
 {
   TRACE("_sleep for %ld milliseconds\n",timeout);
@@ -59 +61 @@
  *              _lfind (MSVCRT.@)
  */
-void* _lfind(const void* match, const void* start,
+void* MSVCRT__lfind(const void* match, const void* start,
              unsigned int* array_size, unsigned int elem_size,
              MSVCRT_compar_fn_t cf)
 {
   unsigned int size = *array_size;
+  dprintf(("MSVCRT: _lfind"));
   if (size)
     do
@@ -77 +80 @@
  *              _lsearch (MSVCRT.@)
  */
-void* _lsearch(const void* match, void* start,
+void* MSVCRT__lsearch(const void* match, void* start,
                unsigned int* array_size, unsigned int elem_size,
                MSVCRT_compar_fn_t cf)
 {
   unsigned int size = *array_size;
+  dprintf(("MSVCRT: _lsearch"));
   if (size)
     do
@@ -96 +100 @@
 }
 
+
 /*********************************************************************
  *              _chkesp (MSVCRT.@)
+ *
+ * Trap to a debugger if the value of the stack pointer has changed.
+ *
+ * PARAMS
+ *  None.
+ *
+ * RETURNS
+ *  Does not return.
+ *
+ * NOTES
+ *  This function is available for iX86 only.
+ *
+ *  When VC++ generates debug code, it stores the value of the stack pointer
+ *  before calling any external function, and checks the value following
+ *  the call. It then calls this function, which will trap if the values are
+ *  not the same. Usually this means that the prototype used to call
+ *  the function is incorrect.  It can also mean that the .spec entry has
+ *  the wrong calling convention or parameters.
  */
-void _chkesp(void)
+#ifdef __i386__
+
+# ifdef __GNUC__
+__ASM_GLOBAL_FUNC(_chkesp,
+                  "jnz 1f\n\t"
+                  "ret\n"
+                  "1:\tpushl %ebp\n\t"
+                  "movl %esp,%ebp\n\t"
+                  "pushl %eax\n\t"
+                  "pushl %ecx\n\t"
+                  "pushl %edx\n\t"
+                  "call " __ASM_NAME("MSVCRT_chkesp_fail") "\n\t"
+                  "popl %edx\n\t"
+                  "popl %ecx\n\t"
+                  "popl %eax\n\t"
+                  "popl %ebp\n\t"
+                  "ret");
+
+void MSVCRT_chkesp_fail(void)
 {
+  ERR("Stack pointer incorrect after last function call - Bad prototype/spec entry?\n");
+  DebugBreak();
+}
 
-}
+# else  /* __GNUC__ */
+void _chkesp(void) { }
+# endif  /* __GNUC__ */
+
+#endif  /* __i386__ */
+
+
 
 #ifdef __WIN32OS2__
@@ -116 +166 @@
  *      [GNUC && i386]
  */
+double _emx_rint (double);
+
 #if defined(__GNUC__) && defined(__i386__)
-LONG __cdecl _ftol(void)
+LONGLONG __cdecl _ftol(double fl)
 {
         /* don't just do DO_FPU("fistp",retval), because the rounding
          * mode must also be set to "round towards zero"... */
-        double fl;
         POP_FPU(fl);
-        return (LONG)fl;
+        return (LONGLONG)(fl);
+
 }
 #endif /* defined(__GNUC__) && defined(__i386__) */