From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 02:34:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 325B437B404; Sat,  5 Apr 2003 02:34:40 -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 C715137B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 02:34:39 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 71B8143FB1
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 02:34:39 -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 h35AYd0U046853
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 02:34:39 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35AYc1h046850
	for perforce@freebsd.org; Sat, 5 Apr 2003 02:34:38 -0800 (PST)
Date: Sat, 5 Apr 2003 02:34:38 -0800 (PST)
Message-Id: <200304051034.h35AYc1h046850@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 28208 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 10:34:41 -0000

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

Change 28208 by peter@peter_overcee on 2003/04/05 02:33:40

	add [fs]uword64() for imgact_elf64.c

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/support.s#15 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#15 (text+ko) ====

@@ -210,7 +210,20 @@
  *
  *	Fetch a byte (sword, word) from user memory
  */
-ENTRY(fuword)
+ENTRY(fuword64)
+	movq	PCPU(CURPCB),%rcx
+	movq	$fusufault,PCB_ONFAULT(%rcx)
+	movq	8(%rsp),%rdx			/* from */
+
+	movq	$VM_MAXUSER_ADDRESS-8,%rax
+	cmpq	%rax,%rdx			/* verify address is valid */
+	ja	fusufault
+
+	movq	(%rdx),%rax
+	movq	$0,PCB_ONFAULT(%rcx)
+	ret
+
+ENTRY(fuword32)
 	movq	PCPU(CURPCB),%rcx
 	movq	$fusufault,PCB_ONFAULT(%rcx)
 	movq	8(%rsp),%rdx			/* from */
@@ -225,8 +238,8 @@
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
 
-ENTRY(fuword32)
-	jmp	fuword
+ENTRY(fuword)
+	jmp	fuword32
 
 /*
  * These two routines are called from the profiling code, potentially
@@ -288,7 +301,23 @@
  *
  *	Write a byte (word, longword) to user memory
  */
-ENTRY(suword)
+ENTRY(suword64)
+	movq	PCPU(CURPCB),%rcx
+	movq	$fusufault,PCB_ONFAULT(%rcx)
+	movq	8(%rsp),%rdx
+
+	movq	$VM_MAXUSER_ADDRESS-8,%rax
+	cmpq	%rax,%rdx			/* verify address validity */
+	ja	fusufault
+
+	movq	16(%rsp),%rax
+	movq	%rax,(%rdx)
+	xorq	%rax,%rax
+	movq	PCPU(CURPCB),%rcx
+	movq	%rax,PCB_ONFAULT(%rcx)
+	ret
+
+ENTRY(suword32)
 	movq	PCPU(CURPCB),%rcx
 	movq	$fusufault,PCB_ONFAULT(%rcx)
 	movq	8(%rsp),%rdx
@@ -304,8 +333,8 @@
 	movq	%rax,PCB_ONFAULT(%rcx)
 	ret
 
-ENTRY(suword32)
-	jmp	suword
+ENTRY(suword)
+	jmp	suword32
 
 /*
  * suword16 - MP SAFE