X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..4b17d6b6e417f714551ec129064745ea9919780e:/bsd/dev/i386/stubs.c

diff --git a/bsd/dev/i386/stubs.c b/bsd/dev/i386/stubs.c
index beb116a10..ddc759c29 100644
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1997 by Apple Computer, Inc., all rights reserved
@@ -30,17 +33,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
+#include <sys/kauth.h>
+#include <sys/ucred.h>
+#include <sys/proc_internal.h>
 #include <sys/user.h>
 #include <kern/task.h>
 #include <kern/thread.h>
-#include <kern/thread_act.h>
 #include <vm/vm_map.h>
+#include <machine/machine_routines.h>
 
+/* XXX should be elsewhere (cpeak) */
+extern void	*get_bsduthreadarg(thread_t);
+extern int	*get_bsduthreadrval(thread_t);
+extern void	*find_user_regs(thread_t);
 
 /* 
  * copy a null terminated string from the kernel address space into
@@ -53,17 +61,19 @@
  * the number of bytes copied is always returned in lencopied.
  */
 int
-copyoutstr(from, to, maxlen, lencopied)
-    void * from, * to;
-    size_t maxlen, *lencopied;
+copyoutstr(const void *from, user_addr_t to, size_t maxlen, size_t *lencopied)
 {
-	int slen,len,error=0;
+	size_t	slen;
+	size_t	len;
+	int	error = 0;
 
 	slen = strlen(from) + 1;
+	if (slen > maxlen)
+		error = ENAMETOOLONG;
 
 	len = min(maxlen,slen);
 	if (copyout(from, to, len))
-		error = EIO;
+		error = EFAULT;
 	*lencopied = len;
 
 	return error;
@@ -82,59 +92,52 @@ copyoutstr(from, to, maxlen, lencopied)
  */
 /* from ppc/fault_copy.c -Titan1T4 VERSION  */
 int
-copystr(vfrom, vto, maxlen, lencopied)
-    register void * vfrom, *vto;
-    size_t maxlen, *lencopied;
+copystr(const void *vfrom, void *vto, size_t maxlen, size_t *lencopied)
 {
-    register unsigned l;
-    int error;
-caddr_t from, to;
-
-	from = vfrom;
-	to = vto;
-    for (l = 0; l < maxlen; l++)
-        if ((*to++ = *from++) == '\0') {
-            if (lencopied)
-                *lencopied = l + 1;
-            return 0;
-        }
-    if (lencopied)
-	*lencopied = maxlen;
-    return ENAMETOOLONG;
+	size_t		l;
+	char const	*from = (char const *) vfrom;
+	char		*to = (char *) vto;
+
+	for (l = 0; l < maxlen; l++) {
+		if ((*to++ = *from++) == '\0') {
+			if (lencopied)
+				*lencopied = l + 1;
+			return 0;
+		}
+	}
+	if (lencopied)
+		*lencopied = maxlen;
+	return ENAMETOOLONG;
 }
 
-int copywithin(src, dst, count)
-void  * src, *dst;
-size_t count;
+int
+copywithin(void *src, void *dst, size_t count)
 {
 	bcopy(src,dst,count);
 	return 0;
 }
 
-cpu_number() {return(0);}
-
-set_bsduthreadargs(thread_t th, void * pcb, void *ignored_arg)
-{
-struct uthread * ut;
-
-	ut = get_bsdthread_info(th);
-	ut->uu_ar0 = (int *)pcb;
-
-	return(1);
-}
-
 void *
 get_bsduthreadarg(thread_t th)
 {
+        void	*arg_ptr;
 struct uthread *ut;
+  
 	ut = get_bsdthread_info(th);
-	return((void *)(ut->uu_arg));
+
+	if (ml_thread_is64bit(th) == TRUE)
+	        arg_ptr = (void *)saved_state64(find_user_regs(th));
+	else
+		arg_ptr = (void *)(ut->uu_arg);
+
+	return(arg_ptr);
 }
 
 int *
-get_bsduthreadrval(thread_act_t th)
+get_bsduthreadrval(thread_t th)
 {
 struct uthread *ut;
+
 	ut = get_bsdthread_info(th);
 	return(&ut->uu_rval[0]);
 }