backport high-resolution clock fix

OpenSmalltalk · Jan 3, 2019 · e2cc141 · e2cc141
1 parent 87a2f3b
commit e2cc141
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/platforms/minheadless/windows/sqWin32Heartbeat.c b/platforms/minheadless/windows/sqWin32Heartbeat.c
@@ -56,8 +56,23 @@ static DWORD timerID = 0;
 sqLong
 ioHighResClock(void) {
   sqLong value = 0;
-#ifdef __GNUC__
-  __asm__ __volatile__ ("rdtsc" : "=A" (value));
+
+#if defined(__GNUC__) && (defined(i386) || defined(__i386) || defined(__i386__))
+    __asm__ __volatile__ ("rdtsc" : "=A"(value));
+#elif defined(__GNUC__) && (defined(x86_64) || defined(__x86_64) || defined (__x86_64__))
+    __asm__ __volatile__ ("rdtsc\n\t"			// Returns the time in EDX:EAX.
+						"shl $32, %%rdx\n\t"	// Shift the upper bits left.
+						"or %%rdx, %0"			// 'Or' in the lower bits.
+						: "=a" (value)
+						: 
+						: "rdx");
+#elif defined(_MSC_VER)
+  LARGE_INTEGER aux;
+  aux.QuadPart = 0;
+  QueryPerformanceCounter(&aux);
+  value = aux.QuadPart;
+#else
+# error "no high res clock defined"
 #endif
   return value;
 }