xnu-792.10.96.tar.gz

[apple/xnu.git] / bsd / kern / mach_process.c

diff --git a/bsd/kern/mach_process.c b/bsd/kern/mach_process.c
index caa043027c23e8eb8fac27a1b449dd6d67b1bc29..e07e0300a267aaa5153bea11e25ae68346f643ee 100644 (file)
--- a/bsd/kern/mach_process.c
+++ b/bsd/kern/mach_process.c
@@ -81,7 +81,6 @@
 
 #include <kern/task.h>
 #include <kern/thread.h>
 
 #include <kern/task.h>
 #include <kern/thread.h>

-#include <mach/machine/thread_status.h>

 
 
 /* Macros to clear/set/test flags. */
 
 
 /* Macros to clear/set/test flags. */


@@ -90,12 +89,8 @@
 #define        ISSET(t, f)     ((t) & (f))
 
 extern thread_t        port_name_to_thread(mach_port_name_t port_name);
 #define        ISSET(t, f)     ((t) & (f))
 
 extern thread_t        port_name_to_thread(mach_port_name_t port_name);

-extern kern_return_t thread_getstatus(thread_t thread, int flavor, thread_state_t tstate, mach_msg_type_number_t *count);

 extern thread_t get_firstthread(task_t);
 
 extern thread_t get_firstthread(task_t);
 

-#if defined (ppc)
-extern kern_return_t thread_setstatus(thread_t thread, int flavor, thread_state_t tstate, mach_msg_type_number_t count);
-#endif

 
 /*
  * sys-trace system call.
 
 /*
  * sys-trace system call.


@@ -111,15 +106,6 @@ ptrace(p, uap, retval)
        task_t          task;
        thread_t        th_act;
        struct uthread  *ut;
        task_t          task;
        thread_t        th_act;
        struct uthread  *ut;

-       int             *locr0;
-#if defined(ppc)
-       struct ppc_thread_state64 statep;
-#elif  defined(i386)
-       struct i386_saved_state statep;
-#else
-#error architecture not supported
-#endif
-       unsigned long state_count;

        int tr_sigexc = 0;
 
        AUDIT_ARG(cmd, uap->req);
        int tr_sigexc = 0;
 
        AUDIT_ARG(cmd, uap->req);


@@ -267,39 +253,16 @@ ptrace(p, uap, retval)
                th_act = (thread_t)get_firstthread(task);
                if (th_act == THREAD_NULL)
                        goto errorLabel;
                th_act = (thread_t)get_firstthread(task);
                if (th_act == THREAD_NULL)
                        goto errorLabel;

-               ut = (uthread_t)get_bsdthread_info(th_act);
-               locr0 = ut->uu_ar0;
-#if defined(i386)
-               state_count = i386_NEW_THREAD_STATE_COUNT;
-               if (thread_getstatus(th_act, i386_NEW_THREAD_STATE, &statep, &state_count)  != KERN_SUCCESS) {
-                       goto errorLabel;
-               }       
-#elif defined(ppc)
-               state_count = PPC_THREAD_STATE64_COUNT;
-               if (thread_getstatus(th_act, PPC_THREAD_STATE64, (thread_state_t)&statep, (mach_msg_type_number_t *)&state_count)  != KERN_SUCCESS) {
-                       goto errorLabel;
-               }       
-#else
-#error architecture not supported
-#endif
+

                if (uap->addr != (user_addr_t)1) {
                if (uap->addr != (user_addr_t)1) {

-#if    defined(i386)
-                       locr0[PC] = (int)uap->addr;
-#elif  defined(ppc)
+#if defined(ppc)

 #define ALIGNED(addr,size)     (((unsigned)(addr)&((size)-1))==0)
 #define ALIGNED(addr,size)     (((unsigned)(addr)&((size)-1))==0)

-               if (!ALIGNED((int)uap->addr, sizeof(int)))
-                       return (ERESTART);
-
-               statep.srr0 = uap->addr;
-               state_count = PPC_THREAD_STATE64_COUNT;
-               if (thread_setstatus(th_act, PPC_THREAD_STATE64, (thread_state_t)&statep, state_count)  != KERN_SUCCESS) {
-                       goto errorLabel;
-               }       
+                       if (!ALIGNED((int)uap->addr, sizeof(int)))
+                               return (ERESTART);

 #undef         ALIGNED
 #undef         ALIGNED

-#else
-#error architecture not implemented!

 #endif
 #endif

-               } /* uap->addr != (user_addr_t)1 */
+                       thread_setentrypoint(th_act, uap->addr);
+               }

 
                if ((unsigned)uap->data >= NSIG)
                        goto errorLabel;
 
                if ((unsigned)uap->data >= NSIG)
                        goto errorLabel;


@@ -307,37 +270,18 @@ ptrace(p, uap, retval)
                if (uap->data != 0) {
                        psignal_lock(t, uap->data, 0);
                 }
                if (uap->data != 0) {
                        psignal_lock(t, uap->data, 0);
                 }

-#if defined(ppc)
-               state_count = PPC_THREAD_STATE64_COUNT;
-               if (thread_getstatus(th_act, PPC_THREAD_STATE64, (thread_state_t)&statep, (mach_msg_type_number_t *)&state_count)  != KERN_SUCCESS) {
-                       goto errorLabel;
-               }       
-#endif
-
-#define MSR_SE_BIT     21

 
                if (uap->req == PT_STEP) {
 
                if (uap->req == PT_STEP) {

-#if    defined(i386)
-                       locr0[PS] |= PSL_T;
-#elif  defined(ppc)
-                       statep.srr1 |= MASK(MSR_SE);
-#else
-#error architecture not implemented!
-#endif
-               } /* uap->req == PT_STEP */
-               else {  /* PT_CONTINUE - clear trace bit if set */
-#if defined(i386)
-                       locr0[PS] &= ~PSL_T;
-#elif defined(ppc)
-                       statep.srr1 &= ~MASK(MSR_SE);
-#endif
+                       /*
+                        * set trace bit
+                        */
+                       thread_setsinglestep(th_act, 1);
+               } else {
+                       /*
+                        * clear trace bit if on
+                        */
+                       thread_setsinglestep(th_act, 0);

                }
                }

-#if defined (ppc)
-               state_count = PPC_THREAD_STATE64_COUNT;
-               if (thread_setstatus(th_act, PPC_THREAD_STATE64, (thread_state_t)&statep, state_count)  != KERN_SUCCESS) {
-                       goto errorLabel;
-               }       
-#endif

        resume:
                t->p_xstat = uap->data;
                t->p_stat = SRUN;
        resume:
                t->p_xstat = uap->data;
                t->p_stat = SRUN;