mirror of https://github.com/OpenTTD/OpenTTD
(svn r8933) -Fix [Win64]: rdtsc now uses intrinsic on VC8 (michi_cc)
parent
eb1af4a65e
commit
fbd6a88d02
|
@ -7,8 +7,12 @@
|
||||||
/* rdtsc for MSC_VER, uses simple inline assembly, or _rdtsc
|
/* rdtsc for MSC_VER, uses simple inline assembly, or _rdtsc
|
||||||
* from external win64.asm because VS2005 does not support inline assembly */
|
* from external win64.asm because VS2005 does not support inline assembly */
|
||||||
#if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE)
|
#if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE)
|
||||||
# if defined (_M_AMD64)
|
# if _MSC_VER >= 1400
|
||||||
extern uint64 _rdtsc(void);
|
#include <intrin.h>
|
||||||
|
uint64 _rdtsc(void)
|
||||||
|
{
|
||||||
|
return __rdtsc();
|
||||||
|
}
|
||||||
# else
|
# else
|
||||||
uint64 _declspec(naked) _rdtsc(void)
|
uint64 _declspec(naked) _rdtsc(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -606,10 +606,13 @@ static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep)
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _M_AMD64
|
||||||
|
extern "C" void *_get_save_esp(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
static void Win32InitializeExceptions(void)
|
static void Win32InitializeExceptions(void)
|
||||||
{
|
{
|
||||||
#ifdef _M_AMD64
|
#ifdef _M_AMD64
|
||||||
extern void *_get_save_esp(void);
|
|
||||||
_safe_esp = _get_save_esp();
|
_safe_esp = _get_save_esp();
|
||||||
#else
|
#else
|
||||||
_asm {
|
_asm {
|
||||||
|
|
|
@ -5,13 +5,4 @@ _get_save_esp:
|
||||||
MOV RAX,RSP
|
MOV RAX,RSP
|
||||||
RET
|
RET
|
||||||
|
|
||||||
PUBLIC _rdtsc
|
|
||||||
_rdtsc:
|
|
||||||
RDTSC
|
|
||||||
MOV RCX,RDX
|
|
||||||
SHL RCX,32
|
|
||||||
AND RAX,0FFFFFFFFh
|
|
||||||
OR RAX,RCX
|
|
||||||
RET
|
|
||||||
|
|
||||||
END
|
END
|
||||||
|
|
Loading…
Reference in New Issue