1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- server/ptrace.c.orig
+++ server/ptrace.c
@@ -291,12 +291,40 @@
/* read a long from a thread address space */
static int read_thread_long( struct thread *thread, void *addr, unsigned long *data )
{
+#if defined(__FreeBSD__) && defined(__x86_64__)
+
+ int lo, hi;
+
+ errno = 0;
+
+ lo = ptrace(PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0);
+ if (lo == -1 && errno)
+ {
+ *data = -1;
+ file_set_error();
+ return -1;
+ }
+
+ hi = ptrace(PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr + 4, 0);
+ if (hi == -1 && errno)
+ {
+ *data = -1;
+ file_set_error();
+ return -1;
+ }
+
+ *data = hi;
+ *data = (*data << 32) + lo;
+
+ return 0;
+#else
errno = 0;
*data = ptrace( PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0 );
if ( *data == -1 && errno)
{
file_set_error();
return -1;
}
return 0;
+#endif
}
@@ -322,8 +350,18 @@
if (read_thread_long( thread, addr, &old_data ) == -1) return -1;
data = (data & mask) | (old_data & ~mask);
}
+
+#if defined(__FreeBSD__) && defined(__x86_64__)
+ if ((res = ptrace(PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr, data)) == -1 ||
+ (res = ptrace(PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr + 4, data >> 32)) == -1)
+ {
+ file_set_error();
+ }
+#else
if ((res = ptrace( PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr, data )) == -1)
file_set_error();
+#endif
+
return res;
}
|
