Re: [PATCH 5/5] powerpc64-aix aix-thread patch

[Raunaq 12 <raunaq12 at in dot ibm dot com>]

Any feedback on this patch ?

Raunaq 12/India/IBM wrote on 07/11/2013 08:58:51 PM:

> From: Raunaq 12/India/IBM
> To: Tom Tromey <tromey@redhat.com>
> Cc: gdb-patches@sourceware.org
> Date: 07/11/2013 08:58 PM
> Subject: Re: [PATCH 5/5] powerpc64-aix aix-thread patch
>
> Hi Tom,
>
> Thanks for the feedback.
>
> I removed the extra aix64-thread.c and instead used a wrapper function
and macros.
> Kindly review the patch below and let me know if this should be okay ?
>
> ---
> ChangeLog :-
>
> * aixthread.c: Add support for ptrace64 in 64 BIT mode
> (ptrace64aix): Likewise
> (ptrace32): Likewise
> (pdc_read_regs): Likewise
> (pdc_write_regs): Likewise
> (aix_thread_resume): Likewise
> (fetch_regs_kernel_thread): Likewise
> (store_regs_kernel_thread): Likewise
> ---
> Index: ./gdb/aix-thread.c
> ===================================================================
> --- ./gdb.orig/aix-thread.c
> +++ ./gdb/aix-thread.c
> @@ -237,23 +237,41 @@
>    return 0;  /* Not reached.  */
>  }
>
> -/* Call ptracex (REQ, ID, ADDR, DATA, BUF).  Return success.  */
> +/* Call ptracex (REQ, ID, ADDR, DATA, BUF) or
> +   ptrace64 (REQ, ID, ADDR, DATA, BUF) if 64 Bit mode.
> +   Return success.  */
> +
> +#ifdef BFD64
> +#define ptracex_64 ptrace64
> +#else
> +#define ptracex_64 ptracex
> +#endif
>
>  static int
> -ptrace64aix (int req, int id, long long addr, int data, int *buf)
> +ptrace64aix (int req, long long id, long long addr, int data, int *buf)
>  {
>    errno = 0;
> -  return ptrace_check (req, id, ptracex (req, id, addr, data, buf));
> +  return ptrace_check (req, id, ptracex_64 (req, id, addr, data, buf));
>  }
>
> -/* Call ptrace (REQ, ID, ADDR, DATA, BUF).  Return success.  */
> +/* Call ptrace (REQ, ID, ADDR, DATA, BUF) or
> +   ptrace64 (REQ, ID, ADDR, DATA, BUF) if 64 Bit mode.
> +   Return success.  */
> +
> +#ifdef BFD64
> +#define ptrace64_check ptrace64
> +#define addr_ptr long long
> +#else
> +#define ptrace64_check ptrace
> +#define addr_ptr int *
> +#endif
>
>  static int
> -ptrace32 (int req, int id, int *addr, int data, int *buf)
> +ptrace32 (int req, long long id, addr_ptr addr, int data, int *buf)
>  {
>    errno = 0;
>    return ptrace_check (req, id,
> -                      ptrace (req, id, (int *) addr, data, buf));
> +                      ptrace64_check (req, id, addr, data, buf));
>  }
>
>  /* If *PIDP is a composite process/thread id, convert it to a
> @@ -346,13 +364,13 @@
>        if (arch64)
>         {
>           if (!ptrace64aix (PTT_READ_GPRS, tid,
> -                           (unsigned long) gprs64, 0, NULL))
> +                           (long long) gprs64, 0, NULL))
>             memset (gprs64, 0, sizeof (gprs64));
>           memcpy (context->gpr, gprs64, sizeof(gprs64));
>         }
>        else
>         {
> -         if (!ptrace32 (PTT_READ_GPRS, tid, gprs32, 0, NULL))
> +         if (!ptrace32 (PTT_READ_GPRS, (long long) tid, gprs32, 0,
NULL))
>             memset (gprs32, 0, sizeof (gprs32));
>           memcpy (context->gpr, gprs32, sizeof(gprs32));
>         }
> @@ -361,7 +379,7 @@
>    /* Floating-point registers.  */
>    if (flags & PTHDB_FLAG_FPRS)
>      {
> -      if (!ptrace32 (PTT_READ_FPRS, tid, (void *) fprs, 0, NULL))
> +      if (!ptrace32 (PTT_READ_FPRS, tid, (addr_ptr) fprs, 0, NULL))
>         memset (fprs, 0, sizeof (fprs));
>        memcpy (context->fpr, fprs, sizeof(fprs));
>      }
> @@ -372,13 +390,13 @@
>        if (arch64)
>         {
>           if (!ptrace64aix (PTT_READ_SPRS, tid,
> -                           (unsigned long) &sprs64, 0, NULL))
> +                           (long long) &sprs64, 0, NULL))
>             memset (&sprs64, 0, sizeof (sprs64));
>           memcpy (&context->msr, &sprs64, sizeof(sprs64));
>         }
>        else
>         {
> -         if (!ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL))
> +         if (!ptrace32 (PTT_READ_SPRS, tid, (addr_ptr) &sprs32, 0,
NULL))
>             memset (&sprs32, 0, sizeof (sprs32));
>           memcpy (&context->msr, &sprs32, sizeof(sprs32));
>         }
> @@ -411,15 +429,15 @@
>      {
>        if (arch64)
>         ptrace64aix (PTT_WRITE_GPRS, tid,
> -                    (unsigned long) context->gpr, 0, NULL);
> +                    (long long) context->gpr, 0, NULL);
>        else
> -       ptrace32 (PTT_WRITE_GPRS, tid, (int *) context->gpr, 0, NULL);
> +       ptrace32 (PTT_WRITE_GPRS, tid, (addr_ptr) context->gpr, 0, NULL);
>      }
>
>   /* Floating-point registers.  */
>    if (flags & PTHDB_FLAG_FPRS)
>      {
> -      ptrace32 (PTT_WRITE_FPRS, tid, (int *) context->fpr, 0, NULL);
> +      ptrace32 (PTT_WRITE_FPRS, tid, (addr_ptr) context->fpr, 0, NULL);
>      }
>
>    /* Special-purpose registers.  */
> @@ -428,11 +446,11 @@
>        if (arch64)
>         {
>           ptrace64aix (PTT_WRITE_SPRS, tid,
> -                      (unsigned long) &context->msr, 0, NULL);
> +                      (long long) &context->msr, 0, NULL);
>         }
>        else
>         {
> -         ptrace32 (PTT_WRITE_SPRS, tid, (void *) &context->msr, 0,
NULL);
> +         ptrace32 (PTT_WRITE_SPRS, tid, (addr_ptr) &context->msr, 0,
NULL);
>         }
>      }
>    return 0;
> @@ -997,10 +1015,10 @@
>        tid[1] = 0;
>
>        if (arch64)
> -       ptrace64aix (PTT_CONTINUE, tid[0], 1,
> +       ptrace64aix (PTT_CONTINUE, tid[0], (long long) 1,
>                      gdb_signal_to_host (sig), (void *) tid);
>        else
> -       ptrace32 (PTT_CONTINUE, tid[0], (int *) 1,
> +       ptrace32 (PTT_CONTINUE, tid[0], (addr_ptr) 1,
>                   gdb_signal_to_host (sig), (void *) tid);
>      }
>  }
> @@ -1233,13 +1251,13 @@
>        if (arch64)
>         {
>           if (!ptrace64aix (PTT_READ_GPRS, tid,
> -                           (unsigned long) gprs64, 0, NULL))
> +                           (long long) gprs64, 0, NULL))
>             memset (gprs64, 0, sizeof (gprs64));
>           supply_gprs64 (regcache, gprs64);
>         }
>        else
>         {
> -         if (!ptrace32 (PTT_READ_GPRS, tid, gprs32, 0, NULL))
> +         if (!ptrace32 (PTT_READ_GPRS, tid, (addr_ptr) gprs32, 0, NULL))
>             memset (gprs32, 0, sizeof (gprs32));
>           for (i = 0; i < ppc_num_gprs; i++)
>             supply_reg32 (regcache, tdep->ppc_gp0_regnum + i, gprs32[i]);
> @@ -1253,7 +1271,7 @@
>            || (regno >= tdep->ppc_fp0_regnum
>                && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
>      {
> -      if (!ptrace32 (PTT_READ_FPRS, tid, (void *) fprs, 0, NULL))
> +      if (!ptrace32 (PTT_READ_FPRS, tid, (addr_ptr) fprs, 0, NULL))
>         memset (fprs, 0, sizeof (fprs));
>        supply_fprs (regcache, fprs);
>      }
> @@ -1265,7 +1283,7 @@
>        if (arch64)
>         {
>           if (!ptrace64aix (PTT_READ_SPRS, tid,
> -                           (unsigned long) &sprs64, 0, NULL))
> +                           (long long) &sprs64, 0, NULL))
>             memset (&sprs64, 0, sizeof (sprs64));
>           supply_sprs64 (regcache, sprs64.pt_iar, sprs64.pt_msr,
>                          sprs64.pt_cr, sprs64.pt_lr, sprs64.pt_ctr,
> @@ -1275,7 +1293,7 @@
>         {
>           struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
>
> -         if (!ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL))
> +         if (!ptrace32 (PTT_READ_SPRS, tid, (addr_ptr) &sprs32, 0,
NULL))
>             memset (&sprs32, 0, sizeof (sprs32));
>           supply_sprs32 (regcache, sprs32.pt_iar, sprs32.pt_msr,
sprs32.pt_cr,
>                          sprs32.pt_lr, sprs32.pt_ctr, sprs32.pt_xer,
> @@ -1563,16 +1581,16 @@
>        if (arch64)
>         {
>           /* Pre-fetch: some regs may not be in the cache.  */
> -         ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0,
NULL);
> +         ptrace64aix (PTT_READ_GPRS, tid, (long long) gprs64, 0, NULL);
>           fill_gprs64 (regcache, gprs64);
> -         ptrace64aix (PTT_WRITE_GPRS, tid, (unsigned long) gprs64, 0,
NULL);
> +         ptrace64aix (PTT_WRITE_GPRS, tid, (long long) gprs64, 0, NULL);
>         }
>        else
>         {
>           /* Pre-fetch: some regs may not be in the cache.  */
> -         ptrace32 (PTT_READ_GPRS, tid, gprs32, 0, NULL);
> +         ptrace32 (PTT_READ_GPRS, tid, (addr_ptr) gprs32, 0, NULL);
>           fill_gprs32 (regcache, gprs32);
> -         ptrace32 (PTT_WRITE_GPRS, tid, gprs32, 0, NULL);
> +         ptrace32 (PTT_WRITE_GPRS, tid, (addr_ptr) gprs32, 0, NULL);
>         }
>      }
>
> @@ -1584,9 +1602,9 @@
>                && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
>      {
>        /* Pre-fetch: some regs may not be in the cache.  */
> -      ptrace32 (PTT_READ_FPRS, tid, (void *) fprs, 0, NULL);
> +      ptrace32 (PTT_READ_FPRS, tid, (addr_ptr) fprs, 0, NULL);
>        fill_fprs (regcache, fprs);
> -      ptrace32 (PTT_WRITE_FPRS, tid, (void *) fprs, 0, NULL);
> +      ptrace32 (PTT_WRITE_FPRS, tid, (addr_ptr) fprs, 0, NULL);
>      }
>
>    /* Special-purpose registers.  */
> @@ -1597,12 +1615,12 @@
>         {
>           /* Pre-fetch: some registers won't be in the cache.  */
>           ptrace64aix (PTT_READ_SPRS, tid,
> -                      (unsigned long) &sprs64, 0, NULL);
> +                      (long long) &sprs64, 0, NULL);
>           fill_sprs64 (regcache, &sprs64.pt_iar, &sprs64.pt_msr,
>                        &sprs64.pt_cr, &sprs64.pt_lr, &sprs64.pt_ctr,
>                        &sprs64.pt_xer, &sprs64.pt_fpscr);
>           ptrace64aix (PTT_WRITE_SPRS, tid,
> -                      (unsigned long) &sprs64, 0, NULL);
> +                      (long long) &sprs64, 0, NULL);
>         }
>        else
>         {
> @@ -1618,7 +1636,7 @@
>           gdb_assert (sizeof (sprs32.pt_iar) == 4);
>
>           /* Pre-fetch: some registers won't be in the cache.  */
> -         ptrace32 (PTT_READ_SPRS, tid, (int *) &sprs32, 0, NULL);
> +         ptrace32 (PTT_READ_SPRS, tid, (addr_ptr) &sprs32, 0, NULL);
>
>           fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr,
>                        &tmp_ctr, &tmp_xer, &tmp_fpscr);
> @@ -1637,7 +1655,7 @@
>               regcache_raw_collect (regcache, tdep->ppc_mq_regnum,
>                                     &sprs32.pt_mq);
>
> -         ptrace32 (PTT_WRITE_SPRS, tid, (int *) &sprs32, 0, NULL);
> +         ptrace32 (PTT_WRITE_SPRS, tid, (addr_ptr) &sprs32, 0, NULL);
>         }
>      }
>  }