mirror of
https://github.com/wolfpld/tracy
synced 2025-04-30 12:53:51 +00:00
Merge pull request #809 from Ravbug/master
TracyClient Windows for ARM support
This commit is contained in:
commit
a17c218351
@ -28,7 +28,7 @@
|
|||||||
# include <mach/mach_time.h>
|
# include <mach/mach_time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ( defined _WIN32 || ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) || ( defined TARGET_OS_IOS && TARGET_OS_IOS == 1 ) )
|
#if ( (defined _WIN32 && !(defined _M_ARM64 || defined _M_ARM)) || ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) || ( defined TARGET_OS_IOS && TARGET_OS_IOS == 1 ) )
|
||||||
# define TRACY_HW_TIMER
|
# define TRACY_HW_TIMER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -781,7 +781,7 @@ rpmalloc_set_main_thread(void) {
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
_rpmalloc_spin(void) {
|
_rpmalloc_spin(void) {
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER) && !(defined(_M_ARM) || defined(_M_ARM64))
|
||||||
_mm_pause();
|
_mm_pause();
|
||||||
#elif defined(__x86_64__) || defined(__i386__)
|
#elif defined(__x86_64__) || defined(__i386__)
|
||||||
__asm__ volatile("pause" ::: "memory");
|
__asm__ volatile("pause" ::: "memory");
|
||||||
@ -793,8 +793,7 @@ _rpmalloc_spin(void) {
|
|||||||
#elif defined(__sparc__)
|
#elif defined(__sparc__)
|
||||||
__asm__ volatile("rd %ccr, %g0 \n\trd %ccr, %g0 \n\trd %ccr, %g0");
|
__asm__ volatile("rd %ccr, %g0 \n\trd %ccr, %g0 \n\trd %ccr, %g0");
|
||||||
#else
|
#else
|
||||||
struct timespec ts = {0};
|
std::this_thread::yield();
|
||||||
nanosleep(&ts, 0);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user