xnu-2050.24.15.tar.gz

[apple/xnu.git] / bsd / dev / i386 / stubs.c

diff --git a/bsd/dev/i386/stubs.c b/bsd/dev/i386/stubs.c
index f4804dad7200768d936164c4eb8cc0d6cabbce62..ddc759c29b54cf2eb1f1f7458084f9c511aee40f 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -43,12 +43,12 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <vm/vm_map.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <vm/vm_map.h>

+#include <machine/machine_routines.h>

 
 /* XXX should be elsewhere (cpeak) */
 
 /* XXX should be elsewhere (cpeak) */

-extern int     set_bsduthreadargs(thread_t, void *, void *);

 extern void    *get_bsduthreadarg(thread_t);
 extern int     *get_bsduthreadrval(thread_t);
 extern void    *get_bsduthreadarg(thread_t);
 extern int     *get_bsduthreadrval(thread_t);

-extern int     *get_bsduthreadlowpridelay(thread_t);
+extern void    *find_user_regs(thread_t);

 
 /* 
  * copy a null terminated string from the kernel address space into
 
 /* 
  * copy a null terminated string from the kernel address space into


@@ -117,56 +117,27 @@ copywithin(void *src, void *dst, size_t count)
        return 0;
 }
 
        return 0;
 }
 

-int
-set_bsduthreadargs(thread_t th, void * pcb, __unused void *ignored_arg)
-{
-       struct uthread * ut;
-       struct proc *p = current_proc();
-
-       ut = get_bsdthread_info(th);
-       ut->uu_ar0 = (int *)pcb;
-
-       /*
-        * Delayed binding of thread credential to process credential.
-        *
-        * XXX This doesn't really belong here, but the i386 code has a
-        * XXX number of seemingly gratuitous structural differences that
-        * XXX make this the most appropriate place to do the work.
-        */
-       if (ut->uu_ucred != p->p_ucred &&
-           (ut->uu_flag & UT_SETUID) == 0) {
-               kauth_cred_t old = ut->uu_ucred;
-               proc_lock(p);
-               ut->uu_ucred = p->p_ucred;
-               kauth_cred_ref(ut->uu_ucred);
-               proc_unlock(p);
-               if (old != NOCRED)
-                       kauth_cred_rele(old);
-       }
-
-       return(1);
-}
-

 void *
 get_bsduthreadarg(thread_t th)
 {
 void *
 get_bsduthreadarg(thread_t th)
 {

+        void   *arg_ptr;

 struct uthread *ut;
 struct uthread *ut;

+  

        ut = get_bsdthread_info(th);
        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_t th)
 {
 struct uthread *ut;
 }
 
 int *
 get_bsduthreadrval(thread_t th)
 {
 struct uthread *ut;

-       ut = get_bsdthread_info(th);
-       return(&ut->uu_rval[0]);
-}

 
 

-int *
-get_bsduthreadlowpridelay(thread_t th)
-{
-struct uthread *ut;

        ut = get_bsdthread_info(th);
        ut = get_bsdthread_info(th);

-       return(&ut->uu_lowpri_delay);
+       return(&ut->uu_rval[0]);

 }
 }