summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-11-26 01:03:34 +0000
committerrubidium <rubidium@openttd.org>2008-11-26 01:03:34 +0000
commit69eb6978e76dd97df4dc3f9b937012c91553303b (patch)
treec7bb2ccf1b951ef42bb8daacbd94423ff6b74c4f
parent131f9e39d3ade7052c23bda339a66d32b354b9c8 (diff)
downloadopenttd-69eb6978e76dd97df4dc3f9b937012c91553303b.tar.xz
(svn r14634) -Change: _rdtsc is defined by some platforms so we can't use that name.
-rw-r--r--src/debug.h6
-rw-r--r--src/os_timer.cpp14
-rw-r--r--src/yapf/yapf.hpp4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/debug.h b/src/debug.h
index 7648732a3..8ab897b2e 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -84,13 +84,13 @@ const char *GetDebugString();
* it with an other block.
**/
#define TIC() {\
- extern uint64 _rdtsc();\
- uint64 _xxx_ = _rdtsc();\
+ extern uint64 ottd_rdtsc();\
+ uint64 _xxx_ = ottd_rdtsc();\
static uint64 __sum__ = 0;\
static uint32 __i__ = 0;
#define TOC(str, count)\
- __sum__ += _rdtsc() - _xxx_;\
+ __sum__ += ottd_rdtsc() - _xxx_;\
if (++__i__ == count) {\
DEBUG(misc, 0, "[%s] %" OTTD_PRINTF64 "u [avg: %.1f]\n", str, __sum__, __sum__/(double)__i__);\
__i__ = 0;\
diff --git a/src/os_timer.cpp b/src/os_timer.cpp
index 11a5631a0..0166a445c 100644
--- a/src/os_timer.cpp
+++ b/src/os_timer.cpp
@@ -11,12 +11,12 @@
#if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE) && !defined(WINCE)
# if _MSC_VER >= 1400
#include <intrin.h>
-uint64 _rdtsc()
+uint64 ottd_rdtsc()
{
return __rdtsc();
}
# else
-uint64 _declspec(naked) _rdtsc()
+uint64 _declspec(naked) ottd_rdtsc()
{
_asm {
rdtsc
@@ -29,14 +29,14 @@ uint64 _declspec(naked) _rdtsc()
/* rdtsc for OS/2. Hopefully this works, who knows */
#if defined (__WATCOMC__) && !defined(RDTSC_AVAILABLE)
-unsigned __int64 _rdtsc();
-# pragma aux _rdtsc = 0x0F 0x31 value [edx eax] parm nomemory modify exact [edx eax] nomemory;
+unsigned __int64 ottd_rdtsc();
+# pragma aux ottd_rdtsc = 0x0F 0x31 value [edx eax] parm nomemory modify exact [edx eax] nomemory;
# define RDTSC_AVAILABLE
#endif
/* rdtsc for all other *nix-en (hopefully). Use GCC syntax */
#if defined(__i386__) || defined(__x86_64__) && !defined(RDTSC_AVAILABLE)
-uint64 _rdtsc()
+uint64 ottd_rdtsc()
{
uint32 high, low;
__asm__ __volatile__ ("rdtsc" : "=a" (low), "=d" (high));
@@ -47,7 +47,7 @@ uint64 _rdtsc()
/* rdtsc for PPC which has this not */
#if (defined(__POWERPC__) || defined(__powerpc__)) && !defined(RDTSC_AVAILABLE)
-uint64 _rdtsc()
+uint64 ottd_rdtsc()
{
uint32 high = 0, high2 = 0, low;
/* PPC does not have rdtsc, so we cheat by reading the two 32-bit time-counters
@@ -75,5 +75,5 @@ uint64 _rdtsc()
# if !defined(_MSC_VER)
#warning "(non-fatal) No support for rdtsc(), you won't be able to profile with TIC/TOC"
# endif
-uint64 _rdtsc() {return 0;}
+uint64 ottd_rdtsc() {return 0;}
#endif
diff --git a/src/yapf/yapf.hpp b/src/yapf/yapf.hpp
index bdd975e8c..758d4d459 100644
--- a/src/yapf/yapf.hpp
+++ b/src/yapf/yapf.hpp
@@ -23,7 +23,7 @@
#include "../settings_type.h"
#include "../tunnelbridge.h"
-extern uint64 _rdtsc();
+extern uint64 ottd_rdtsc();
#include <limits.h>
#include <new>
@@ -45,7 +45,7 @@ struct CPerformanceTimer
FORCEINLINE void Stop() {m_acc += QueryTime() - m_start;}
FORCEINLINE int Get(int64 coef) {return (int)(m_acc * coef / QueryFrequency());}
- FORCEINLINE int64 QueryTime() {return _rdtsc();}
+ FORCEINLINE int64 QueryTime() {return ottd_rdtsc();}
FORCEINLINE int64 QueryFrequency() {return ((int64)2200 * 1000000);}
};