 @@ -1,14 +1,14 @@
-/*	$NetBSD: support.S,v 1.5 2009/11/27 03:23:10 rmind Exp $	*/
+/*	$NetBSD: support.S,v 1.6 2010/08/08 18:18:58 chs Exp $	*/
 /*-
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -47,27 +47,26 @@
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <machine/asm.h>
 #include <machine/ia64_cpu.h>
 #include <machine/vmparam.h>
 #include "assym.h"
 .text
 /*
  * ia64_change_mode:	change mode to/from physical mode
+ *
  * Arguments:
  *	r14	psr for desired mode
+ *
  * Modifies:
  *	r15-r19	scratch
 @@ -698,27 +697,27 @@ END(copystr)
 ENTRY(copyinstr, 4)
 	.prologue
 	.regstk	4, 3, 4, 0
 	.save	ar.pfs,loc0
 	alloc	loc0=ar.pfs,4,3,4,0
 	.save	rp,loc1
 	mov	loc1=rp
 	.body
 	movl	loc2=VM_MAX_ADDRESS		// make sure that src addr
 	;;
 	cmp.geu	p6,p0=in0,loc2			// is in user space.
 	;;
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
+(p6)	br.cond.spnt.few copyefault		// if it's not, error out.
 	movl	r14=copyerr			// set up fault handler.
 	add	r15=PC_CURLWP,r13		// find curthread
 	;;
 	ld8	r15=[r15]
 	;;
 	add	r15=L_PCB,r15			// find pcb
 	;;
 	ld8	r15=[r15]
 	;;
 	add	loc2=PCB_ONFAULT,r15
 	;;
 	st8	[loc2]=r14
 	;;
 @@ -737,27 +736,27 @@ END(copyinstr)
 ENTRY(copyoutstr, 4)
 	.prologue
 	.regstk	4, 3, 4, 0
 	.save	ar.pfs,loc0
 	alloc	loc0=ar.pfs,4,3,4,0
 	.save	rp,loc1
 	mov	loc1=rp
 	.body
 	movl	loc2=VM_MAX_ADDRESS		// make sure that dest addr
 	;;
 	cmp.geu	p6,p0=in1,loc2			// is in user space.
 	;;
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
+(p6)	br.cond.spnt.few copyefault		// if it's not, error out.
 	movl	r14=copyerr			// set up fault handler.
 	add	r15=PC_CURLWP,r13		// find curthread
 	;;
 	ld8	r15=[r15]
 	;;
 	add	r15=L_PCB,r15			// find pcb
 	;;
 	ld8	r15=[r15]
 	;;
 	add	loc2=PCB_ONFAULT,r15
 	;;
 	st8	[loc2]=r14
 	;;
 @@ -888,27 +887,27 @@ END(kcopy)
 ENTRY(copyin, 3)
 	.prologue
 	.regstk	3, 3, 3, 0
 	.save	ar.pfs,loc0
 	alloc	loc0=ar.pfs,3,3,3,0
 	.save	rp,loc1
 	mov	loc1=rp
 	.body
 	movl	loc2=VM_MAX_ADDRESS		// make sure that src addr
 	;;
 	cmp.geu	p6,p0=in0,loc2			// is in user space.
 	;;
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
+(p6)	br.cond.spnt.few copyefault		// if it's not, error out.
 	movl	r14=copyerr			// set up fault handler.
 	add	r15=PC_CURLWP,r13		// find curthread
 	;;
 	ld8	r15=[r15]
 	;;
 	add	r15=L_PCB,r15			// find pcb
 	;;
 	ld8	r15=[r15]
 	;;
 	add	loc2=PCB_ONFAULT,r15
 	;;
 	st8	[loc2]=r14
 	;;
 @@ -926,27 +925,27 @@ END(copyin)
 ENTRY(copyout, 3)
 	.prologue
 	.regstk	3, 3, 3, 0
 	.save	ar.pfs,loc0
 	alloc	loc0=ar.pfs,3,3,3,0
 	.save	rp,loc1
 	mov	loc1=rp
 	.body
 	movl	loc2=VM_MAX_ADDRESS		// make sure that dest addr
 	;;
 	cmp.geu	p6,p0=in1,loc2			// is in user space.
 	;;
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
+(p6)	br.cond.spnt.few copyefault		// if it's not, error out.
 	movl	r14=copyerr			// set up fault handler.
 	add	r15=PC_CURLWP,r13		// find curthread
 	;;
 	ld8	r15=[r15]
 	;;
 	add	r15=L_PCB,r15			// find pcb
 	;;
 	ld8	r15=[r15]
 	;;
 	add	loc2=PCB_ONFAULT,r15
 	;;
 	st8	[loc2]=r14
 	;;
 @@ -959,30 +958,41 @@ ENTRY(copyout, 3)
 	mov	ar.pfs=loc0			// restore ar.pfs
 	mov	rp=loc1				// restore ra.
 	br.ret.sptk.few rp			// ret0 left over from bcopy
 END(copyout)
 ENTRY(copyerr, 0)
 	add	r14=PC_CURLWP,r13 ;;		// find curthread
 	ld8	r14=[r14] ;;
 	add	r14=L_PCB,r14 ;;		// curthread->td_addr
 	ld8	r14=[r14] ;;
 	add	r14=PCB_ONFAULT,r14 ;;		// &curthread->td_pcb->pcb_onfault
 	st8	[r14]=r0			// reset fault handler
 	mov	ret0=EFAULT			// return EFAULT
 	br.ret.sptk.few rp
 END(copyerr)
 ENTRY(copyefault, 0)
 	add	r14=PC_CURLWP,r13 ;;		// find curthread
 	ld8	r14=[r14] ;;
 	add	r14=L_PCB,r14 ;;		// curthread->td_addr
 	ld8	r14=[r14] ;;
 	add	r14=PCB_ONFAULT,r14 ;;		// &curthread->td_pcb->pcb_onfault
 	st8	[r14]=r0			// reset fault handler
 	mov	ret0=EFAULT			// return EFAULT
 	br.ret.sptk.few rp
 END(copyefault)
 #if defined(GPROF)
 /*
  * Important registers:
  *      r8      structure return address
  *      rp      our return address
  *      in0     caller's ar.pfs
  *      in1     caller's gp
  *      in2     caller's rp
  *      in3     GOT entry
  *      ar.pfs  our pfs
  */
 ENTRY_NOPROFILE(_mcount, 4)
 	alloc		loc0 = ar.pfs, 4, 3, 2, 0