0001-Update-riscv_regs-for-ptrace.h-from-Linux-4.1.x.patch

   1 From a0532c147d0f725bb4dd84616243ce014426eaa0 Mon Sep 17 00:00:00 2001
   2 From: "Richard W.M. Jones" <rjones@redhat.com>
   3 Date: Tue, 9 Aug 2016 22:14:43 +0100
   4 Subject: [PATCH] Update riscv_regs for ptrace.h from Linux 4.1.x.
   5
   6 ---
   7  syscall.c | 20 ++++++++++----------
   8  1 file changed, 10 insertions(+), 10 deletions(-)
   9
  10 diff --git a/syscall.c b/syscall.c
  11 index 0b7ba64..88ed9ba 100644
  12 --- a/syscall.c
  13 +++ b/syscall.c
  14 @@ -1571,7 +1571,7 @@ get_scno(struct tcb *tcp)
  15  # elif defined(ARC)
  16         scno = arc_regs.scratch.r8;
  17  #elif defined(RISCV)
  18 -        scno = riscv_regs.a7;
  19 +        scno = riscv_regs.a[7];
  20  #endif
  21
  22         tcp->scno = scno;
  23 @@ -1967,12 +1967,12 @@ get_syscall_args(struct tcb *tcp)
  24                 tcp->u_arg[i] = *arc_args--;
  25
  26  #elif defined(RISCV)
  27 -        tcp->u_arg[0] = riscv_regs.a0;
  28 -        tcp->u_arg[1] = riscv_regs.a1;
  29 -        tcp->u_arg[2] = riscv_regs.a2;
  30 -        tcp->u_arg[3] = riscv_regs.a3;
  31 -        tcp->u_arg[4] = riscv_regs.a4;
  32 -        tcp->u_arg[5] = riscv_regs.a5;
  33 +        tcp->u_arg[0] = riscv_regs.a[0];
  34 +        tcp->u_arg[1] = riscv_regs.a[1];
  35 +        tcp->u_arg[2] = riscv_regs.a[2];
  36 +        tcp->u_arg[3] = riscv_regs.a[3];
  37 +        tcp->u_arg[4] = riscv_regs.a[4];
  38 +        tcp->u_arg[5] = riscv_regs.a[5];
  39  #else /* Other architecture (32bits specific) */
  40         for (i = 0; i < nargs; ++i)
  41                 if (upeek(tcp->pid, i*4, &tcp->u_arg[i]) < 0)
  42 @@ -2496,11 +2496,11 @@ get_error(struct tcb *tcp)
  43                 tcp->u_rval = arc_regs.scratch.r0;
  44         }
  45  #elif defined(RISCV)
  46 -        if (check_errno && is_negated_errno(riscv_regs.a0)) {
  47 +        if (check_errno && is_negated_errno(riscv_regs.a[0])) {
  48              tcp->u_rval = -1;
  49 -            u_error = -riscv_regs.a0;
  50 +            u_error = -riscv_regs.a[0];
  51          } else {
  52 -            tcp->u_rval = riscv_regs.a0;
  53 +            tcp->u_rval = riscv_regs.a[0];
  54          }
  55  #endif
  56         tcp->u_error = u_error;
  57 --
  58 2.7.4
  59