Porting on x86_64

1 files changed, 35 insertions, 8 deletions

diff --git a/include/cycles.h b/include/cycles.h
index 01f36a9..e9b0e11 100644
--- a/include/cycles.h
+++ b/include/cycles.h
@@ -1,23 +1,50 @@
 #ifndef CYCLES_H
 #define CYCLES_H
 
-#ifdef __i386__
+#ifdef __x86_64__
+
+#define rdtscll(val) do { \
+        unsigned int __a,__d; \
+        __asm__ __volatile__("rdtsc" : "=a" (__a), "=d" (__d)); \
+        (val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
+} while(0)
+
+static __inline__ unsigned long long native_read_tsc(void)
+{
+        unsigned long long val;
+
+        __asm__ __volatile__("mfence":::"memory");
+        rdtscll(val);
+        __asm__ __volatile__("mfence":::"memory");
+
+        return val;
+}
 
-typedef unsigned long long cycles_t;
 
 #define CYCLES_FMT "llu"
 
-static inline cycles_t get_cycles(void) 
+typedef unsigned long long cycles_t;
+
+static inline cycles_t get_cycles(void)
 {
-        unsigned long long ret;
-        __asm__ __volatile__("rdtsc" : "=A" (ret));
-        return ret;
+        return native_read_tsc();
+}
+#elif defined __i386__
+static inline unsigned long long native_read_tsc(void) {
+        unsigned long long val;
+        __asm__ __volatile__("rdtsc" : "=A" (val));
+        return val;
 }
 
-#endif
+typedef unsigned long long cycles_t;
 
+#define CYCLES_FMT "llu"
 
-#ifdef __sparc__
+static inline cycles_t get_cycles(void)
+{
+        return native_read_tsc();
+}
+#elif defined __sparc__
 
 #define NPT_BIT 63