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

2018-05-15 15:30:53 +02:00
parent a42e2de0e0 ad46183e23
commit 96b1d47552
1 changed files with 2 additions and 2 deletions
@@ -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);
 }

 #define DEBUG_REALTIME 1