xnu-6153.11.26.tar.gz

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

diff --git a/bsd/dev/i386/dtrace_subr_x86.c b/bsd/dev/i386/dtrace_subr_x86.c
index a5064d68898fec7f79268a987559b82b3448e591..e78af6efc28b44ef5551fa32cc20860890050579 100644 (file)
--- a/bsd/dev/i386/dtrace_subr_x86.c
+++ b/bsd/dev/i386/dtrace_subr_x86.c
@@ -24,10 +24,6 @@
  * Use is subject to license terms.
  */
 
-/*
- * #pragma ident       "@(#)dtrace_subr.c      1.16    07/09/18 SMI"
- */
-
 #include <sys/dtrace.h>
 #include <sys/dtrace_glue.h>
 #include <sys/dtrace_impl.h>
@@ -204,110 +200,6 @@ dtrace_user_probe(x86_saved_state_t *regs)
        return KERN_FAILURE;
 }
 
-void
-dtrace_safe_synchronous_signal(void)
-{
-#if 0
-       kthread_t *t = curthread;
-       struct regs *rp = lwptoregs(ttolwp(t));
-       size_t isz = t->t_dtrace_npc - t->t_dtrace_pc;
-
-       ASSERT(t->t_dtrace_on);
-
-       /*
-        * If we're not in the range of scratch addresses, we're not actually
-        * tracing user instructions so turn off the flags. If the instruction
-        * we copied out caused a synchonous trap, reset the pc back to its
-        * original value and turn off the flags.
-        */
-       if (rp->r_pc < t->t_dtrace_scrpc ||
-                       rp->r_pc > t->t_dtrace_astpc + isz) {
-               t->t_dtrace_ft = 0;
-       } else if (rp->r_pc == t->t_dtrace_scrpc ||
-                       rp->r_pc == t->t_dtrace_astpc) {
-               rp->r_pc = t->t_dtrace_pc;
-               t->t_dtrace_ft = 0;
-       }
-#endif /* 0 */
-}
-
-int
-dtrace_safe_defer_signal(void)
-{
-#if 0
-       kthread_t *t = curthread;
-       struct regs *rp = lwptoregs(ttolwp(t));
-       size_t isz = t->t_dtrace_npc - t->t_dtrace_pc;
-
-       ASSERT(t->t_dtrace_on);
-
-       /*
-        * If we're not in the range of scratch addresses, we're not actually
-        * tracing user instructions so turn off the flags.
-        */
-       if (rp->r_pc < t->t_dtrace_scrpc ||
-                       rp->r_pc > t->t_dtrace_astpc + isz) {
-               t->t_dtrace_ft = 0;
-               return (0);
-       }
-
-       /*
-        * If we've executed the original instruction, but haven't performed
-        * the jmp back to t->t_dtrace_npc or the clean up of any registers
-        * used to emulate %rip-relative instructions in 64-bit mode, do that
-        * here and take the signal right away. We detect this condition by
-        * seeing if the program counter is the range [scrpc + isz, astpc).
-        */
-       if (t->t_dtrace_astpc - rp->r_pc <
-                       t->t_dtrace_astpc - t->t_dtrace_scrpc - isz) {
-#ifdef __sol64
-               /*
-                * If there is a scratch register and we're on the
-                * instruction immediately after the modified instruction,
-                * restore the value of that scratch register.
-                */
-               if (t->t_dtrace_reg != 0 &&
-                               rp->r_pc == t->t_dtrace_scrpc + isz) {
-                       switch (t->t_dtrace_reg) {
-                               case REG_RAX:
-                                       rp->r_rax = t->t_dtrace_regv;
-                                       break;
-                               case REG_RCX:
-                                       rp->r_rcx = t->t_dtrace_regv;
-                                       break;
-                               case REG_R8:
-                                       rp->r_r8 = t->t_dtrace_regv;
-                                       break;
-                               case REG_R9:
-                                       rp->r_r9 = t->t_dtrace_regv;
-                                       break;
-                       }
-               }
-#endif
-               rp->r_pc = t->t_dtrace_npc;
-               t->t_dtrace_ft = 0;
-               return (0);
-       }
-
-       /*
-        * Otherwise, make sure we'll return to the kernel after executing
-        * the copied out instruction and defer the signal.
-        */
-       if (!t->t_dtrace_step) {
-               ASSERT(rp->r_pc < t->t_dtrace_astpc);
-               rp->r_pc += t->t_dtrace_astpc - t->t_dtrace_scrpc;
-               t->t_dtrace_step = 1;
-       }
-
-       t->t_dtrace_ast = 1;
-
-       return (1);
-
-#endif /* 0 */
-
-       return 0;
-}
-
 void
 dtrace_flush_caches(void)
 {