aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/kernel/ptrace.c46
-rw-r--r--arch/sparc64/kernel/ptrace.c43
2 files changed, 0 insertions, 89 deletions
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index c1e7e6ae7c6f..0619958ecfdc 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -236,19 +236,6 @@ failure:
236} 236}
237 237
238/* #define ALLOW_INIT_TRACING */ 238/* #define ALLOW_INIT_TRACING */
239/* #define DEBUG_PTRACE */
240
241#ifdef DEBUG_PTRACE
242char *pt_rq [] = {
243 /* 0 */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
244 /* 4 */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
245 /* 8 */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
246 /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
247 /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
248 /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
249 /* 24 */ "SYSCALL", ""
250};
251#endif
252 239
253/* 240/*
254 * Called by kernel/ptrace.c when detaching.. 241 * Called by kernel/ptrace.c when detaching..
@@ -552,23 +539,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
552 int ret; 539 int ret;
553 540
554 lock_kernel(); 541 lock_kernel();
555#ifdef DEBUG_PTRACE
556 {
557 char *s;
558
559 if ((request >= 0) && (request <= 24))
560 s = pt_rq [request];
561 else
562 s = "unknown";
563
564 if (request == PTRACE_POKEDATA && data == 0x91d02001){
565 printk ("do_ptrace: breakpoint pid=%d, addr=%08lx addr2=%08lx\n",
566 pid, addr, addr2);
567 } else
568 printk("do_ptrace: rq=%s(%d) pid=%d addr=%08lx data=%08lx addr2=%08lx\n",
569 s, (int) request, (int) pid, addr, data, addr2);
570 }
571#endif
572 542
573 if (request == PTRACE_TRACEME) { 543 if (request == PTRACE_TRACEME) {
574 ret = ptrace_traceme(); 544 ret = ptrace_traceme();
@@ -650,9 +620,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
650 for(rval = 1; rval < 16; rval++) 620 for(rval = 1; rval < 16; rval++)
651 __put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 1])); 621 __put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 1]));
652 pt_succ_return(regs, 0); 622 pt_succ_return(regs, 0);
653#ifdef DEBUG_PTRACE
654 printk ("PC=%x nPC=%x o7=%x\n", cregs->pc, cregs->npc, cregs->u_regs [15]);
655#endif
656 goto out_tsk; 623 goto out_tsk;
657 } 624 }
658 625
@@ -801,12 +768,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
801 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); 768 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
802 769
803 child->exit_code = data; 770 child->exit_code = data;
804#ifdef DEBUG_PTRACE
805 printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n",
806 child->comm, child->pid, child->exit_code,
807 child->thread.kregs->pc,
808 child->thread.kregs->npc);
809#endif
810 wake_up_process(child); 771 wake_up_process(child);
811 pt_succ_return(regs, 0); 772 pt_succ_return(regs, 0);
812 goto out_tsk; 773 goto out_tsk;
@@ -858,9 +819,6 @@ out:
858 819
859asmlinkage void syscall_trace(void) 820asmlinkage void syscall_trace(void)
860{ 821{
861#ifdef DEBUG_PTRACE
862 printk("%s [%d]: syscall_trace\n", current->comm, current->pid);
863#endif
864 if (!test_thread_flag(TIF_SYSCALL_TRACE)) 822 if (!test_thread_flag(TIF_SYSCALL_TRACE))
865 return; 823 return;
866 if (!(current->ptrace & PT_PTRACED)) 824 if (!(current->ptrace & PT_PTRACED))
@@ -873,10 +831,6 @@ asmlinkage void syscall_trace(void)
873 * for normal use. strace only continues with a signal if the 831 * for normal use. strace only continues with a signal if the
874 * stopping signal is not SIGTRAP. -brl 832 * stopping signal is not SIGTRAP. -brl
875 */ 833 */
876#ifdef DEBUG_PTRACE
877 printk("%s [%d]: syscall_trace exit= %x\n", current->comm,
878 current->pid, current->exit_code);
879#endif
880 if (current->exit_code) { 834 if (current->exit_code) {
881 send_sig (current->exit_code, current, 1); 835 send_sig (current->exit_code, current, 1);
882 current->exit_code = 0; 836 current->exit_code = 0;
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 668f569498b6..2232e85c8415 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -87,19 +87,6 @@ pt_os_succ_return (struct pt_regs *regs, unsigned long val, void __user *addr)
87} 87}
88 88
89/* #define ALLOW_INIT_TRACING */ 89/* #define ALLOW_INIT_TRACING */
90/* #define DEBUG_PTRACE */
91
92#ifdef DEBUG_PTRACE
93char *pt_rq [] = {
94 /* 0 */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
95 /* 4 */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
96 /* 8 */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
97 /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
98 /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
99 /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
100 /* 24 */ "SYSCALL", ""
101};
102#endif
103 90
104/* 91/*
105 * Called by kernel/ptrace.c when detaching.. 92 * Called by kernel/ptrace.c when detaching..
@@ -763,23 +750,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
763 addr2 &= 0xffffffffUL; 750 addr2 &= 0xffffffffUL;
764 } 751 }
765 lock_kernel(); 752 lock_kernel();
766#ifdef DEBUG_PTRACE
767 {
768 char *s;
769
770 if ((request >= 0) && (request <= 24))
771 s = pt_rq [request];
772 else
773 s = "unknown";
774
775 if (request == PTRACE_POKEDATA && data == 0x91d02001){
776 printk ("do_ptrace: breakpoint pid=%d, addr=%016lx addr2=%016lx\n",
777 pid, addr, addr2);
778 } else
779 printk("do_ptrace: rq=%s(%d) pid=%d addr=%016lx data=%016lx addr2=%016lx\n",
780 s, request, pid, addr, data, addr2);
781 }
782#endif
783 if (request == PTRACE_TRACEME) { 753 if (request == PTRACE_TRACEME) {
784 ret = ptrace_traceme(); 754 ret = ptrace_traceme();
785 if (ret < 0) 755 if (ret < 0)
@@ -905,9 +875,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
905 goto out_tsk; 875 goto out_tsk;
906 } 876 }
907 pt_succ_return(regs, 0); 877 pt_succ_return(regs, 0);
908#ifdef DEBUG_PTRACE
909 printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, cregs->u_regs [15]);
910#endif
911 goto out_tsk; 878 goto out_tsk;
912 } 879 }
913 880
@@ -932,9 +899,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
932 goto out_tsk; 899 goto out_tsk;
933 } 900 }
934 pt_succ_return(regs, 0); 901 pt_succ_return(regs, 0);
935#ifdef DEBUG_PTRACE
936 printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, cregs->u_regs [15]);
937#endif
938 goto out_tsk; 902 goto out_tsk;
939 } 903 }
940 904
@@ -1152,13 +1116,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
1152 } 1116 }
1153 1117
1154 child->exit_code = data; 1118 child->exit_code = data;
1155#ifdef DEBUG_PTRACE
1156 printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n", child->comm,
1157 child->pid, child->exit_code,
1158 task_pt_regs(child)->tpc,
1159 task_pt_regs(child)->tnpc);
1160
1161#endif
1162 wake_up_process(child); 1119 wake_up_process(child);
1163 pt_succ_return(regs, 0); 1120 pt_succ_return(regs, 0);
1164 goto out_tsk; 1121 goto out_tsk;