From a35c2e911d261c03c1ad6cb001fc0a443bd51fd2 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 15 Sep 2005 22:26:07 +0000 Subject: [PATCH] * make sure to dist timer.h * have the real assembly for 64 bit mode (doh!) * make sure to define type (remove debugging #if 0) This commit was SVN r7401. --- opal/include/sys/sparcv9/Makefile.am | 2 +- opal/include/sys/sparcv9/timer.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/opal/include/sys/sparcv9/Makefile.am b/opal/include/sys/sparcv9/Makefile.am index 3aac51aa3f..99df89c7b4 100644 --- a/opal/include/sys/sparcv9/Makefile.am +++ b/opal/include/sys/sparcv9/Makefile.am @@ -16,7 +16,7 @@ -noinst_HEADERS = atomic.h +noinst_HEADERS = atomic.h timer.h # Conditionally install the header files diff --git a/opal/include/sys/sparcv9/timer.h b/opal/include/sys/sparcv9/timer.h index 5b0049621d..8d416f30b5 100644 --- a/opal/include/sys/sparcv9/timer.h +++ b/opal/include/sys/sparcv9/timer.h @@ -17,9 +17,7 @@ #ifndef OMPI_SYS_ARCH_TIMER_H #define OMPI_SYS_ARCH_TIMER_H 1 -#if 0 typedef uint64_t opal_timer_t; -#endif #if OMPI_GCC_INLINE_ASSEMBLY @@ -31,7 +29,7 @@ opal_sys_timer_get_cycles(void) { opal_timer_t ret; - __asm__ __volatile__("rdtsc" : "=r"(ret)); + __asm__ __volatile__("mov %%tick, %0" : "=r"(ret)); return ret; }