* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
@ 2013-07-23 5:35 Raunaq 12
2013-07-23 9:01 ` Mark Kettenis
2013-07-23 19:40 ` Tom Tromey
0 siblings, 2 replies; 11+ messages in thread
From: Raunaq 12 @ 2013-07-23 5:35 UTC (permalink / raw)
To: gdb-patches; +Cc: Mark Kettenis, tromey
I have restricted the macro definitions to only gdb_ptrace.h.
Something like this as seen below -
#ifdef PTRACE_TYPE_ARG5
# ifdef BFD64
# define ptrace(request, pid, addr, data) \
ptrace64 (request, (long long)pid, (long long)addr, data, 0)
# else
# define ptrace(request, pid, addr, data) \
ptrace(request, (int)pid, (PTRACE_TYPE_ARG3)addr, data, 0)
# endif
#endif
I have type cast pid here to avoid additional compiler warnings.
> So unless I'm missing something, you should not need to make any
> changes to inf-ptrace.c itself.
But, inf-ptrace.c makes ptrace calls as seen below -
ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0)
If I make the macro definitions in gdb_ptrace.h as seen above, then
the casts for the 'Address'(3rd parameter in ptrace call) should
be removed from ptrace calls in inf-ptrace.c as seen below -
ptrace (PT_DETACH, fpid, 1, 0)
The macro is taking care of all the type casts.
ptrace64() accepts (long long) as the address parameter while
ptrace() accepts int* or any integer pointer as the type for address.
So, this type cast is necessary. Agree that pid cast is not needed.
Here is the modified patch below -
---
Index: ./gdb/gdb_ptrace.h
===================================================================
--- ./gdb.orig/gdb_ptrace.h
+++ ./gdb/gdb_ptrace.h
@@ -135,7 +135,13 @@
zero. */
#ifdef PTRACE_TYPE_ARG5
-# define ptrace(request, pid, addr, data) ptrace (request, pid, addr,
data, 0)
+# ifdef BFD64
+# define ptrace(request, pid, addr, data) \
+ ptrace64 (request, (long long)pid, (long long)addr, data, 0)
+# else
+# define ptrace(request, pid, addr, data) \
+ ptrace(request, (int)pid, (PTRACE_TYPE_ARG3)addr, data, 0)
+# endif
#endif
#endif /* gdb_ptrace.h */
Index: ./gdb/inf-ptrace.c
===================================================================
--- ./gdb.orig/inf-ptrace.c
+++ ./gdb/inf-ptrace.c
@@ -48,7 +48,7 @@
pid = ptid_get_pid (inferior_ptid);
if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -72,7 +72,7 @@
it. */
remove_breakpoints ();
- if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace (PT_DETACH, pid, 1, 0) == -1)
perror_with_name (("ptrace"));
/* Switch inferior_ptid out of the parent's way. */
@@ -88,7 +88,7 @@
/* Breakpoints have already been detached from the child by
infrun.c. */
- if (ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace (PT_DETACH, fpid, 1, 0) == -1)
perror_with_name (("ptrace"));
}
@@ -104,7 +104,7 @@
inf_ptrace_me (void)
{
/* "Trace me, Dr. Memory!" */
- ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_TRACE_ME, 0, 0, 0);
}
/* Start a new inferior Unix child process. EXEC_FILE is the file to
@@ -157,7 +157,7 @@
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
if (ptrace (PT_SET_EVENT_MASK, ptid_get_pid (pid),
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -226,7 +226,7 @@
#ifdef PT_ATTACH
errno = 0;
- ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_ATTACH, pid, 0, 0);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -256,7 +256,7 @@
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
if (ptrace (PT_SET_EVENT_MASK, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -289,7 +289,7 @@
previously attached to the inferior. It *might* work if we
started the process ourselves. */
errno = 0;
- ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
+ ptrace (PT_DETACH, pid, 1, sig);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -314,7 +314,7 @@
if (pid == 0)
return;
- ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_KILL, pid, 0, 0);
waitpid (pid, &status, 0);
target_mourn_inferior ();
@@ -368,7 +368,7 @@
where it was. If GDB wanted it to start some other way, we have
already written a new program counter value to the child. */
errno = 0;
- ptrace (request, pid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal));
+ ptrace (request, pid, 1, gdb_signal_to_host (signal));
if (errno != 0)
perror_with_name (("ptrace"));
}
@@ -422,7 +422,7 @@
pid_t fpid;
if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
switch (pe.pe_report_event)
@@ -437,7 +437,7 @@
perror_with_name (("waitpid"));
if (ptrace (PT_GET_PROCESS_STATE, fpid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -491,7 +491,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace (PT_IO, pid, &piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
/* If the PT_IO request is somehow not supported, fallback on
@@ -533,8 +533,7 @@
< rounded_offset + sizeof (PTRACE_TYPE_RET)))
/* Need part of initial word -- fetch it. */
buffer.word = ptrace (PT_READ_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)
- rounded_offset, 0);
+ (uintptr_t)rounded_offset, 0);
/* Copy data to be written over corresponding part of
buffer. */
@@ -543,16 +542,14 @@
errno = 0;
ptrace (PT_WRITE_D, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- buffer.word);
+ (uintptr_t)rounded_offset, buffer.word);
if (errno)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 0;
ptrace (PT_WRITE_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- buffer.word);
+ (uintptr_t)rounded_offset, buffer.word);
if (errno)
return 0;
}
@@ -562,8 +559,7 @@
{
errno = 0;
buffer.word = ptrace (PT_READ_I, pid,
-
(PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- 0);
+ (uintptr_t)rounded_offset, 0);
if (errno)
return 0;
/* Copy appropriate bytes out of the buffer. */
@@ -593,7 +589,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace (PT_IO, pid, &piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
}
@@ -741,7 +737,7 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr,
0);
+ buf[i] = ptrace (PT_READ_U, pid, (uintptr_t)addr, 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
@@ -800,7 +796,7 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
+ ptrace (PT_WRITE_U, pid, (uintptr_t)addr, buf[i]);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
Index: ./gdb/rs6000-nat.c
===================================================================
--- ./gdb.orig/rs6000-nat.c
+++ ./gdb/rs6000-nat.c
@@ -66,7 +66,7 @@
/* In 32-bit compilation mode (which is the only mode from which ptrace()
works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
-#ifdef __ld_info32
+#if defined (__ld_info32) || defined (__ld_info64)
# define ARCH3264
#endif
@@ -181,7 +181,11 @@ regmap (struct gdbarch *gdbarch, int reg
static int
rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
{
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, (long long) addr, data, buf);
+ #else
int ret = ptrace (req, id, (int *)addr, data, buf);
+ #endif
#if 0
printf ("rs6000_ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n",
req, id, (unsigned int)addr, data, (unsigned int)buf, ret);
@@ -195,7 +199,11 @@ static int
rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
{
#ifdef ARCH3264
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, addr, data, (int *)buf);
+ #else
int ret = ptracex (req, id, addr, data, buf);
+ #endif
#else
int ret = 0;
#endif
---
Kindly review this and tell me if the changes to inf-ptrace.c are
acceptable.
Thanks & Regards,
Raunaq
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-23 5:35 [PATCH 3/5] powerpc64-aix inf-ptrace patch Raunaq 12
@ 2013-07-23 9:01 ` Mark Kettenis
2013-07-23 12:57 ` Raunaq 12
2013-07-23 19:40 ` Tom Tromey
1 sibling, 1 reply; 11+ messages in thread
From: Mark Kettenis @ 2013-07-23 9:01 UTC (permalink / raw)
To: raunaq12; +Cc: gdb-patches, mark.kettenis, tromey
> From: Raunaq 12 <raunaq12@in.ibm.com>
> Date: Tue, 23 Jul 2013 11:04:17 +0530
>
> I have restricted the macro definitions to only gdb_ptrace.h.
> Something like this as seen below -
>
> #ifdef PTRACE_TYPE_ARG5
> # ifdef BFD64
As Tom and I already told you, this #ifdef BFD64 is the wrong check.
You should add an autoconf test for ptrace64() and use #ifdef HAVE_PTRACE64.
> # define ptrace(request, pid, addr, data) \
> ptrace64 (request, (long long)pid, (long long)addr, data, 0)
> # else
> # define ptrace(request, pid, addr, data) \
> ptrace(request, (int)pid, (PTRACE_TYPE_ARG3)addr, data, 0)
> # endif
> #endif
>
> I have type cast pid here to avoid additional compiler warnings.
Really? What is the fundamental type of pid_t on AIX? It's an int on
any sane UNIX system, so expect it to be an int on AIX as well. So
casting to an int is pointless, and passing an int where a wider
signed integer type is expected should not produce a warning.
Redundant casts are bad. They hide bugs. Please drop them.
> > So unless I'm missing something, you should not need to make any
> > changes to inf-ptrace.c itself.
>
> But, inf-ptrace.c makes ptrace calls as seen below -
>
> ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0)
>
> If I make the macro definitions in gdb_ptrace.h as seen above, then
> the casts for the 'Address'(3rd parameter in ptrace call) should
> be removed from ptrace calls in inf-ptrace.c as seen below -
>
> ptrace (PT_DETACH, fpid, 1, 0)
>
> The macro is taking care of all the type casts.
> ptrace64() accepts (long long) as the address parameter while
> ptrace() accepts int* or any integer pointer as the type for address.
> So, this type cast is necessary. Agree that pid cast is not needed.
No this will break other systems. Instead, make sure PTRACE_TYPE_ARG3
gets defined to the proper type of the 3rd argument of ptrace64 when
you choose to use it. I'd expect that if you add the autoconf check I
mentioned you could simply change the #ifdef PTRACE_TYPE_ARG5 in
gdb_ptrace.h to something like:
#ifdef PTRACE_TYPE_ARG5
# ifdef HAVE_PTRACE64
# define ptrace(request, pid, addr, data) \
ptrace64 (request, pid, addr, data, 0)
# undef PTRACE_TYPE_ARG3
# define PTRACE_TYPE_ARG3 long long
# else
# define ptrace(request, pid, addr, data) \
ptrace (request, pid, addr, data, 0)
# endif
#endif
and then everything should just work.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-23 9:01 ` Mark Kettenis
@ 2013-07-23 12:57 ` Raunaq 12
2013-07-23 14:25 ` Mark Kettenis
0 siblings, 1 reply; 11+ messages in thread
From: Raunaq 12 @ 2013-07-23 12:57 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches, mark.kettenis, tromey
Thanks a lot for the feedback Mark.
> No this will break other systems. Instead, make sure PTRACE_TYPE_ARG3
> gets defined to the proper type of the 3rd argument of ptrace64 when
> you choose to use it. I'd expect that if you add the autoconf check I
> mentioned you could simply change the #ifdef PTRACE_TYPE_ARG5 in
> gdb_ptrace.h to something like:
>
> #ifdef PTRACE_TYPE_ARG5
> # ifdef HAVE_PTRACE64
> # define ptrace(request, pid, addr, data) \
> ptrace64 (request, pid, addr, data, 0)
> # undef PTRACE_TYPE_ARG3
> # define PTRACE_TYPE_ARG3 long long
> # else
> # define ptrace(request, pid, addr, data) \
> ptrace (request, pid, addr, data, 0)
> # endif
> #endif
The above suggestion of defining PTRACE_TYPE_ARG3 in gdb_ptrace.h works
very fine.
Thanks for that
I can add an autoconf check like -
AC_CHECK_FUNCS(ptrace64)
and then in gdb_ptrace.h i can add -
#ifdef PTRACE_TYPE_ARG5
# if defined (__64BIT__) && defined (HAVE_PTRACE64)
# ....
Note:- ptrace64 is defined in both 32 and 64 bit mode. But we need to use
ptrace64 only when we compile gdb in 64 BIT mode hence the __64BIT__ check.
Or I can also use the AC_CHECK_SIZEOF(long) to check if we are in 64 bit
mode.
Which do you suggest? or, is there a better way of checking this ?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-23 12:57 ` Raunaq 12
@ 2013-07-23 14:25 ` Mark Kettenis
0 siblings, 0 replies; 11+ messages in thread
From: Mark Kettenis @ 2013-07-23 14:25 UTC (permalink / raw)
To: raunaq12; +Cc: gdb-patches, tromey
> From: Raunaq 12 <raunaq12@in.ibm.com>
> Date: Tue, 23 Jul 2013 18:26:01 +0530
>
> > No this will break other systems. Instead, make sure PTRACE_TYPE_ARG3
> > gets defined to the proper type of the 3rd argument of ptrace64 when
> > you choose to use it. I'd expect that if you add the autoconf check I
> > mentioned you could simply change the #ifdef PTRACE_TYPE_ARG5 in
> > gdb_ptrace.h to something like:
> >
> > #ifdef PTRACE_TYPE_ARG5
> > # ifdef HAVE_PTRACE64
> > # define ptrace(request, pid, addr, data) \
> > ptrace64 (request, pid, addr, data, 0)
> > # undef PTRACE_TYPE_ARG3
> > # define PTRACE_TYPE_ARG3 long long
> > # else
> > # define ptrace(request, pid, addr, data) \
> > ptrace (request, pid, addr, data, 0)
> > # endif
> > #endif
>
> The above suggestion of defining PTRACE_TYPE_ARG3 in gdb_ptrace.h works
> very fine.
Great!
> I can add an autoconf check like -
>
> AC_CHECK_FUNCS(ptrace64)
Just add it to the existing AC_CHECK_FUNCS() call in configure.ac.
> and then in gdb_ptrace.h i can add -
>
> #ifdef PTRACE_TYPE_ARG5
> # if defined (__64BIT__) && defined (HAVE_PTRACE64)
> # ....
>
> Note:- ptrace64 is defined in both 32 and 64 bit mode. But we need to use
> ptrace64 only when we compile gdb in 64 BIT mode hence the __64BIT__ check.
> Or I can also use the AC_CHECK_SIZEOF(long) to check if we are in 64 bit
> mode.
>
> Which do you suggest? or, is there a better way of checking this ?
Well, is there any downside to using ptrace64 in a 32-bit GDB. The
AIX 6.1 online manual page for ptrace, ptracex, ptrace64 suggests that
will work just fine. If that is indeed the case, I would simply not
bother with the check and use ptrace64 whenever it is available.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-23 5:35 [PATCH 3/5] powerpc64-aix inf-ptrace patch Raunaq 12
2013-07-23 9:01 ` Mark Kettenis
@ 2013-07-23 19:40 ` Tom Tromey
1 sibling, 0 replies; 11+ messages in thread
From: Tom Tromey @ 2013-07-23 19:40 UTC (permalink / raw)
To: Raunaq 12; +Cc: gdb-patches, Mark Kettenis
>>>>> ">" == Raunaq 12 <raunaq12@in.ibm.com> writes:
>> Kindly review this and tell me if the changes to inf-ptrace.c are
>> acceptable.
It would be good to repost all the relevant patches in a new thread
series. It's hard to tell now what is still needed and what is
obsolete.
Tom
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-15 9:12 ` Mark Kettenis
@ 2013-07-16 10:48 ` Raunaq 12
0 siblings, 0 replies; 11+ messages in thread
From: Raunaq 12 @ 2013-07-16 10:48 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches, tromey
I have restricted the macro definitions to only gdb_ptrace.h.
Something like this as seen below -
#ifdef PTRACE_TYPE_ARG5
# ifdef BFD64
# define ptrace(request, pid, addr, data) \
ptrace64 (request, (long long)pid, (long long)addr, data, 0)
# else
# define ptrace(request, pid, addr, data) \
ptrace(request, (int)pid, (PTRACE_TYPE_ARG3)addr, data, 0)
# endif
#endif
I have type cast pid here to avoid additional compiler warnings.
> So unless I'm missing something, you should not need to make any
> changes to inf-ptrace.c itself.
But, inf-ptrace.c makes ptrace calls as seen below -
ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0)
If I make the macro definitions in gdb_ptrace.h as seen above, then
the casts for the 'Address'(3rd parameter in ptrace call) should
be removed from ptrace calls in inf-ptrace.c as seen below -
ptrace (PT_DETACH, fpid, 1, 0)
The macro is taking care of all the type casts.
ptrace64() accepts (long long) as the address parameter while
ptrace() accepts int* or any integer pointer as the type for address.
So, this type cast is necessary. Agree that pid cast is not needed.
Here is the modified patch below -
---
Index: ./gdb/gdb_ptrace.h
===================================================================
--- ./gdb.orig/gdb_ptrace.h
+++ ./gdb/gdb_ptrace.h
@@ -135,7 +135,13 @@
zero. */
#ifdef PTRACE_TYPE_ARG5
-# define ptrace(request, pid, addr, data) ptrace (request, pid, addr,
data, 0)
+# ifdef BFD64
+# define ptrace(request, pid, addr, data) \
+ ptrace64 (request, (long long)pid, (long long)addr, data, 0)
+# else
+# define ptrace(request, pid, addr, data) \
+ ptrace(request, (int)pid, (PTRACE_TYPE_ARG3)addr, data, 0)
+# endif
#endif
#endif /* gdb_ptrace.h */
Index: ./gdb/inf-ptrace.c
===================================================================
--- ./gdb.orig/inf-ptrace.c
+++ ./gdb/inf-ptrace.c
@@ -48,7 +48,7 @@
pid = ptid_get_pid (inferior_ptid);
if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -72,7 +72,7 @@
it. */
remove_breakpoints ();
- if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace (PT_DETACH, pid, 1, 0) == -1)
perror_with_name (("ptrace"));
/* Switch inferior_ptid out of the parent's way. */
@@ -88,7 +88,7 @@
/* Breakpoints have already been detached from the child by
infrun.c. */
- if (ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace (PT_DETACH, fpid, 1, 0) == -1)
perror_with_name (("ptrace"));
}
@@ -104,7 +104,7 @@
inf_ptrace_me (void)
{
/* "Trace me, Dr. Memory!" */
- ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_TRACE_ME, 0, 0, 0);
}
/* Start a new inferior Unix child process. EXEC_FILE is the file to
@@ -157,7 +157,7 @@
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
if (ptrace (PT_SET_EVENT_MASK, ptid_get_pid (pid),
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -226,7 +226,7 @@
#ifdef PT_ATTACH
errno = 0;
- ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_ATTACH, pid, 0, 0);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -256,7 +256,7 @@
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
if (ptrace (PT_SET_EVENT_MASK, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -289,7 +289,7 @@
previously attached to the inferior. It *might* work if we
started the process ourselves. */
errno = 0;
- ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
+ ptrace (PT_DETACH, pid, 1, sig);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -314,7 +314,7 @@
if (pid == 0)
return;
- ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace (PT_KILL, pid, 0, 0);
waitpid (pid, &status, 0);
target_mourn_inferior ();
@@ -368,7 +368,7 @@
where it was. If GDB wanted it to start some other way, we have
already written a new program counter value to the child. */
errno = 0;
- ptrace (request, pid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal));
+ ptrace (request, pid, 1, gdb_signal_to_host (signal));
if (errno != 0)
perror_with_name (("ptrace"));
}
@@ -422,7 +422,7 @@
pid_t fpid;
if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
switch (pe.pe_report_event)
@@ -437,7 +437,7 @@
perror_with_name (("waitpid"));
if (ptrace (PT_GET_PROCESS_STATE, fpid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ &pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -491,7 +491,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace (PT_IO, pid, &piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
/* If the PT_IO request is somehow not supported, fallback on
@@ -533,8 +533,7 @@
< rounded_offset + sizeof (PTRACE_TYPE_RET)))
/* Need part of initial word -- fetch it. */
buffer.word = ptrace (PT_READ_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)
- rounded_offset, 0);
+ (uintptr_t)rounded_offset, 0);
/* Copy data to be written over corresponding part of
buffer. */
@@ -543,16 +542,14 @@
errno = 0;
ptrace (PT_WRITE_D, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- buffer.word);
+ (uintptr_t)rounded_offset, buffer.word);
if (errno)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 0;
ptrace (PT_WRITE_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- buffer.word);
+ (uintptr_t)rounded_offset, buffer.word);
if (errno)
return 0;
}
@@ -562,8 +559,7 @@
{
errno = 0;
buffer.word = ptrace (PT_READ_I, pid,
-
(PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
- 0);
+ (uintptr_t)rounded_offset, 0);
if (errno)
return 0;
/* Copy appropriate bytes out of the buffer. */
@@ -593,7 +589,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace (PT_IO, pid, &piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
}
@@ -741,7 +737,7 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr,
0);
+ buf[i] = ptrace (PT_READ_U, pid, (uintptr_t)addr, 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
@@ -800,7 +796,7 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
+ ptrace (PT_WRITE_U, pid, (uintptr_t)addr, buf[i]);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
Index: ./gdb/rs6000-nat.c
===================================================================
--- ./gdb.orig/rs6000-nat.c
+++ ./gdb/rs6000-nat.c
@@ -66,7 +66,7 @@
/* In 32-bit compilation mode (which is the only mode from which ptrace()
works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
-#ifdef __ld_info32
+#if defined (__ld_info32) || defined (__ld_info64)
# define ARCH3264
#endif
@@ -181,7 +181,11 @@ regmap (struct gdbarch *gdbarch, int reg
static int
rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
{
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, (long long) addr, data, buf);
+ #else
int ret = ptrace (req, id, (int *)addr, data, buf);
+ #endif
#if 0
printf ("rs6000_ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n",
req, id, (unsigned int)addr, data, (unsigned int)buf, ret);
@@ -195,7 +199,11 @@ static int
rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
{
#ifdef ARCH3264
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, addr, data, (int *)buf);
+ #else
int ret = ptracex (req, id, addr, data, buf);
+ #endif
#else
int ret = 0;
#endif
---
Kindly review this and tell me if the changes to inf-ptrace.c are
acceptable.
Thanks & Regards,
Raunaq
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-15 7:32 ` Raunaq 12
@ 2013-07-15 9:12 ` Mark Kettenis
2013-07-16 10:48 ` Raunaq 12
0 siblings, 1 reply; 11+ messages in thread
From: Mark Kettenis @ 2013-07-15 9:12 UTC (permalink / raw)
To: raunaq12; +Cc: gdb-patches, tromey
> From: Raunaq 12 <raunaq12@in.ibm.com>
> Date: Mon, 15 Jul 2013 13:00:35 +0530
>
> Hi Mark/Tom,
>
> Thanks for the feedback.
>
> I removed the newly added file and instead used a wrapper function and
> macros.
> Kindly review the patch below and let me know if this should be okay ?
Not quite.
> ChangeLog :-
>
> * inf-ptrace.c: Add support for ptrace64 in 64 BIT mode
> (inf_ptrace_follow_fork): Likewise
> (inf_ptrace_me): Likewise
> (inf_ptrace_post_startup_inferior): Likewise
> (inf_ptrace_attach): Likewise
> (inf_ptrace_post_attach): Likewise
> (inf_ptrace_detach): Likewise
> (inf_ptrace_kill): Likewise
> (inf_ptrace_resume): Likewise
> (inf_ptrace_wait): Likewise
> (inf_ptrace_xfer_partial): Likewise
> (inf_ptrace_fetch_register): Likewise
> (inf_ptrace_store_register): Likewise
> (inf_ptrace_fetch_register): Likewise
> * rs6000-nat.c: Check for __ld_info64 if compiling 64 BIT gdb.
> (rs6000_ptrace32): Added ptrace64 support for 64 bit mode.
> (rs6000_ptrace64): Likewise.
> * gdb_ptrace.h: Add macro for ptrace64 call.
> ---
> Index: ./gdb/inf-ptrace.c
> ===================================================================
> --- ./gdb/inf-ptrace.c
> +++ ./gdb/inf-ptrace.c
> @@ -36,6 +36,17 @@
> #include "gdbthread.h"
>
> ^L
> +#ifdef BFD64
> +#define check_ptrace ptrace64
> +#define addr_ptr long long
> +#define pid_type long long
> +#define addr_uintptr_t long long
> +#else
> +#define check_ptrace ptrace
> +#define addr_ptr PTRACE_TYPE_ARG3
> +#define pid_type int
> +#define addr_uintptr_t uintptr_t
> +#endif
This is the wrong place to put this stuff. Take a look at
gdb_ptrace.h; it already has code to deal with AIX. You just need to
adjust that to use ptrace64 if available. Something like:
#ifdef HAVE_TYPE_ARG5
# ifdef HAVE_PTRACE64
# define ptrace(request, pid, addr, data) \
ptrace64 (request, pid, addr, data, 0)
# else
# define ptrace(request, pid, addr, data) \
ptrace (request, pid, addr, data, 0)
# endif
#endif
You can do any casting that's really necessary there. The (pid_type)
casts are almost certainly not necessary.
The existing (uintptr_t) casts might appear to be a problem if you
want to have a 32-bit gdb that supports debugging 64-bit processes.
However, since xfer_partial(), fetch_registers() and store_registers()
get overridden by rs6000-nat.c that shouldn't be an issue.
So unless I'm missing something, you should not need to make any
changes to inf-ptrace.c itself.
Cheers,
Mark
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-10 19:07 ` Mark Kettenis
@ 2013-07-15 7:32 ` Raunaq 12
2013-07-15 9:12 ` Mark Kettenis
0 siblings, 1 reply; 11+ messages in thread
From: Raunaq 12 @ 2013-07-15 7:32 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches, tromey
Hi Mark/Tom,
Thanks for the feedback.
I removed the newly added file and instead used a wrapper function and
macros.
Kindly review the patch below and let me know if this should be okay ?
---
ChangeLog :-
* inf-ptrace.c: Add support for ptrace64 in 64 BIT mode
(inf_ptrace_follow_fork): Likewise
(inf_ptrace_me): Likewise
(inf_ptrace_post_startup_inferior): Likewise
(inf_ptrace_attach): Likewise
(inf_ptrace_post_attach): Likewise
(inf_ptrace_detach): Likewise
(inf_ptrace_kill): Likewise
(inf_ptrace_resume): Likewise
(inf_ptrace_wait): Likewise
(inf_ptrace_xfer_partial): Likewise
(inf_ptrace_fetch_register): Likewise
(inf_ptrace_store_register): Likewise
(inf_ptrace_fetch_register): Likewise
* rs6000-nat.c: Check for __ld_info64 if compiling 64 BIT gdb.
(rs6000_ptrace32): Added ptrace64 support for 64 bit mode.
(rs6000_ptrace64): Likewise.
* gdb_ptrace.h: Add macro for ptrace64 call.
---
Index: ./gdb/inf-ptrace.c
===================================================================
--- ./gdb/inf-ptrace.c
+++ ./gdb/inf-ptrace.c
@@ -36,6 +36,17 @@
#include "gdbthread.h"
^L
+#ifdef BFD64
+#define check_ptrace ptrace64
+#define addr_ptr long long
+#define pid_type long long
+#define addr_uintptr_t long long
+#else
+#define check_ptrace ptrace
+#define addr_ptr PTRACE_TYPE_ARG3
+#define pid_type int
+#define addr_uintptr_t uintptr_t
+#endif
#ifdef PT_GET_PROCESS_STATE
@@ -47,8 +58,8 @@
pid = ptid_get_pid (inferior_ptid);
- if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (check_ptrace (PT_GET_PROCESS_STATE, (pid_type) pid,
+ (addr_ptr)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -72,7 +83,7 @@
it. */
remove_breakpoints ();
- if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (check_ptrace (PT_DETACH, (pid_type) pid, (addr_ptr)1, 0) == -1)
perror_with_name (("ptrace"));
/* Switch inferior_ptid out of the parent's way. */
@@ -88,7 +99,7 @@
/* Breakpoints have already been detached from the child by
infrun.c. */
- if (ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (check_ptrace (PT_DETACH, (pid_type) fpid, (addr_ptr)1, 0) == -1)
perror_with_name (("ptrace"));
}
@@ -104,7 +115,7 @@
inf_ptrace_me (void)
{
/* "Trace me, Dr. Memory!" */
- ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
+ check_ptrace (PT_TRACE_ME, (pid_type) 0, (addr_ptr)0, 0);
}
/* Start a new inferior Unix child process. EXEC_FILE is the file to
@@ -156,8 +167,8 @@
/* Set the initial event mask. */
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
- if (ptrace (PT_SET_EVENT_MASK, ptid_get_pid (pid),
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (check_ptrace (PT_SET_EVENT_MASK, (pid_type) ptid_get_pid (pid),
+ (addr_ptr)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -226,7 +237,7 @@
#ifdef PT_ATTACH
errno = 0;
- ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
+ check_ptrace (PT_ATTACH, (pid_type)pid, (addr_ptr)0, 0);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -255,8 +266,8 @@
/* Set the initial event mask. */
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
- if (ptrace (PT_SET_EVENT_MASK, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (check_ptrace (PT_SET_EVENT_MASK, (pid_type)pid,
+ (addr_ptr)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -289,7 +300,7 @@
previously attached to the inferior. It *might* work if we
started the process ourselves. */
errno = 0;
- ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
+ check_ptrace (PT_DETACH, (pid_type)pid, (addr_ptr)1, sig);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -314,7 +325,7 @@
if (pid == 0)
return;
- ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0);
+ check_ptrace (PT_KILL, (pid_type)pid, (addr_ptr)0, 0);
waitpid (pid, &status, 0);
target_mourn_inferior ();
@@ -368,7 +379,7 @@
where it was. If GDB wanted it to start some other way, we have
already written a new program counter value to the child. */
errno = 0;
- ptrace (request, pid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal));
+ check_ptrace (request, (pid_type)pid, (addr_ptr)1, gdb_signal_to_host
(signal));
if (errno != 0)
perror_with_name (("ptrace"));
}
@@ -421,8 +432,8 @@
ptrace_state_t pe;
pid_t fpid;
- if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (check_ptrace (PT_GET_PROCESS_STATE, (pid_type)pid,
+ (addr_ptr)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
switch (pe.pe_report_event)
@@ -436,8 +447,8 @@
if (fpid == -1)
perror_with_name (("waitpid"));
- if (ptrace (PT_GET_PROCESS_STATE, fpid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (check_ptrace (PT_GET_PROCESS_STATE, (pid_type)fpid,
+ (addr_ptr)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -491,7 +502,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (check_ptrace (PT_IO, (pid_type)pid, (addr_ptr)&piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
/* If the PT_IO request is somehow not supported, fallback on
@@ -532,8 +543,8 @@
|| (offset + partial_len
< rounded_offset + sizeof (PTRACE_TYPE_RET)))
/* Need part of initial word -- fetch it. */
- buffer.word = ptrace (PT_READ_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)
+ buffer.word = check_ptrace (PT_READ_I, (pid_type)pid,
+ (addr_ptr)(addr_uintptr_t)
rounded_offset, 0);
/* Copy data to be written over corresponding part of
@@ -542,16 +553,16 @@
writebuf, partial_len);
errno = 0;
- ptrace (PT_WRITE_D, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ check_ptrace (PT_WRITE_D, (pid_type)pid,
+ (addr_ptr)(addr_uintptr_t)rounded_offset,
buffer.word);
if (errno)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 0;
- ptrace (PT_WRITE_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ check_ptrace (PT_WRITE_I, (pid_type)pid,
+ (addr_ptr)(addr_uintptr_t)rounded_offset,
buffer.word);
if (errno)
return 0;
@@ -561,8 +572,8 @@
if (readbuf)
{
errno = 0;
- buffer.word = ptrace (PT_READ_I, pid,
-
(PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ buffer.word = check_ptrace (PT_READ_I, (pid_type)pid,
+ (addr_ptr)(addr_uintptr_t)rounded_offset,
0);
if (errno)
return 0;
@@ -593,7 +604,7 @@
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (check_ptrace (PT_IO, (pid_type)pid, (addr_ptr)&piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
}
@@ -741,7 +752,8 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr,
0);
+ buf[i] = check_ptrace (PT_READ_U, pid,
+ (addr_ptr)(addr_uintptr_t)addr, 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
@@ -800,7 +812,8 @@
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
+ check_ptrace (PT_WRITE_U, (pid_type)pid,
+ (addr_ptr)(addr_uintptr_t)addr, buf[i]);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
Index: ./gdb/gdb_ptrace.h
===================================================================
--- ./gdb.orig/gdb_ptrace.h
+++ ./gdb/gdb_ptrace.h
@@ -136,6 +136,8 @@ extern PTRACE_TYPE_RET ptrace();
#ifdef PTRACE_TYPE_ARG5
# define ptrace(request, pid, addr, data) ptrace (request, pid, addr,
data, 0)
+# define ptrace64(request, pid, addr, data) ptrace64 (request, pid, addr,
data, 0)
+
#endif
#endif /* gdb_ptrace.h */
Index: ./gdb/rs6000-nat.c
===================================================================
--- ./gdb.orig/rs6000-nat.c
+++ ./gdb/rs6000-nat.c
@@ -66,7 +66,7 @@
/* In 32-bit compilation mode (which is the only mode from which ptrace()
works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
-#ifdef __ld_info32
+#if defined (__ld_info32) || defined (__ld_info64)
# define ARCH3264
#endif
@@ -181,7 +181,11 @@ regmap (struct gdbarch *gdbarch, int reg
static int
rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
{
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, (long long) addr, data, buf);
+ #else
int ret = ptrace (req, id, (int *)addr, data, buf);
+ #endif
#if 0
printf ("rs6000_ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n",
req, id, (unsigned int)addr, data, (unsigned int)buf, ret);
@@ -195,7 +199,11 @@ static int
rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
{
#ifdef ARCH3264
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, addr, data, (int *)buf);
+ #else
int ret = ptracex (req, id, addr, data, buf);
+ #endif
#else
int ret = 0;
#endif
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-10 17:47 ` Tom Tromey
@ 2013-07-10 19:07 ` Mark Kettenis
2013-07-15 7:32 ` Raunaq 12
0 siblings, 1 reply; 11+ messages in thread
From: Mark Kettenis @ 2013-07-10 19:07 UTC (permalink / raw)
To: tromey; +Cc: raunaq12, gdb-patches, brobecker
> From: Tom Tromey <tromey@redhat.com>
> Date: Wed, 10 Jul 2013 11:47:30 -0600
>
> >>>>> ">" == Raunaq 12 <raunaq12@in.ibm.com> writes:
>
> >> Since that is not the right way to go about it, I thought it would be
> >> better to create a new file called 'inf-ptrace64.c' derived from
> >> inf-ptrace instead, This new file contains all these above mentioned
> >> changes. inf-ptrace64 will be compiled only if the host is detected
> >> as powerpc64-ibm-aix. SO, it will not interfere with the original
> >> inf-ptrace that is used if host is powerpc-ibm-aix
>
> No, copying the file is worse than other available alternatives.
> For example you can use configure to discover the proper argument types,
> and then write a function that wraps ptrace and provides the needed
> casts.
I agree that copying inf-ptrace.c isn't the right approach. Tom's
suggestion might be viable, but I wouldn't be pleased with more magic
casts and #ifdefs in inf-ptrace.c.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/5] powerpc64-aix inf-ptrace patch
2013-07-10 9:15 Raunaq 12
@ 2013-07-10 17:47 ` Tom Tromey
2013-07-10 19:07 ` Mark Kettenis
0 siblings, 1 reply; 11+ messages in thread
From: Tom Tromey @ 2013-07-10 17:47 UTC (permalink / raw)
To: Raunaq 12; +Cc: gdb-patches, brobecker
>>>>> ">" == Raunaq 12 <raunaq12@in.ibm.com> writes:
>> Since that is not the right way to go about it, I thought it would be
>> better to create a new file called 'inf-ptrace64.c' derived from
>> inf-ptrace instead, This new file contains all these above mentioned
>> changes. inf-ptrace64 will be compiled only if the host is detected
>> as powerpc64-ibm-aix. SO, it will not interfere with the original
>> inf-ptrace that is used if host is powerpc-ibm-aix
No, copying the file is worse than other available alternatives.
For example you can use configure to discover the proper argument types,
and then write a function that wraps ptrace and provides the needed
casts.
Tom
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/5] powerpc64-aix inf-ptrace patch
@ 2013-07-10 9:15 Raunaq 12
2013-07-10 17:47 ` Tom Tromey
0 siblings, 1 reply; 11+ messages in thread
From: Raunaq 12 @ 2013-07-10 9:15 UTC (permalink / raw)
To: gdb-patches; +Cc: brobecker
[-- Attachment #1: Type: text/plain, Size: 12985 bytes --]
powerpc64-ibm-aix - Make appropiate ptrace calls in inf-ptrace.c in 64 BIT
mode
Macro for 64 bit ptrace call defined. i.e
'#define ptrace64(request, pid, addr, data) ptrace64 (request, pid,
addr, data, 0)'
if we are in 64 bit mode, then ptrace64 should be called instead of ptrace.
i.e.
#ifdef BFD64
int ret = ptrace64 (req, (long long) id, (long long) addr, data,
buf);
inf-ptrace.c has many ptrace calls like -
'ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i])'
in 64 bit this has to be changed to -
'ptrace64 (PT_WRITE_U, (long long) pid, (long long)addr, buf[i])'
There are many similar changes to be made through out inf-ptrace.c. These
changes are as seen below :-
--- inf-ptrace.c 2013-05-30 23:04:03 +0600
+++ inf-ptrace64.c 2013-06-18 16:07:35 +0600
@@ -36,7 +36,6 @@
#include "gdbthread.h"
-
#ifdef PT_GET_PROCESS_STATE
static int
@@ -47,8 +46,8 @@ inf_ptrace_follow_fork (struct target_op
pid = ptid_get_pid (inferior_ptid);
- if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (ptrace (PT_GET_PROCESS_STATE, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -72,7 +71,7 @@ inf_ptrace_follow_fork (struct target_op
it. */
remove_breakpoints ();
- if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace64 (PT_DETACH, (long long) pid, (long long)1, 0) == -1)
perror_with_name (("ptrace"));
/* Switch inferior_ptid out of the parent's way. */
@@ -88,7 +87,7 @@ inf_ptrace_follow_fork (struct target_op
/* Breakpoints have already been detached from the child by
infrun.c. */
- if (ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ if (ptrace64 (PT_DETACH, (long long) fpid, (long long)1, 0) == -1)
perror_with_name (("ptrace"));
}
@@ -104,7 +103,7 @@ static void
inf_ptrace_me (void)
{
/* "Trace me, Dr. Memory!" */
- ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace64 (PT_TRACE_ME, (long long) 0, (long long)0, 0);
}
/* Start a new inferior Unix child process. EXEC_FILE is the file to
@@ -122,18 +121,19 @@ inf_ptrace_create_inferior (struct targe
/* Do not change either targets above or the same target if already
present.
The reason is the target stack is shared across multiple inferiors.
*/
int ops_already_pushed = target_is_pushed (ops);
- struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
+ struct cleanup *back_to = NULL;
if (! ops_already_pushed)
{
/* Clear possible core file with its process_stratum. */
push_target (ops);
- make_cleanup_unpush_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
}
pid = fork_inferior (exec_file, allargs, env, inf_ptrace_me, NULL,
NULL, NULL, NULL);
+ if (! ops_already_pushed)
discard_cleanups (back_to);
/* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, and will
@@ -156,8 +156,8 @@ inf_ptrace_post_startup_inferior (ptid_t
/* Set the initial event mask. */
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
- if (ptrace (PT_SET_EVENT_MASK, ptid_get_pid (pid),
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (ptrace64 (PT_SET_EVENT_MASK, (long long) ptid_get_pid (pid),
+ (long long)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -195,7 +195,7 @@ inf_ptrace_attach (struct target_ops *op
/* Do not change either targets above or the same target if already
present.
The reason is the target stack is shared across multiple inferiors.
*/
int ops_already_pushed = target_is_pushed (ops);
- struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
+ struct cleanup *back_to = NULL;
pid = parse_pid_to_attach (args);
@@ -207,7 +207,7 @@ inf_ptrace_attach (struct target_ops *op
/* target_pid_to_str already uses the target. Also clear possible
core
file with its process_stratum. */
push_target (ops);
- make_cleanup_unpush_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
}
if (from_tty)
@@ -226,7 +226,7 @@ inf_ptrace_attach (struct target_ops *op
#ifdef PT_ATTACH
errno = 0;
- ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace64 (PT_ATTACH, (long long) pid, (long long)0, 0);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -242,6 +242,7 @@ inf_ptrace_attach (struct target_ops *op
target, it should decorate the ptid later with more info. */
add_thread_silent (inferior_ptid);
+ if (! ops_already_pushed)
discard_cleanups (back_to);
}
@@ -255,8 +256,8 @@ inf_ptrace_post_attach (int pid)
/* Set the initial event mask. */
memset (&pe, 0, sizeof pe);
pe.pe_set_event |= PTRACE_FORK;
- if (ptrace (PT_SET_EVENT_MASK, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (ptrace64 (PT_SET_EVENT_MASK, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
}
@@ -289,7 +290,7 @@ inf_ptrace_detach (struct target_ops *op
previously attached to the inferior. It *might* work if we
started the process ourselves. */
errno = 0;
- ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
+ ptrace64 (PT_DETACH, (long long) pid, (long long) 1, sig);
if (errno != 0)
perror_with_name (("ptrace"));
#else
@@ -314,7 +315,7 @@ inf_ptrace_kill (struct target_ops *ops)
if (pid == 0)
return;
- ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0);
+ ptrace64 (PT_KILL, (long long) pid, (long long) 0, 0);
waitpid (pid, &status, 0);
target_mourn_inferior ();
@@ -368,7 +369,7 @@ inf_ptrace_resume (struct target_ops *op
where it was. If GDB wanted it to start some other way, we have
already written a new program counter value to the child. */
errno = 0;
- ptrace (request, pid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal));
+ ptrace64 (request, (long long) pid, (long long)1, gdb_signal_to_host
(signal));
if (errno != 0)
perror_with_name (("ptrace"));
}
@@ -421,8 +422,8 @@ inf_ptrace_wait (struct target_ops *ops,
ptrace_state_t pe;
pid_t fpid;
- if (ptrace (PT_GET_PROCESS_STATE, pid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (ptrace64 (PT_GET_PROCESS_STATE, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
switch (pe.pe_report_event)
@@ -436,8 +437,8 @@ inf_ptrace_wait (struct target_ops *ops,
if (fpid == -1)
perror_with_name (("waitpid"));
- if (ptrace (PT_GET_PROCESS_STATE, fpid,
- (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ if (ptrace64 (PT_GET_PROCESS_STATE, (long long) fpid,
+ (long long)&pe, sizeof pe) == -1)
perror_with_name (("ptrace"));
gdb_assert (pe.pe_report_event == PTRACE_FORK);
@@ -491,7 +492,7 @@ inf_ptrace_xfer_partial (struct target_o
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace64 (PT_IO, (long long) pid, (long long)&piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
/* If the PT_IO request is somehow not supported, fallback on
@@ -532,8 +533,8 @@ inf_ptrace_xfer_partial (struct target_o
|| (offset + partial_len
< rounded_offset + sizeof (PTRACE_TYPE_RET)))
/* Need part of initial word -- fetch it. */
- buffer.word = ptrace (PT_READ_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)
+ buffer.word = ptrace64 (PT_READ_I, (long long) pid,
+ (long long)
rounded_offset, 0);
/* Copy data to be written over corresponding part of
@@ -542,16 +543,16 @@ inf_ptrace_xfer_partial (struct target_o
writebuf, partial_len);
errno = 0;
- ptrace (PT_WRITE_D, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ ptrace64 (PT_WRITE_D, (long long) pid,
+ (long long)rounded_offset,
buffer.word);
if (errno)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 0;
- ptrace (PT_WRITE_I, pid,
- (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ ptrace64 (PT_WRITE_I, (long long) pid,
+ (long long)rounded_offset,
buffer.word);
if (errno)
return 0;
@@ -561,8 +562,8 @@ inf_ptrace_xfer_partial (struct target_o
if (readbuf)
{
errno = 0;
- buffer.word = ptrace (PT_READ_I, pid,
-
(PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ buffer.word = ptrace64 (PT_READ_I, (long long) pid,
+ (long long)rounded_offset,
0);
if (errno)
return 0;
@@ -593,7 +594,7 @@ inf_ptrace_xfer_partial (struct target_o
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ if (ptrace64 (PT_IO, (long long) pid, (long long)&piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
}
@@ -741,7 +742,7 @@ inf_ptrace_fetch_register (struct regcac
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr,
0);
+ buf[i] = ptrace64 (PT_READ_U, (long long) pid, (long long)addr, 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
@@ -800,7 +801,7 @@ inf_ptrace_store_register (const struct
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
+ ptrace64 (PT_WRITE_U, (long long) pid, (long long)addr, buf[i]);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regnum),
Note - Initially, I had used multiple ' #ifdef BFD64 ' checks to insert
these changes.
Since that is not the right way to go about it, I thought it would be
better to create a new file called 'inf-ptrace64.c' derived from inf-ptrace
instead,
This new file contains all these above mentioned changes.
inf-ptrace64 will be compiled only if the host is detected as
powerpc64-ibm-aix.
SO, it will not interfere with the original inf-ptrace that is used if host
is powerpc-ibm-aix
Since the patch that creates inf-ptrace64.c is very large as it contains
the full file. I have attached it as a text file below.
But the above mentioned changes is the only difference between inf-ptrace.c
and inf-ptrace64.c
---
Patch1 :
Index: ./gdb/gdb_ptrace.h
===================================================================
--- ./gdb.orig/gdb_ptrace.h
+++ ./gdb/gdb_ptrace.h
@@ -136,6 +136,8 @@ extern PTRACE_TYPE_RET ptrace();
#ifdef PTRACE_TYPE_ARG5
# define ptrace(request, pid, addr, data) ptrace (request, pid, addr,
data, 0)
+# define ptrace64(request, pid, addr, data) ptrace64 (request, pid, addr,
data, 0)
+
#endif
#endif /* gdb_ptrace.h */
Index: ./gdb/rs6000-nat.c
===================================================================
--- ./gdb.orig/rs6000-nat.c
+++ ./gdb/rs6000-nat.c
@@ -66,7 +66,7 @@
/* In 32-bit compilation mode (which is the only mode from which ptrace()
works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
-#ifdef __ld_info32
+#if defined (__ld_info32) || defined (__ld_info64)
# define ARCH3264
#endif
@@ -181,7 +181,11 @@ regmap (struct gdbarch *gdbarch, int reg
static int
rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
{
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, (long long) addr, data, buf);
+ #else
int ret = ptrace (req, id, (int *)addr, data, buf);
+ #endif
#if 0
printf ("rs6000_ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n",
req, id, (unsigned int)addr, data, (unsigned int)buf, ret);
@@ -195,7 +199,11 @@ static int
rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
{
#ifdef ARCH3264
+ #ifdef BFD64
+ int ret = ptrace64 (req, (long long) id, addr, data, (int *)buf);
+ #else
int ret = ptracex (req, id, addr, data, buf);
+ #endif
#else
int ret = 0;
#endif
---
The patch to create the file inf-ptrace64.c is attached below
(See attached file: gdb-7.6-infptrace64.patch)
[-- Attachment #2: gdb-7.6-infptrace64.patch --]
[-- Type: application/octet-stream, Size: 27118 bytes --]
powerpc64-aix: Add support for 64 bit.
inf-ptrace.c has many ptrace calls like -
'ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i])'
in 64 bit mode this has to be changed to -
'ptrace64 (PT_WRITE_U, (long long) pid, (long long)addr, buf[i])'
There are many similiar changes to be made through out inf-ptrace.c
In stead, we create a new file inf-ptrace64.c which has all these changes.
This file will be compiled only if we configure host as powerpc64-aix.
Signed-off-by: Raunaq M. Bathija <raunaq12@in.ibm.com>
Index: ./gdb/inf-ptrace64.c
===================================================================
--- /dev/null
+++ ./gdb/inf-ptrace64.c
@@ -0,0 +1,846 @@
+/* Low-level child interface to ptrace.
+
+ Copyright (C) 1988-2013 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "command.h"
+#include "inferior.h"
+#include "inflow.h"
+#include "terminal.h"
+#include "gdbcore.h"
+#include "regcache.h"
+
+#include "gdb_assert.h"
+#include "gdb_string.h"
+#include "gdb_ptrace.h"
+#include "gdb_wait.h"
+#include <signal.h>
+
+#include "inf-ptrace.h"
+#include "inf-child.h"
+#include "gdbthread.h"
+
+
+#ifdef PT_GET_PROCESS_STATE
+
+static int
+inf_ptrace_follow_fork (struct target_ops *ops, int follow_child)
+{
+ pid_t pid, fpid;
+ ptrace_state_t pe;
+
+ pid = ptid_get_pid (inferior_ptid);
+
+ if (ptrace (PT_GET_PROCESS_STATE, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+
+ gdb_assert (pe.pe_report_event == PTRACE_FORK);
+ fpid = pe.pe_other_pid;
+
+ if (follow_child)
+ {
+ struct inferior *parent_inf, *child_inf;
+ struct thread_info *tp;
+
+ parent_inf = find_inferior_pid (pid);
+
+ /* Add the child. */
+ child_inf = add_inferior (fpid);
+ child_inf->attach_flag = parent_inf->attach_flag;
+ copy_terminal_info (child_inf, parent_inf);
+ child_inf->pspace = parent_inf->pspace;
+ child_inf->aspace = parent_inf->aspace;
+
+ /* Before detaching from the parent, remove all breakpoints from
+ it. */
+ remove_breakpoints ();
+
+ if (ptrace64 (PT_DETACH, (long long) pid, (long long)1, 0) == -1)
+ perror_with_name (("ptrace"));
+
+ /* Switch inferior_ptid out of the parent's way. */
+ inferior_ptid = pid_to_ptid (fpid);
+
+ /* Delete the parent. */
+ detach_inferior (pid);
+
+ add_thread_silent (inferior_ptid);
+ }
+ else
+ {
+ /* Breakpoints have already been detached from the child by
+ infrun.c. */
+
+ if (ptrace64 (PT_DETACH, (long long) fpid, (long long)1, 0) == -1)
+ perror_with_name (("ptrace"));
+ }
+
+ return 0;
+}
+
+#endif /* PT_GET_PROCESS_STATE */
+
+
+/* Prepare to be traced. */
+
+static void
+inf_ptrace_me (void)
+{
+ /* "Trace me, Dr. Memory!" */
+ ptrace64 (PT_TRACE_ME, (long long) 0, (long long)0, 0);
+}
+
+/* Start a new inferior Unix child process. EXEC_FILE is the file to
+ run, ALLARGS is a string containing the arguments to the program.
+ ENV is the environment vector to pass. If FROM_TTY is non-zero, be
+ chatty about it. */
+
+static void
+inf_ptrace_create_inferior (struct target_ops *ops,
+ char *exec_file, char *allargs, char **env,
+ int from_tty)
+{
+ int pid;
+
+ /* Do not change either targets above or the same target if already present.
+ The reason is the target stack is shared across multiple inferiors. */
+ int ops_already_pushed = target_is_pushed (ops);
+ struct cleanup *back_to = NULL;
+
+ if (! ops_already_pushed)
+ {
+ /* Clear possible core file with its process_stratum. */
+ push_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
+ }
+
+ pid = fork_inferior (exec_file, allargs, env, inf_ptrace_me, NULL,
+ NULL, NULL, NULL);
+
+ if (! ops_already_pushed)
+ discard_cleanups (back_to);
+
+ /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, and will
+ be 1 or 2 depending on whether we're starting without or with a
+ shell. */
+ startup_inferior (START_INFERIOR_TRAPS_EXPECTED);
+
+ /* On some targets, there must be some explicit actions taken after
+ the inferior has been started up. */
+ target_post_startup_inferior (pid_to_ptid (pid));
+}
+
+#ifdef PT_GET_PROCESS_STATE
+
+static void
+inf_ptrace_post_startup_inferior (ptid_t pid)
+{
+ ptrace_event_t pe;
+
+ /* Set the initial event mask. */
+ memset (&pe, 0, sizeof pe);
+ pe.pe_set_event |= PTRACE_FORK;
+ if (ptrace64 (PT_SET_EVENT_MASK, (long long) ptid_get_pid (pid),
+ (long long)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+}
+
+#endif
+
+/* Clean up a rotting corpse of an inferior after it died. */
+
+static void
+inf_ptrace_mourn_inferior (struct target_ops *ops)
+{
+ int status;
+
+ /* Wait just one more time to collect the inferior's exit status.
+ Do not check whether this succeeds though, since we may be
+ dealing with a process that we attached to. Such a process will
+ only report its exit status to its original parent. */
+ waitpid (ptid_get_pid (inferior_ptid), &status, 0);
+
+ generic_mourn_inferior ();
+
+ if (!have_inferiors ())
+ unpush_target (ops);
+}
+
+/* Attach to the process specified by ARGS. If FROM_TTY is non-zero,
+ be chatty about it. */
+
+static void
+inf_ptrace_attach (struct target_ops *ops, char *args, int from_tty)
+{
+ char *exec_file;
+ pid_t pid;
+ struct inferior *inf;
+
+ /* Do not change either targets above or the same target if already present.
+ The reason is the target stack is shared across multiple inferiors. */
+ int ops_already_pushed = target_is_pushed (ops);
+ struct cleanup *back_to = NULL;
+
+ pid = parse_pid_to_attach (args);
+
+ if (pid == getpid ()) /* Trying to masturbate? */
+ error (_("I refuse to debug myself!"));
+
+ if (! ops_already_pushed)
+ {
+ /* target_pid_to_str already uses the target. Also clear possible core
+ file with its process_stratum. */
+ push_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
+ }
+
+ if (from_tty)
+ {
+ exec_file = get_exec_file (0);
+
+ if (exec_file)
+ printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
+ target_pid_to_str (pid_to_ptid (pid)));
+ else
+ printf_unfiltered (_("Attaching to %s\n"),
+ target_pid_to_str (pid_to_ptid (pid)));
+
+ gdb_flush (gdb_stdout);
+ }
+
+#ifdef PT_ATTACH
+ errno = 0;
+ ptrace64 (PT_ATTACH, (long long) pid, (long long)0, 0);
+ if (errno != 0)
+ perror_with_name (("ptrace"));
+#else
+ error (_("This system does not support attaching to a process"));
+#endif
+
+ inf = current_inferior ();
+ inferior_appeared (inf, pid);
+ inf->attach_flag = 1;
+ inferior_ptid = pid_to_ptid (pid);
+
+ /* Always add a main thread. If some target extends the ptrace
+ target, it should decorate the ptid later with more info. */
+ add_thread_silent (inferior_ptid);
+
+ if (! ops_already_pushed)
+ discard_cleanups (back_to);
+}
+
+#ifdef PT_GET_PROCESS_STATE
+
+static void
+inf_ptrace_post_attach (int pid)
+{
+ ptrace_event_t pe;
+
+ /* Set the initial event mask. */
+ memset (&pe, 0, sizeof pe);
+ pe.pe_set_event |= PTRACE_FORK;
+ if (ptrace64 (PT_SET_EVENT_MASK, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+}
+
+#endif
+
+/* Detach from the inferior, optionally passing it the signal
+ specified by ARGS. If FROM_TTY is non-zero, be chatty about it. */
+
+static void
+inf_ptrace_detach (struct target_ops *ops, char *args, int from_tty)
+{
+ pid_t pid = ptid_get_pid (inferior_ptid);
+ int sig = 0;
+
+ if (from_tty)
+ {
+ char *exec_file = get_exec_file (0);
+ if (exec_file == 0)
+ exec_file = "";
+ printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
+ target_pid_to_str (pid_to_ptid (pid)));
+ gdb_flush (gdb_stdout);
+ }
+ if (args)
+ sig = atoi (args);
+
+#ifdef PT_DETACH
+ /* We'd better not have left any breakpoints in the program or it'll
+ die when it hits one. Also note that this may only work if we
+ previously attached to the inferior. It *might* work if we
+ started the process ourselves. */
+ errno = 0;
+ ptrace64 (PT_DETACH, (long long) pid, (long long) 1, sig);
+ if (errno != 0)
+ perror_with_name (("ptrace"));
+#else
+ error (_("This system does not support detaching from a process"));
+#endif
+
+ inferior_ptid = null_ptid;
+ detach_inferior (pid);
+
+ if (!have_inferiors ())
+ unpush_target (ops);
+}
+
+/* Kill the inferior. */
+
+static void
+inf_ptrace_kill (struct target_ops *ops)
+{
+ pid_t pid = ptid_get_pid (inferior_ptid);
+ int status;
+
+ if (pid == 0)
+ return;
+
+ ptrace64 (PT_KILL, (long long) pid, (long long) 0, 0);
+ waitpid (pid, &status, 0);
+
+ target_mourn_inferior ();
+}
+
+/* Stop the inferior. */
+
+static void
+inf_ptrace_stop (ptid_t ptid)
+{
+ /* Send a SIGINT to the process group. This acts just like the user
+ typed a ^C on the controlling terminal. Note that using a
+ negative process number in kill() is a System V-ism. The proper
+ BSD interface is killpg(). However, all modern BSDs support the
+ System V interface too. */
+ kill (-inferior_process_group (), SIGINT);
+}
+
+/* Resume execution of thread PTID, or all threads if PTID is -1. If
+ STEP is nonzero, single-step it. If SIGNAL is nonzero, give it
+ that signal. */
+
+static void
+inf_ptrace_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum gdb_signal signal)
+{
+ pid_t pid = ptid_get_pid (ptid);
+ int request;
+
+ if (pid == -1)
+ /* Resume all threads. Traditionally ptrace() only supports
+ single-threaded processes, so simply resume the inferior. */
+ pid = ptid_get_pid (inferior_ptid);
+
+ if (catch_syscall_enabled () > 0)
+ request = PT_SYSCALL;
+ else
+ request = PT_CONTINUE;
+
+ if (step)
+ {
+ /* If this system does not support PT_STEP, a higher level
+ function will have called single_step() to transmute the step
+ request into a continue request (by setting breakpoints on
+ all possible successor instructions), so we don't have to
+ worry about that here. */
+ request = PT_STEP;
+ }
+
+ /* An address of (PTRACE_TYPE_ARG3)1 tells ptrace to continue from
+ where it was. If GDB wanted it to start some other way, we have
+ already written a new program counter value to the child. */
+ errno = 0;
+ ptrace64 (request, (long long) pid, (long long)1, gdb_signal_to_host (signal));
+ if (errno != 0)
+ perror_with_name (("ptrace"));
+}
+
+/* Wait for the child specified by PTID to do something. Return the
+ process ID of the child, or MINUS_ONE_PTID in case of error; store
+ the status in *OURSTATUS. */
+
+static ptid_t
+inf_ptrace_wait (struct target_ops *ops,
+ ptid_t ptid, struct target_waitstatus *ourstatus, int options)
+{
+ pid_t pid;
+ int status, save_errno;
+
+ do
+ {
+ set_sigint_trap ();
+
+ do
+ {
+ pid = waitpid (ptid_get_pid (ptid), &status, 0);
+ save_errno = errno;
+ }
+ while (pid == -1 && errno == EINTR);
+
+ clear_sigint_trap ();
+
+ if (pid == -1)
+ {
+ fprintf_unfiltered (gdb_stderr,
+ _("Child process unexpectedly missing: %s.\n"),
+ safe_strerror (save_errno));
+
+ /* Claim it exited with unknown signal. */
+ ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
+ ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
+ return inferior_ptid;
+ }
+
+ /* Ignore terminated detached child processes. */
+ if (!WIFSTOPPED (status) && pid != ptid_get_pid (inferior_ptid))
+ pid = -1;
+ }
+ while (pid == -1);
+
+#ifdef PT_GET_PROCESS_STATE
+ if (WIFSTOPPED (status))
+ {
+ ptrace_state_t pe;
+ pid_t fpid;
+
+ if (ptrace64 (PT_GET_PROCESS_STATE, (long long) pid,
+ (long long)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+
+ switch (pe.pe_report_event)
+ {
+ case PTRACE_FORK:
+ ourstatus->kind = TARGET_WAITKIND_FORKED;
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
+
+ /* Make sure the other end of the fork is stopped too. */
+ fpid = waitpid (pe.pe_other_pid, &status, 0);
+ if (fpid == -1)
+ perror_with_name (("waitpid"));
+
+ if (ptrace64 (PT_GET_PROCESS_STATE, (long long) fpid,
+ (long long)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+
+ gdb_assert (pe.pe_report_event == PTRACE_FORK);
+ gdb_assert (pe.pe_other_pid == pid);
+ if (fpid == ptid_get_pid (inferior_ptid))
+ {
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
+ return pid_to_ptid (fpid);
+ }
+
+ return pid_to_ptid (pid);
+ }
+ }
+#endif
+
+ store_waitstatus (ourstatus, status);
+ return pid_to_ptid (pid);
+}
+
+/* Attempt a transfer all LEN bytes starting at OFFSET between the
+ inferior's OBJECT:ANNEX space and GDB's READBUF/WRITEBUF buffer.
+ Return the number of bytes actually transferred. */
+
+static LONGEST
+inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, LONGEST len)
+{
+ pid_t pid = ptid_get_pid (inferior_ptid);
+
+ switch (object)
+ {
+ case TARGET_OBJECT_MEMORY:
+#ifdef PT_IO
+ /* OpenBSD 3.1, NetBSD 1.6 and FreeBSD 5.0 have a new PT_IO
+ request that promises to be much more efficient in reading
+ and writing data in the traced process's address space. */
+ {
+ struct ptrace_io_desc piod;
+
+ /* NOTE: We assume that there are no distinct address spaces
+ for instruction and data. However, on OpenBSD 3.9 and
+ later, PIOD_WRITE_D doesn't allow changing memory that's
+ mapped read-only. Since most code segments will be
+ read-only, using PIOD_WRITE_D will prevent us from
+ inserting breakpoints, so we use PIOD_WRITE_I instead. */
+ piod.piod_op = writebuf ? PIOD_WRITE_I : PIOD_READ_D;
+ piod.piod_addr = writebuf ? (void *) writebuf : readbuf;
+ piod.piod_offs = (void *) (long) offset;
+ piod.piod_len = len;
+
+ errno = 0;
+ if (ptrace64 (PT_IO, (long long) pid, (long long)&piod, 0) == 0)
+ /* Return the actual number of bytes read or written. */
+ return piod.piod_len;
+ /* If the PT_IO request is somehow not supported, fallback on
+ using PT_WRITE_D/PT_READ_D. Otherwise we will return zero
+ to indicate failure. */
+ if (errno != EINVAL)
+ return 0;
+ }
+#endif
+ {
+ union
+ {
+ PTRACE_TYPE_RET word;
+ gdb_byte byte[sizeof (PTRACE_TYPE_RET)];
+ } buffer;
+ ULONGEST rounded_offset;
+ LONGEST partial_len;
+
+ /* Round the start offset down to the next long word
+ boundary. */
+ rounded_offset = offset & -(ULONGEST) sizeof (PTRACE_TYPE_RET);
+
+ /* Since ptrace will transfer a single word starting at that
+ rounded_offset the partial_len needs to be adjusted down to
+ that (remember this function only does a single transfer).
+ Should the required length be even less, adjust it down
+ again. */
+ partial_len = (rounded_offset + sizeof (PTRACE_TYPE_RET)) - offset;
+ if (partial_len > len)
+ partial_len = len;
+
+ if (writebuf)
+ {
+ /* If OFFSET:PARTIAL_LEN is smaller than
+ ROUNDED_OFFSET:WORDSIZE then a read/modify write will
+ be needed. Read in the entire word. */
+ if (rounded_offset < offset
+ || (offset + partial_len
+ < rounded_offset + sizeof (PTRACE_TYPE_RET)))
+ /* Need part of initial word -- fetch it. */
+ buffer.word = ptrace64 (PT_READ_I, (long long) pid,
+ (long long)
+ rounded_offset, 0);
+
+ /* Copy data to be written over corresponding part of
+ buffer. */
+ memcpy (buffer.byte + (offset - rounded_offset),
+ writebuf, partial_len);
+
+ errno = 0;
+ ptrace64 (PT_WRITE_D, (long long) pid,
+ (long long)rounded_offset,
+ buffer.word);
+ if (errno)
+ {
+ /* Using the appropriate one (I or D) is necessary for
+ Gould NP1, at least. */
+ errno = 0;
+ ptrace64 (PT_WRITE_I, (long long) pid,
+ (long long)rounded_offset,
+ buffer.word);
+ if (errno)
+ return 0;
+ }
+ }
+
+ if (readbuf)
+ {
+ errno = 0;
+ buffer.word = ptrace64 (PT_READ_I, (long long) pid,
+ (long long)rounded_offset,
+ 0);
+ if (errno)
+ return 0;
+ /* Copy appropriate bytes out of the buffer. */
+ memcpy (readbuf, buffer.byte + (offset - rounded_offset),
+ partial_len);
+ }
+
+ return partial_len;
+ }
+
+ case TARGET_OBJECT_UNWIND_TABLE:
+ return -1;
+
+ case TARGET_OBJECT_AUXV:
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+ /* OpenBSD 4.5 has a new PIOD_READ_AUXV operation for the PT_IO
+ request that allows us to read the auxilliary vector. Other
+ BSD's may follow if they feel the need to support PIE. */
+ {
+ struct ptrace_io_desc piod;
+
+ if (writebuf)
+ return -1;
+ piod.piod_op = PIOD_READ_AUXV;
+ piod.piod_addr = readbuf;
+ piod.piod_offs = (void *) (long) offset;
+ piod.piod_len = len;
+
+ errno = 0;
+ if (ptrace64 (PT_IO, (long long) pid, (long long)&piod, 0) == 0)
+ /* Return the actual number of bytes read or written. */
+ return piod.piod_len;
+ }
+#endif
+ return -1;
+
+ case TARGET_OBJECT_WCOOKIE:
+ return -1;
+
+ default:
+ return -1;
+ }
+}
+
+/* Return non-zero if the thread specified by PTID is alive. */
+
+static int
+inf_ptrace_thread_alive (struct target_ops *ops, ptid_t ptid)
+{
+ /* ??? Is kill the right way to do this? */
+ return (kill (ptid_get_pid (ptid), 0) != -1);
+}
+
+/* Print status information about what we're accessing. */
+
+static void
+inf_ptrace_files_info (struct target_ops *ignore)
+{
+ struct inferior *inf = current_inferior ();
+
+ printf_filtered (_("\tUsing the running image of %s %s.\n"),
+ inf->attach_flag ? "attached" : "child",
+ target_pid_to_str (inferior_ptid));
+}
+
+static char *
+inf_ptrace_pid_to_str (struct target_ops *ops, ptid_t ptid)
+{
+ return normal_pid_to_str (ptid);
+}
+
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+
+/* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
+ Return 0 if *READPTR is already at the end of the buffer.
+ Return -1 if there is insufficient buffer for a whole entry.
+ Return 1 if an entry was read into *TYPEP and *VALP. */
+
+static int
+inf_ptrace_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
+ gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
+{
+ struct type *int_type = builtin_type (target_gdbarch ())->builtin_int;
+ struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
+ const int sizeof_auxv_type = TYPE_LENGTH (int_type);
+ const int sizeof_auxv_val = TYPE_LENGTH (ptr_type);
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
+ gdb_byte *ptr = *readptr;
+
+ if (endptr == ptr)
+ return 0;
+
+ if (endptr - ptr < 2 * sizeof_auxv_val)
+ return -1;
+
+ *typep = extract_unsigned_integer (ptr, sizeof_auxv_type, byte_order);
+ ptr += sizeof_auxv_val; /* Alignment. */
+ *valp = extract_unsigned_integer (ptr, sizeof_auxv_val, byte_order);
+ ptr += sizeof_auxv_val;
+
+ *readptr = ptr;
+ return 1;
+}
+
+#endif
+
+/* Create a prototype ptrace target. The client can override it with
+ local methods. */
+
+struct target_ops *
+inf_ptrace_target (void)
+{
+ struct target_ops *t = inf_child_target ();
+
+ t->to_attach = inf_ptrace_attach;
+ t->to_detach = inf_ptrace_detach;
+ t->to_resume = inf_ptrace_resume;
+ t->to_wait = inf_ptrace_wait;
+ t->to_files_info = inf_ptrace_files_info;
+ t->to_kill = inf_ptrace_kill;
+ t->to_create_inferior = inf_ptrace_create_inferior;
+#ifdef PT_GET_PROCESS_STATE
+ t->to_follow_fork = inf_ptrace_follow_fork;
+ t->to_post_startup_inferior = inf_ptrace_post_startup_inferior;
+ t->to_post_attach = inf_ptrace_post_attach;
+#endif
+ t->to_mourn_inferior = inf_ptrace_mourn_inferior;
+ t->to_thread_alive = inf_ptrace_thread_alive;
+ t->to_pid_to_str = inf_ptrace_pid_to_str;
+ t->to_stop = inf_ptrace_stop;
+ t->to_xfer_partial = inf_ptrace_xfer_partial;
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+ t->to_auxv_parse = inf_ptrace_auxv_parse;
+#endif
+
+ return t;
+}
+
+
+/* Pointer to a function that returns the offset within the user area
+ where a particular register is stored. */
+static CORE_ADDR (*inf_ptrace_register_u_offset)(struct gdbarch *, int, int);
+
+/* Fetch register REGNUM from the inferior. */
+
+static void
+inf_ptrace_fetch_register (struct regcache *regcache, int regnum)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ CORE_ADDR addr;
+ size_t size;
+ PTRACE_TYPE_RET *buf;
+ int pid, i;
+
+ /* This isn't really an address, but ptrace thinks of it as one. */
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 0);
+ if (addr == (CORE_ADDR)-1
+ || gdbarch_cannot_fetch_register (gdbarch, regnum))
+ {
+ regcache_raw_supply (regcache, regnum, NULL);
+ return;
+ }
+
+ /* Cater for systems like GNU/Linux, that implement threads as
+ separate processes. */
+ pid = ptid_get_lwp (inferior_ptid);
+ if (pid == 0)
+ pid = ptid_get_pid (inferior_ptid);
+
+ size = register_size (gdbarch, regnum);
+ gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
+ buf = alloca (size);
+
+ /* Read the register contents from the inferior a chunk at a time. */
+ for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
+ {
+ errno = 0;
+ buf[i] = ptrace64 (PT_READ_U, (long long) pid, (long long)addr, 0);
+ if (errno != 0)
+ error (_("Couldn't read register %s (#%d): %s."),
+ gdbarch_register_name (gdbarch, regnum),
+ regnum, safe_strerror (errno));
+
+ addr += sizeof (PTRACE_TYPE_RET);
+ }
+ regcache_raw_supply (regcache, regnum, buf);
+}
+
+/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
+ for all registers. */
+
+static void
+inf_ptrace_fetch_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
+{
+ if (regnum == -1)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
+ inf_ptrace_fetch_register (regcache, regnum);
+ else
+ inf_ptrace_fetch_register (regcache, regnum);
+}
+
+/* Store register REGNUM into the inferior. */
+
+static void
+inf_ptrace_store_register (const struct regcache *regcache, int regnum)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ CORE_ADDR addr;
+ size_t size;
+ PTRACE_TYPE_RET *buf;
+ int pid, i;
+
+ /* This isn't really an address, but ptrace thinks of it as one. */
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 1);
+ if (addr == (CORE_ADDR)-1
+ || gdbarch_cannot_store_register (gdbarch, regnum))
+ return;
+
+ /* Cater for systems like GNU/Linux, that implement threads as
+ separate processes. */
+ pid = ptid_get_lwp (inferior_ptid);
+ if (pid == 0)
+ pid = ptid_get_pid (inferior_ptid);
+
+ size = register_size (gdbarch, regnum);
+ gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
+ buf = alloca (size);
+
+ /* Write the register contents into the inferior a chunk at a time. */
+ regcache_raw_collect (regcache, regnum, buf);
+ for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
+ {
+ errno = 0;
+ ptrace64 (PT_WRITE_U, (long long) pid, (long long)addr, buf[i]);
+ if (errno != 0)
+ error (_("Couldn't write register %s (#%d): %s."),
+ gdbarch_register_name (gdbarch, regnum),
+ regnum, safe_strerror (errno));
+
+ addr += sizeof (PTRACE_TYPE_RET);
+ }
+}
+
+/* Store register REGNUM back into the inferior. If REGNUM is -1, do
+ this for all registers. */
+
+static void
+inf_ptrace_store_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
+{
+ if (regnum == -1)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
+ inf_ptrace_store_register (regcache, regnum);
+ else
+ inf_ptrace_store_register (regcache, regnum);
+}
+
+/* Create a "traditional" ptrace target. REGISTER_U_OFFSET should be
+ a function returning the offset within the user area where a
+ particular register is stored. */
+
+struct target_ops *
+inf_ptrace_trad_target (CORE_ADDR (*register_u_offset)
+ (struct gdbarch *, int, int))
+{
+ struct target_ops *t = inf_ptrace_target();
+
+ gdb_assert (register_u_offset);
+ inf_ptrace_register_u_offset = register_u_offset;
+ t->to_fetch_registers = inf_ptrace_fetch_registers;
+ t->to_store_registers = inf_ptrace_store_registers;
+
+ return t;
+}
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-07-23 19:40 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-23 5:35 [PATCH 3/5] powerpc64-aix inf-ptrace patch Raunaq 12
2013-07-23 9:01 ` Mark Kettenis
2013-07-23 12:57 ` Raunaq 12
2013-07-23 14:25 ` Mark Kettenis
2013-07-23 19:40 ` Tom Tromey
-- strict thread matches above, loose matches on Subject: below --
2013-07-10 9:15 Raunaq 12
2013-07-10 17:47 ` Tom Tromey
2013-07-10 19:07 ` Mark Kettenis
2013-07-15 7:32 ` Raunaq 12
2013-07-15 9:12 ` Mark Kettenis
2013-07-16 10:48 ` Raunaq 12
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox