git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
sys-i386
/
ptrace_user.c
diff --git
a/arch/um/sys-i386/ptrace_user.c
b/arch/um/sys-i386/ptrace_user.c
index
69aa6d6
..
01212c8
100644
(file)
--- a/
arch/um/sys-i386/ptrace_user.c
+++ b/
arch/um/sys-i386/ptrace_user.c
@@
-4,16
+4,18
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <stddef.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
-#include <linux/stddef.h>
-#include <sys/ptrace.h>
-#include <asm/ptrace.h>
+#include "ptrace_user.h"
+/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
#include <asm/user.h>
#include "kern_util.h"
#include "sysdep/thread.h"
#include "user.h"
#include "os.h"
#include <asm/user.h>
#include "kern_util.h"
#include "sysdep/thread.h"
#include "user.h"
#include "os.h"
+#include "uml-config.h"
+#include "user_util.h"
int ptrace_getregs(long pid, unsigned long *regs_out)
{
int ptrace_getregs(long pid, unsigned long *regs_out)
{
@@
-43,19
+45,20
@@
int ptrace_setfpregs(long pid, unsigned long *regs)
return 0;
}
return 0;
}
+/* All the below stuff is of interest for TT mode only */
static void write_debugregs(int pid, unsigned long *regs)
{
struct user *dummy;
int nregs, i;
dummy = NULL;
static void write_debugregs(int pid, unsigned long *regs)
{
struct user *dummy;
int nregs, i;
dummy = NULL;
- nregs =
sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]
);
+ nregs =
ARRAY_SIZE(dummy->u_debugreg
);
for(i = 0; i < nregs; i++){
if((i == 4) || (i == 5)) continue;
for(i = 0; i < nregs; i++){
if((i == 4) || (i == 5)) continue;
- if(ptrace(PTRACE_POKEUS
E
R, pid, &dummy->u_debugreg[i],
+ if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
regs[i]) < 0)
printk("write_debugregs - ptrace failed on "
regs[i]) < 0)
printk("write_debugregs - ptrace failed on "
- "register %d, value = 0x%x, errno = %d\n", i,
+ "register %d, value = 0x%
l
x, errno = %d\n", i,
regs[i], errno);
}
}
regs[i], errno);
}
}
@@
-66,16
+69,15
@@
static void read_debugregs(int pid, unsigned long *regs)
int nregs, i;
dummy = NULL;
int nregs, i;
dummy = NULL;
- nregs =
sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]
);
+ nregs =
ARRAY_SIZE(dummy->u_debugreg
);
for(i = 0; i < nregs; i++){
for(i = 0; i < nregs; i++){
- regs[i] = ptrace(PTRACE_PEEKUS
E
R, pid,
+ regs[i] = ptrace(PTRACE_PEEKUSR, pid,
&dummy->u_debugreg[i], 0);
}
}
/* Accessed only by the tracing thread */
static unsigned long kernel_debugregs[8] = { [ 0 ... 7 ] = 0 };
&dummy->u_debugreg[i], 0);
}
}
/* Accessed only by the tracing thread */
static unsigned long kernel_debugregs[8] = { [ 0 ... 7 ] = 0 };
-static int debugregs_seq = 0;
void arch_enter_kernel(void *task, int pid)
{
void arch_enter_kernel(void *task, int pid)
{
@@
-89,6
+91,11
@@
void arch_leave_kernel(void *task, int pid)
write_debugregs(pid, TASK_DEBUGREGS(task));
}
write_debugregs(pid, TASK_DEBUGREGS(task));
}
+#ifdef UML_CONFIG_PT_PROXY
+/* Accessed only by the tracing thread */
+static int debugregs_seq;
+
+/* Only called by the ptrace proxy */
void ptrace_pokeuser(unsigned long addr, unsigned long data)
{
if((addr < offsetof(struct user, u_debugreg[0])) ||
void ptrace_pokeuser(unsigned long addr, unsigned long data)
{
if((addr < offsetof(struct user, u_debugreg[0])) ||
@@
-109,6
+116,7
@@
static void update_debugregs_cb(void *arg)
write_debugregs(pid, kernel_debugregs);
}
write_debugregs(pid, kernel_debugregs);
}
+/* Optimized out in its header when not defined */
void update_debugregs(int seq)
{
int me;
void update_debugregs(int seq)
{
int me;
@@
-118,6
+126,7
@@
void update_debugregs(int seq)
me = os_getpid();
initial_thread_cb(update_debugregs_cb, &me);
}
me = os_getpid();
initial_thread_cb(update_debugregs_cb, &me);
}
+#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
/*
* Overrides for Emacs so that we follow Linus's tabbing style.