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