* sysdeps/x86_64/hp-timing.h (HP_TIMING_NOW, HP_TIMING_ACCUM): New

	macros replace the i686 versions for 64-bit mode.

diff --git a/ChangeLog b/ChangeLog
index b27a3cd..38ab651 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-30  Roland McGrath  <roland@redhat.com>
 
+       * sysdeps/x86_64/hp-timing.h (HP_TIMING_NOW, HP_TIMING_ACCUM): New
+       macros replace the i686 versions for 64-bit mode.
+
        * locale/duplocale.c: Include <string.h>.
 
        * intl/dcigettext.c (DCIGETTEXT) [_LIBC]: Check for bogus CATEGORY.

diff --git a/sysdeps/x86_64/hp-timing.h b/sysdeps/x86_64/hp-timing.h
index 1f24ffc..5738039 100644 (file)
--- a/sysdeps/x86_64/hp-timing.h
+++ b/sysdeps/x86_64/hp-timing.h
@@ -1,2 +1,36 @@
-/* We can use the i686 implementation without changes.  */
-#include <sysdeps/i386/i686/hp-timing.h>
+/* High precision, low overhead timing functions.  x86-64 version.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _HP_TIMING_H
+
+/* We can use some of the i686 implementation without changes.  */
+# include <sysdeps/i386/i686/hp-timing.h>
+
+/* The "=A" constraint used in 32-bit mode does not work in 64-bit mode.  */
+# undef HP_TIMING_NOW
+# define HP_TIMING_NOW(Var) \
+  ({ unsigned int _hi, _lo; asm ("rdtsc" : "=a" (_lo), "=d" (_hi)); \
+     (Var) = ((unsigned long long int) _hi << 32) | _lo; })
+
+/* The funny business for 32-bit mode is not required here.  */
+# undef HP_TIMING_ACCUM
+# define HP_TIMING_ACCUM(Sum, Diff) ((Sum) += (Diff))
+
+
+#endif /* hp-timing.h */