From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 19:23:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A43A137B404; Fri,  4 Apr 2003 19:23:12 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2023A37B407
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:23:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8A6F43F3F
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:23:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h353NB0U099066
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 19:23:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353NBwO099063
	for perforce@freebsd.org; Fri, 4 Apr 2003 19:23:11 -0800 (PST)
Date: Fri, 4 Apr 2003 19:23:11 -0800 (PST)
Message-Id: <200304050323.h353NBwO099063@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28143 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 03:23:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=28143

Change 28143 by peter@peter_overcee on 2003/04/04 19:23:00

	s/l/q/ for 64 bit regs

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/asmacros.h#3 edit
.. //depot/projects/hammer/sys/x86_64/include/atomic.h#7 edit
.. //depot/projects/hammer/sys/x86_64/include/mutex.h#3 edit
.. //depot/projects/hammer/sys/x86_64/include/pcpu.h#5 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/asmacros.h#3 (text+ko) ====

@@ -64,10 +64,9 @@
 #define NON_GPROF_RET		.byte 0xc3	/* opcode for `ret' */
 
 #ifdef LOCORE
-XXX gotta redo this to use a register
 #define	PCPU(member)	%fs:PC_ ## member
 #define	PCPU_ADDR(member, reg)	movq %fs:PC_PRVSPACE,reg; \
-			addl $PC_ ## member,reg
+			addq $PC_ ## member,reg
 #endif
 
 #ifdef GPROF

==== //depot/projects/hammer/sys/x86_64/include/atomic.h#7 (text+ko) ====

@@ -147,7 +147,7 @@
 	"	" __XSTRING(MPLOCKED) "	"
 	"	cmpxchgq %1,%2 ;	"
 	"       setz	%%al ;		"
-	"	movzbl	%%al,%0 ;	"
+	"	movzbq	%%al,%0 ;	"
 	"1:				"
 	"# atomic_cmpset_int"
 	: "+a" (res)			/* 0 (result) %rax, XXX check */

==== //depot/projects/hammer/sys/x86_64/include/mutex.h#3 (text+ko) ====

@@ -61,7 +61,7 @@
 	pushq $flags ;							\
 	pushq $lck ;							\
 	call _mtx_lock_spin_flags ;					\
-	addl $0x20, %esp ;						\
+	addq $0x20, %rsp ;						\
 
 #define MTX_UNLOCK_SPIN(lck)						\
 	pushq $0 ;							\
@@ -69,7 +69,7 @@
 	pushq $0 ;							\
 	pushq $lck ;							\
 	call _mtx_unlock_spin_flags ;					\
-	addl $0x20, %esp ;						\
+	addq $0x20, %rsp ;						\
 
 #endif	/* !LOCORE */
 #endif	/* __MACHINE_MUTEX_H */

==== //depot/projects/hammer/sys/x86_64/include/pcpu.h#5 (text+ko) ====

@@ -72,7 +72,7 @@
 #define	__PCPU_PTR(name) ({						\
 	__pcpu_type(name) *__p;						\
 									\
-	__asm __volatile("movl %%fs:%1,%0; addl %2,%0"			\
+	__asm __volatile("movq %%fs:%1,%0; addq %2,%0"			\
 	    : "=r" (__p)						\
 	    : "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace))),	\
 	      "i" (__pcpu_offset(name)));				\