From 73faaea227a53e365dd75f1dba7a5071c7b5e541 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Wed, 28 Aug 2013 22:55:05 +0200
Subject: i386-gen: preserve fp control word in gen_cvt_ftoi

- Use runtime function for conversion
- Also initialize fp with tcc -run on windows

This fixes a bug where
  double x = 1.0;
  double y = 1.0000000000000001;
  double z = x < y ? 0 : sqrt (x*x - y*y);
caused a bad sqrt because rounding precision for the x < y comparison
was different to the one used within the sqrt function.

This also fixes a bug where
  printf("%d, %d", (int)pow(10, 2), (int)pow(10, 2));
would print
  100, 99

Unrelated:
  win32: document relative include & lib lookup
  win32: normalize_slashes: do not mirror silly gcc behavior
  This reverts part of commit 8a81f9e1036637e21a47e14fb56bf64133546890
  winapi: add missing WINAPI decl. for some functions
---
 win32/include/winapi/winbase.h | 12 ++++++------
 win32/lib/crt1.c               |  6 ++++++
 win32/lib/wincrt1.c            |  2 +-
 win32/tcc-win32.txt            |  6 ++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'win32')

diff --git a/win32/include/winapi/winbase.h b/win32/include/winapi/winbase.h
index a5d9b17..4a38006 100644
--- a/win32/include/winapi/winbase.h
+++ b/win32/include/winapi/winbase.h
@@ -968,15 +968,15 @@ extern "C" {
   LONG64 InterlockedExchangeAdd64(LONG64 volatile *Addend,LONG64 Value);
   LONG64 InterlockedCompareExchange64(LONG64 volatile *Destination,LONG64 ExChange,LONG64 Comperand);
 #else
-  LONG InterlockedIncrement(LONG volatile *lpAddend);
-  LONG InterlockedDecrement(LONG volatile *lpAddend);
-  LONG InterlockedExchange(LONG volatile *Target,LONG Value);
+  LONG WINAPI InterlockedIncrement(LONG volatile *lpAddend);
+  LONG WINAPI InterlockedDecrement(LONG volatile *lpAddend);
+  LONG WINAPI InterlockedExchange(LONG volatile *Target,LONG Value);
 
 #define InterlockedExchangePointer(Target,Value) (PVOID)InterlockedExchange((PLONG)(Target),(LONG)(Value))
 
-  LONG InterlockedExchangeAdd(LONG volatile *Addend,LONG Value);
-  LONG InterlockedCompareExchange(LONG volatile *Destination,LONG Exchange,LONG Comperand);
-  LONGLONG InterlockedCompareExchange64(LONGLONG volatile *Destination,LONGLONG Exchange,LONGLONG Comperand);
+  LONG WINAPI InterlockedExchangeAdd(LONG volatile *Addend,LONG Value);
+  LONG WINAPI InterlockedCompareExchange(LONG volatile *Destination,LONG Exchange,LONG Comperand);
+  LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile *Destination,LONGLONG Exchange,LONGLONG Comperand);
 
   __CRT_INLINE LONGLONG InterlockedAnd64 (LONGLONG volatile *Destination,LONGLONG Value) {
     LONGLONG Old;
diff --git a/win32/lib/crt1.c b/win32/lib/crt1.c
index 3e1d17f..cde3910 100644
--- a/win32/lib/crt1.c
+++ b/win32/lib/crt1.c
@@ -31,4 +31,10 @@ int _start(void)
     exit(ret);
 }
 
+int _runmain(int argc, char **argv)
+{
+    _controlfp(0x10000, 0x30000);
+    return main(argc, argv, NULL);
+}
+
 // =============================================
diff --git a/win32/lib/wincrt1.c b/win32/lib/wincrt1.c
index 77e74b8..663fd33 100644
--- a/win32/lib/wincrt1.c
+++ b/win32/lib/wincrt1.c
@@ -59,6 +59,6 @@ int _runwinmain(int argc, char **argv)
         szCmd = "";
     else if (szCmd > p && szCmd[-1] == '\"')
         --szCmd;
+    _controlfp(0x10000, 0x30000);
     return WinMain(GetModuleHandle(NULL), NULL, szCmd, SW_SHOWDEFAULT);
 }
-
diff --git a/win32/tcc-win32.txt b/win32/tcc-win32.txt
index dc06b8f..1cb35c5 100644
--- a/win32/tcc-win32.txt
+++ b/win32/tcc-win32.txt
@@ -18,6 +18,12 @@
     system PATH.
 
 
+    Include and library search paths
+    --------------------------------
+    On windows,  the standard "include" and "lib" directories are searched
+    relatively from the location of the executables (tcc.exe, libtcc.dll).
+
+
     Examples:
     ---------
     Open a console window (DOS box) and 'cd' to the examples directory.
-- 
cgit v1.3.1