Merge 3.4 (ceval.c)

60b33cc6 · Victor Stinner · ee2b2374 · 0b881dd5 · 60b33cc6
Kaydet (Commit) 60b33cc6 authored Ara 12, 2014 tarafından Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ceval.c Python/ceval.c +5 -3

No files found.
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -65,9 +65,11 @@ ppc_getcounter(uint64 *v)
   even in 64-bit mode, we need to use "a" and "d" for the lower and upper
   32-bit pieces of the result. */
-#define READ_TIMESTAMP(val) \
+#define READ_TIMESTAMP(val) do {                        \
-    __asm__ __volatile__("rdtsc" : \
+    unsigned int h, l;                                  \
-                         "=a" (((int*)&(val))[0]), "=d" (((int*)&(val))[1]));
+    __asm__ __volatile__("rdtsc" : "=a" (l), "=d" (h)); \
+    (val) = ((uint64)l) | (((uint64)h) << 32);          \
+    } while(0)
 #else