Commit 96b1d475 authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge remote-tracking branch 'origin/fix-rdtsc' into develop_integration_2018_w19

parents a42e2de0 ad46183e
......@@ -373,9 +373,9 @@ void *log_thread_function(void * list);
/* @}*/
static __inline__ uint64_t rdtsc(void) {
uint64_t a, d;
uint32_t a, d;
__asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
return (d<<32) | a;
return (((uint64_t)d)<<32) | ((uint64_t)a);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment