From 72ca18b21509822ac22ba13b97a31a8f9927aca9 Mon Sep 17 00:00:00 2001
From: wbhart <goodwillhart@googlemail.com>
Date: Sun, 15 Jun 2008 22:32:08 +0000
Subject: [PATCH] Converted x86_64.asm to intel format.

---
 tune/{x86_64.as.bak => x86_64.as} |  9 +++---
 tune/x86_64.asm                   | 46 -------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)
 rename tune/{x86_64.as.bak => x86_64.as} (93%)
 delete mode 100755 tune/x86_64.asm

diff --git a/tune/x86_64.as.bak b/tune/x86_64.as
similarity index 93%
rename from tune/x86_64.as.bak
rename to tune/x86_64.as
index 93b3a3eb..f688791b 100644
--- a/tune/x86_64.as.bak
+++ b/tune/x86_64.as
@@ -28,13 +28,14 @@
 ; cpuid is used to serialize execution.  On big measurements this won't be
 ; significant but it may help make small single measurements more accurate.
 
-    bits 64
+%include '../yasm_mac.inc'
+
+bits 64
     section .text
 
-    global speed_cyclecounter:function
+    G_EXPORT speed_cyclecounter
 
-speed_cyclecounter:
-	; rdi	p
+G_LABEL speed_cyclecounter
 
 	mov     r10, rbx
 	xor     eax, eax
diff --git a/tune/x86_64.asm b/tune/x86_64.asm
deleted file mode 100755
index 9dd23d73..00000000
--- a/tune/x86_64.asm
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl  x86 pentium time stamp counter access routine.
-
-dnl  Copyright 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-dnl
-dnl  This file is part of the GNU MP Library.
-dnl
-dnl  The GNU MP Library is free software; you can redistribute it and/or
-dnl  modify it under the terms of the GNU Lesser General Public License as
-dnl  published by the Free Software Foundation; either version 2.1 of the
-dnl  License, or (at your option) any later version.
-dnl
-dnl  The GNU MP Library is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl  Lesser General Public License for more details.
-dnl
-dnl  You should have received a copy of the GNU Lesser General Public
-dnl  License along with the GNU MP Library; see the file COPYING.LIB.  If
-dnl  not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-dnl  Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-include(`../config.m4')
-
-
-C void speed_cyclecounter (unsigned p[2]);
-C
-C Get the pentium rdtsc cycle counter, storing the least significant word in
-C p[0] and the most significant in p[1].
-C
-C cpuid is used to serialize execution.  On big measurements this won't be
-C significant but it may help make small single measurements more accurate.
-
-PROLOGUE(speed_cyclecounter)
-
-	C rdi	p
-
-	movq	%rbx, %r10
-	xorl	%eax, %eax
-	cpuid
-	rdtsc
-	movl	%eax, (%rdi)
-	movl	%edx, 4(%rdi)
-	movq	%r10, %rbx
-	ret
-EPILOGUE()