[2/2] GDB process record and reverse debugging improvements for arm*-linux*

Message ID 52929027.7020303@linaro.org
State Accepted
Headers show

Commit Message

Omair Javaid Nov. 24, 2013, 11:47 p.m.
On 11/11/2013 03:08 PM, Omair Javaid wrote:
> On 11 November 2013 15:00, oza Pawandeep <oza.pawandeep@gmail.com> wrote:
> 
>> Hi Omair,
>>
>> Can you please quickly point me out to the patches, I will start
>> reviewing form my end.
>> I am sorry if I have missed your patches sometime before, and I afraid
>> I dont have them now.
>> I have a link to your patches.
>> I could find only one...
>> <
>> http://sourceware-org.1504.n7.nabble.com/PATCH-2-2-GDB-process-record-and-reverse-debugging-improvements-for-arm-linux-td248415.html
>>>
>>
>> if you could send all the patches, I shall be able to give my feedback.
>>
>> Regards,
>> Oza.
>>
>>
>>
>>
>> On Mon, Nov 11, 2013 at 3:22 PM, Yao Qi <yao@codesourcery.com> wrote:
>>> On 11/08/2013 11:20 AM, Omair Javaid wrote:
>>>>
>>>> 2013-11-08  Omair Javaid<omair.javaid@linaro.org>
>>>>
>>>>         * arm-linux-tdep.c (struct arm_linux_record_tdep): Declare.
>>>>         (arm_canonicalize_syscall): New function.
>>>>         (arm_all_but_pc_registers_record): New function.
>>>>         (arm_linux_syscall_record): New function.
>>>>         (arm_linux_init_abi): Add syscall recording constructs.
>>>>         * arm-tdep.c (thumb_record_ldm_stm_swi): Update thumb syscall
>>>> decoding.
>>>>         (arm_record_coproc_data_proc): Update arm syscall decoding.
>>>>         * arm-tdep.h (gdbarch_tdep): Update arm_syscall_record
>>>> declaration.
>>>>
>>>
>>> We can write the last entry like this:
>>>
>>>         * arm-tdep.h (struct gdbarch_tdep) <arm_swi_record>: Remove.
>>>         <arm_syscall_record>: New field.
>>>
>>>>
>>>> +#include "record-full.h"
>>>> +#include "linux-record.h"
>>>> +
>>>
>>>
>>> We should mention these two inclusions in ChangeLog too, like
>>>
>>>         * arm-linux-tdep.c: Include "record-full.h" and
>>>         "linux-record.h".
>>>
>>>>   #include "cli/cli-utils.h"
>>>>   #include "stap-probe.h"
>>>>   #include "parser-defs.h"
>>>> @@ -1231,6 +1234,98 @@ arm_stap_parse_special_token (struct gdb
>>>>     return 1;
>>>>   }
>>>>
>>>> +/* ARM process record-replay constructs; syscall, signal etc.  */
>>>> +
>>>> +struct linux_record_tdep arm_linux_record_tdep;
>>>> +
>>>> +/* arm_canonicalize_syscall maps from the native arm Linux set
>>>> +   of syscall ids into a canonical set of syscall ids used by
>>>> +   process record.  */
>>>> +
>>>> +static enum gdb_syscall
>>>> +arm_canonicalize_syscall (int syscall)
>>>> +{
>>>> +  enum { sys_process_vm_writev = 377 };
>>>> +
>>>> +  if (syscall <=  gdb_sys_sched_getaffinity)
>>>> +    {
>>>> +      return syscall;
>>>> +    }
>>>
>>>
>>> Unnecessary braces.
>>>
>>>> +  else if (syscall >= 243 && syscall <= 247 )
>>>> +    {
>>>> +      return syscall + 2;
>>>> +    }
>>>> +  else if (syscall >= 248 && syscall <= 253 )
>>>> +    {
>>>> +      return syscall + 4;
>>>> +    }
>>>> +
>>>> +  return -1;
>>>> +}
>>>
>>>
>>>> +
>>>> +/* Handler for arm system call instruction and recording.  */
>>>> +
>>>> +static int
>>>> +arm_linux_syscall_record (struct regcache *regcache, unsigned long
>>>> svc_number)
>>>
>>>
>>> Your mailer should wrap your patch.  That means other people can't apply
>>> your patch cleanly.
>>>
>>> Patch looks good to me but you still need a maintainer's approval.
>>>
>>> --
>>> Yao (齐尧)
>>
> 
> Here you go Oza:
> 
> https://sourceware.org/ml/gdb-patches/2013-11/msg00217.html
> 
> https://sourceware.org/ml/gdb-patches/2013-11/msg00215.html
> 
> https://sourceware.org/ml/gdb-patches/2013-11/msg00216.html
> 

After incorporating all suggestions I am posting a final patch. Looking
for a go ahead for commit.

This patch adds support for process record/replay system call recording 
for arm targets.

gdb:

2013-11-08  Omair Javaid  <omair.javaid@linaro.org>

	* arm-linux-tdep.c (struct arm_linux_record_tdep): Declare.
	(arm_canonicalize_syscall): New function.
	(arm_all_but_pc_registers_record): New function.
	(arm_linux_syscall_record): New function.
	(arm_linux_init_abi): Add syscall recording constructs.
	* arm-tdep.c (thumb_record_ldm_stm_swi): Update thumb syscall decoding.
	(arm_record_coproc_data_proc): Update arm syscall decoding.
	* arm-tdep.h (struct gdbarch_tdep) <arm_swi_record>: Remove.
	<arm_syscall_record>: New field.
	* arm-linux-tdep.c: Include "record-full.h" and
	"linux-record.h".

---
 gdb/arm-linux-tdep.c |  248 +++++++++++++++++++++++++++++++++++++++++++++++++-
 gdb/arm-tdep.c       |   50 ++++++----
 gdb/arm-tdep.h       |    4 +-
 3 files changed, 280 insertions(+), 22 deletions(-)

--

Comments

Omair Javaid Dec. 17, 2013, 10:22 a.m. | #1
On Mon 25 Nov 2013 04:47:51 AM PKT, Omair Javaid wrote:
> On 11/11/2013 03:08 PM, Omair Javaid wrote:
>> On 11 November 2013 15:00, oza Pawandeep <oza.pawandeep@gmail.com> wrote:
>>
>>> Hi Omair,
>>>
>>> Can you please quickly point me out to the patches, I will start
>>> reviewing form my end.
>>> I am sorry if I have missed your patches sometime before, and I afraid
>>> I dont have them now.
>>> I have a link to your patches.
>>> I could find only one...
>>> <
>>> http://sourceware-org.1504.n7.nabble.com/PATCH-2-2-GDB-process-record-and-reverse-debugging-improvements-for-arm-linux-td248415.html
>>>>
>>>
>>> if you could send all the patches, I shall be able to give my feedback.
>>>
>>> Regards,
>>> Oza.
>>>
>>>
>>>
>>>
>>> On Mon, Nov 11, 2013 at 3:22 PM, Yao Qi <yao@codesourcery.com> wrote:
>>>> On 11/08/2013 11:20 AM, Omair Javaid wrote:
>>>>>
>>>>> 2013-11-08  Omair Javaid<omair.javaid@linaro.org>
>>>>>
>>>>>         * arm-linux-tdep.c (struct arm_linux_record_tdep): Declare.
>>>>>         (arm_canonicalize_syscall): New function.
>>>>>         (arm_all_but_pc_registers_record): New function.
>>>>>         (arm_linux_syscall_record): New function.
>>>>>         (arm_linux_init_abi): Add syscall recording constructs.
>>>>>         * arm-tdep.c (thumb_record_ldm_stm_swi): Update thumb syscall
>>>>> decoding.
>>>>>         (arm_record_coproc_data_proc): Update arm syscall decoding.
>>>>>         * arm-tdep.h (gdbarch_tdep): Update arm_syscall_record
>>>>> declaration.
>>>>>
>>>>
>>>> We can write the last entry like this:
>>>>
>>>>         * arm-tdep.h (struct gdbarch_tdep) <arm_swi_record>: Remove.
>>>>         <arm_syscall_record>: New field.
>>>>
>>>>>
>>>>> +#include "record-full.h"
>>>>> +#include "linux-record.h"
>>>>> +
>>>>
>>>>
>>>> We should mention these two inclusions in ChangeLog too, like
>>>>
>>>>         * arm-linux-tdep.c: Include "record-full.h" and
>>>>         "linux-record.h".
>>>>
>>>>>   #include "cli/cli-utils.h"
>>>>>   #include "stap-probe.h"
>>>>>   #include "parser-defs.h"
>>>>> @@ -1231,6 +1234,98 @@ arm_stap_parse_special_token (struct gdb
>>>>>     return 1;
>>>>>   }
>>>>>
>>>>> +/* ARM process record-replay constructs; syscall, signal etc.  */
>>>>> +
>>>>> +struct linux_record_tdep arm_linux_record_tdep;
>>>>> +
>>>>> +/* arm_canonicalize_syscall maps from the native arm Linux set
>>>>> +   of syscall ids into a canonical set of syscall ids used by
>>>>> +   process record.  */
>>>>> +
>>>>> +static enum gdb_syscall
>>>>> +arm_canonicalize_syscall (int syscall)
>>>>> +{
>>>>> +  enum { sys_process_vm_writev = 377 };
>>>>> +
>>>>> +  if (syscall <=  gdb_sys_sched_getaffinity)
>>>>> +    {
>>>>> +      return syscall;
>>>>> +    }
>>>>
>>>>
>>>> Unnecessary braces.
>>>>
>>>>> +  else if (syscall >= 243 && syscall <= 247 )
>>>>> +    {
>>>>> +      return syscall + 2;
>>>>> +    }
>>>>> +  else if (syscall >= 248 && syscall <= 253 )
>>>>> +    {
>>>>> +      return syscall + 4;
>>>>> +    }
>>>>> +
>>>>> +  return -1;
>>>>> +}
>>>>
>>>>
>>>>> +
>>>>> +/* Handler for arm system call instruction and recording.  */
>>>>> +
>>>>> +static int
>>>>> +arm_linux_syscall_record (struct regcache *regcache, unsigned long
>>>>> svc_number)
>>>>
>>>>
>>>> Your mailer should wrap your patch.  That means other people can't apply
>>>> your patch cleanly.
>>>>
>>>> Patch looks good to me but you still need a maintainer's approval.
>>>>
>>>> --
>>>> Yao (齐尧)
>>>
>>
>> Here you go Oza:
>>
>> https://sourceware.org/ml/gdb-patches/2013-11/msg00217.html
>>
>> https://sourceware.org/ml/gdb-patches/2013-11/msg00215.html
>>
>> https://sourceware.org/ml/gdb-patches/2013-11/msg00216.html
>>
>
> After incorporating all suggestions I am posting a final patch. Looking
> for a go ahead for commit.
>
> This patch adds support for process record/replay system call recording
> for arm targets.
>
> gdb:
>
> 2013-11-08  Omair Javaid  <omair.javaid@linaro.org>
>
> 	* arm-linux-tdep.c (struct arm_linux_record_tdep): Declare.
> 	(arm_canonicalize_syscall): New function.
> 	(arm_all_but_pc_registers_record): New function.
> 	(arm_linux_syscall_record): New function.
> 	(arm_linux_init_abi): Add syscall recording constructs.
> 	* arm-tdep.c (thumb_record_ldm_stm_swi): Update thumb syscall decoding.
> 	(arm_record_coproc_data_proc): Update arm syscall decoding.
> 	* arm-tdep.h (struct gdbarch_tdep) <arm_swi_record>: Remove.
> 	<arm_syscall_record>: New field.
> 	* arm-linux-tdep.c: Include "record-full.h" and
> 	"linux-record.h".
>
> ---
>  gdb/arm-linux-tdep.c |  248 +++++++++++++++++++++++++++++++++++++++++++++++++-
>  gdb/arm-tdep.c       |   50 ++++++----
>  gdb/arm-tdep.h       |    4 +-
>  3 files changed, 280 insertions(+), 22 deletions(-)
>
> diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
> index 7546d34..7f3420f 100644
> --- a/gdb/arm-linux-tdep.c
> +++ b/gdb/arm-linux-tdep.c
> @@ -44,6 +44,9 @@
>  #include "gdbthread.h"
>  #include "symfile.h"
>
> +#include "record-full.h"
> +#include "linux-record.h"
> +
>  #include "cli/cli-utils.h"
>  #include "stap-probe.h"
>  #include "parser-defs.h"
> @@ -1231,6 +1234,92 @@ arm_stap_parse_special_token (struct gdbarch *gdbarch,
>    return 1;
>  }
>
> +/* ARM process record-replay constructs; syscall, signal etc.  */
> +
> +struct linux_record_tdep arm_linux_record_tdep;
> +
> +/* arm_canonicalize_syscall maps from the native arm Linux set
> +   of syscall ids into a canonical set of syscall ids used by
> +   process record.  */
> +
> +static enum gdb_syscall
> +arm_canonicalize_syscall (int syscall)
> +{
> +  enum { sys_process_vm_writev = 377 };
> +
> +  if (syscall <=  gdb_sys_sched_getaffinity)
> +    return syscall;
> +  else if (syscall >= 243 && syscall <= 247 )
> +    return syscall + 2;
> +  else if (syscall >= 248 && syscall <= 253 )
> +    return syscall + 4;
> +
> +  return -1;
> +}
> +
> +/* Record all registers but PC register for process-record.  */
> +
> +static int
> +arm_all_but_pc_registers_record (struct regcache *regcache)
> +{
> +  int i;
> +
> +  for (i = 0; i < ARM_PC_REGNUM; i++)
> +    {
> +      if (record_full_arch_list_add_reg (regcache, ARM_A1_REGNUM + i))
> +        return -1;
> +    }
> +
> +  if (record_full_arch_list_add_reg (regcache, ARM_PS_REGNUM))
> +    return -1;
> +
> +  return 0;
> +}
> +
> +/* Handler for arm system call instruction and recording.  */
> +
> +static int
> +arm_linux_syscall_record (struct regcache *regcache, unsigned long svc_number)
> +{
> +  int ret = 0;
> +  enum gdb_syscall syscall_gdb;
> +
> +  syscall_gdb = arm_canonicalize_syscall (svc_number);
> +
> +  if (syscall_gdb < 0)
> +    {
> +      printf_unfiltered (_("Process record and replay target doesn't "
> +                           "support syscall number %s\n"),
> +                           plongest (svc_number));
> +      return -1;
> +    }
> +
> +  if (syscall_gdb == gdb_sys_sigreturn
> +      || syscall_gdb == gdb_sys_rt_sigreturn)
> +   {
> +     if (arm_all_but_pc_registers_record (regcache))
> +       return -1;
> +     return 0;
> +   }
> +
> +  ret = record_linux_system_call (syscall_gdb, regcache,
> +                                  &arm_linux_record_tdep);
> +  if (ret)
> +    return ret;
> +
> +  /* Record the return value of the system call.  */
> +  if (record_full_arch_list_add_reg (regcache, ARM_A1_REGNUM))
> +    return -1;
> +  /* Record LR.  */
> +  if (record_full_arch_list_add_reg (regcache, ARM_LR_REGNUM))
> +    return -1;
> +  /* Record CPSR.  */
> +  if (record_full_arch_list_add_reg (regcache, ARM_PS_REGNUM))
> +    return -1;
> +
> +  return 0;
> +}
> +
>  static void
>  arm_linux_init_abi (struct gdbarch_info info,
>  		    struct gdbarch *gdbarch)
> @@ -1350,7 +1439,164 @@ arm_linux_init_abi (struct gdbarch_info info,
>    set_gdbarch_get_syscall_number (gdbarch, arm_linux_get_syscall_number);
>
>    /* Syscall record.  */
> -  tdep->arm_swi_record = NULL;
> +  tdep->arm_syscall_record = arm_linux_syscall_record;
> +
> +  /* Initialize the arm_linux_record_tdep.  */
> +  /* These values are the size of the type that will be used in a system
> +     call.  They are obtained from Linux Kernel source.  */
> +  arm_linux_record_tdep.size_pointer
> +    = gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT;
> +  arm_linux_record_tdep.size__old_kernel_stat = 32;
> +  arm_linux_record_tdep.size_tms = 16;
> +  arm_linux_record_tdep.size_loff_t = 8;
> +  arm_linux_record_tdep.size_flock = 16;
> +  arm_linux_record_tdep.size_oldold_utsname = 45;
> +  arm_linux_record_tdep.size_ustat = 20;
> +  arm_linux_record_tdep.size_old_sigaction = 140;
> +  arm_linux_record_tdep.size_old_sigset_t = 128;
> +  arm_linux_record_tdep.size_rlimit = 8;
> +  arm_linux_record_tdep.size_rusage = 72;
> +  arm_linux_record_tdep.size_timeval = 8;
> +  arm_linux_record_tdep.size_timezone = 8;
> +  arm_linux_record_tdep.size_old_gid_t = 2;
> +  arm_linux_record_tdep.size_old_uid_t = 2;
> +  arm_linux_record_tdep.size_fd_set = 128;
> +  arm_linux_record_tdep.size_dirent = 268;
> +  arm_linux_record_tdep.size_dirent64 = 276;
> +  arm_linux_record_tdep.size_statfs = 64;
> +  arm_linux_record_tdep.size_statfs64 = 84;
> +  arm_linux_record_tdep.size_sockaddr = 16;
> +  arm_linux_record_tdep.size_int
> +    = gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT;
> +  arm_linux_record_tdep.size_long
> +    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
> +  arm_linux_record_tdep.size_ulong
> +    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
> +  arm_linux_record_tdep.size_msghdr = 28;
> +  arm_linux_record_tdep.size_itimerval = 16;
> +  arm_linux_record_tdep.size_stat = 88;
> +  arm_linux_record_tdep.size_old_utsname = 325;
> +  arm_linux_record_tdep.size_sysinfo = 64;
> +  arm_linux_record_tdep.size_msqid_ds = 88;
> +  arm_linux_record_tdep.size_shmid_ds = 84;
> +  arm_linux_record_tdep.size_new_utsname = 390;
> +  arm_linux_record_tdep.size_timex = 128;
> +  arm_linux_record_tdep.size_mem_dqinfo = 24;
> +  arm_linux_record_tdep.size_if_dqblk = 68;
> +  arm_linux_record_tdep.size_fs_quota_stat = 68;
> +  arm_linux_record_tdep.size_timespec = 8;
> +  arm_linux_record_tdep.size_pollfd = 8;
> +  arm_linux_record_tdep.size_NFS_FHSIZE = 32;
> +  arm_linux_record_tdep.size_knfsd_fh = 132;
> +  arm_linux_record_tdep.size_TASK_COMM_LEN = 16;
> +  arm_linux_record_tdep.size_sigaction = 140;
> +  arm_linux_record_tdep.size_sigset_t = 8;
> +  arm_linux_record_tdep.size_siginfo_t = 128;
> +  arm_linux_record_tdep.size_cap_user_data_t = 12;
> +  arm_linux_record_tdep.size_stack_t = 12;
> +  arm_linux_record_tdep.size_off_t = arm_linux_record_tdep.size_long;
> +  arm_linux_record_tdep.size_stat64 = 96;
> +  arm_linux_record_tdep.size_gid_t = 2;
> +  arm_linux_record_tdep.size_uid_t = 2;
> +  arm_linux_record_tdep.size_PAGE_SIZE = 4096;
> +  arm_linux_record_tdep.size_flock64 = 24;
> +  arm_linux_record_tdep.size_user_desc = 16;
> +  arm_linux_record_tdep.size_io_event = 32;
> +  arm_linux_record_tdep.size_iocb = 64;
> +  arm_linux_record_tdep.size_epoll_event = 12;
> +  arm_linux_record_tdep.size_itimerspec
> +    = arm_linux_record_tdep.size_timespec * 2;
> +  arm_linux_record_tdep.size_mq_attr = 32;
> +  arm_linux_record_tdep.size_siginfo = 128;
> +  arm_linux_record_tdep.size_termios = 36;
> +  arm_linux_record_tdep.size_termios2 = 44;
> +  arm_linux_record_tdep.size_pid_t = 4;
> +  arm_linux_record_tdep.size_winsize = 8;
> +  arm_linux_record_tdep.size_serial_struct = 60;
> +  arm_linux_record_tdep.size_serial_icounter_struct = 80;
> +  arm_linux_record_tdep.size_hayes_esp_config = 12;
> +  arm_linux_record_tdep.size_size_t = 4;
> +  arm_linux_record_tdep.size_iovec = 8;
> +
> +  /* These values are the second argument of system call "sys_ioctl".
> +     They are obtained from Linux Kernel source.  */
> +  arm_linux_record_tdep.ioctl_TCGETS = 0x5401;
> +  arm_linux_record_tdep.ioctl_TCSETS = 0x5402;
> +  arm_linux_record_tdep.ioctl_TCSETSW = 0x5403;
> +  arm_linux_record_tdep.ioctl_TCSETSF = 0x5404;
> +  arm_linux_record_tdep.ioctl_TCGETA = 0x5405;
> +  arm_linux_record_tdep.ioctl_TCSETA = 0x5406;
> +  arm_linux_record_tdep.ioctl_TCSETAW = 0x5407;
> +  arm_linux_record_tdep.ioctl_TCSETAF = 0x5408;
> +  arm_linux_record_tdep.ioctl_TCSBRK = 0x5409;
> +  arm_linux_record_tdep.ioctl_TCXONC = 0x540A;
> +  arm_linux_record_tdep.ioctl_TCFLSH = 0x540B;
> +  arm_linux_record_tdep.ioctl_TIOCEXCL = 0x540C;
> +  arm_linux_record_tdep.ioctl_TIOCNXCL = 0x540D;
> +  arm_linux_record_tdep.ioctl_TIOCSCTTY = 0x540E;
> +  arm_linux_record_tdep.ioctl_TIOCGPGRP = 0x540F;
> +  arm_linux_record_tdep.ioctl_TIOCSPGRP = 0x5410;
> +  arm_linux_record_tdep.ioctl_TIOCOUTQ = 0x5411;
> +  arm_linux_record_tdep.ioctl_TIOCSTI = 0x5412;
> +  arm_linux_record_tdep.ioctl_TIOCGWINSZ = 0x5413;
> +  arm_linux_record_tdep.ioctl_TIOCSWINSZ = 0x5414;
> +  arm_linux_record_tdep.ioctl_TIOCMGET = 0x5415;
> +  arm_linux_record_tdep.ioctl_TIOCMBIS = 0x5416;
> +  arm_linux_record_tdep.ioctl_TIOCMBIC = 0x5417;
> +  arm_linux_record_tdep.ioctl_TIOCMSET = 0x5418;
> +  arm_linux_record_tdep.ioctl_TIOCGSOFTCAR = 0x5419;
> +  arm_linux_record_tdep.ioctl_TIOCSSOFTCAR = 0x541A;
> +  arm_linux_record_tdep.ioctl_FIONREAD = 0x541B;
> +  arm_linux_record_tdep.ioctl_TIOCINQ = arm_linux_record_tdep.ioctl_FIONREAD;
> +  arm_linux_record_tdep.ioctl_TIOCLINUX = 0x541C;
> +  arm_linux_record_tdep.ioctl_TIOCCONS = 0x541D;
> +  arm_linux_record_tdep.ioctl_TIOCGSERIAL = 0x541E;
> +  arm_linux_record_tdep.ioctl_TIOCSSERIAL = 0x541F;
> +  arm_linux_record_tdep.ioctl_TIOCPKT = 0x5420;
> +  arm_linux_record_tdep.ioctl_FIONBIO = 0x5421;
> +  arm_linux_record_tdep.ioctl_TIOCNOTTY = 0x5422;
> +  arm_linux_record_tdep.ioctl_TIOCSETD = 0x5423;
> +  arm_linux_record_tdep.ioctl_TIOCGETD = 0x5424;
> +  arm_linux_record_tdep.ioctl_TCSBRKP = 0x5425;
> +  arm_linux_record_tdep.ioctl_TIOCTTYGSTRUCT = 0x5426;
> +  arm_linux_record_tdep.ioctl_TIOCSBRK = 0x5427;
> +  arm_linux_record_tdep.ioctl_TIOCCBRK = 0x5428;
> +  arm_linux_record_tdep.ioctl_TIOCGSID = 0x5429;
> +  arm_linux_record_tdep.ioctl_TCGETS2 = 0x802c542a;
> +  arm_linux_record_tdep.ioctl_TCSETS2 = 0x402c542b;
> +  arm_linux_record_tdep.ioctl_TCSETSW2 = 0x402c542c;
> +  arm_linux_record_tdep.ioctl_TCSETSF2 = 0x402c542d;
> +  arm_linux_record_tdep.ioctl_TIOCGPTN = 0x80045430;
> +  arm_linux_record_tdep.ioctl_TIOCSPTLCK = 0x40045431;
> +  arm_linux_record_tdep.ioctl_FIONCLEX = 0x5450;
> +  arm_linux_record_tdep.ioctl_FIOCLEX = 0x5451;
> +  arm_linux_record_tdep.ioctl_FIOASYNC = 0x5452;
> +  arm_linux_record_tdep.ioctl_TIOCSERCONFIG = 0x5453;
> +  arm_linux_record_tdep.ioctl_TIOCSERGWILD = 0x5454;
> +  arm_linux_record_tdep.ioctl_TIOCSERSWILD = 0x5455;
> +  arm_linux_record_tdep.ioctl_TIOCGLCKTRMIOS = 0x5456;
> +  arm_linux_record_tdep.ioctl_TIOCSLCKTRMIOS = 0x5457;
> +  arm_linux_record_tdep.ioctl_TIOCSERGSTRUCT = 0x5458;
> +  arm_linux_record_tdep.ioctl_TIOCSERGETLSR = 0x5459;
> +  arm_linux_record_tdep.ioctl_TIOCSERGETMULTI = 0x545A;
> +  arm_linux_record_tdep.ioctl_TIOCSERSETMULTI = 0x545B;
> +  arm_linux_record_tdep.ioctl_TIOCMIWAIT = 0x545C;
> +  arm_linux_record_tdep.ioctl_TIOCGICOUNT = 0x545D;
> +  arm_linux_record_tdep.ioctl_TIOCGHAYESESP = 0x545E;
> +  arm_linux_record_tdep.ioctl_TIOCSHAYESESP = 0x545F;
> +  arm_linux_record_tdep.ioctl_FIOQSIZE = 0x5460;
> +
> +  /* These values are the second argument of system call "sys_fcntl"
> +     and "sys_fcntl64".  They are obtained from Linux Kernel source.  */
> +  arm_linux_record_tdep.fcntl_F_GETLK = 5;
> +  arm_linux_record_tdep.fcntl_F_GETLK64 = 12;
> +  arm_linux_record_tdep.fcntl_F_SETLK64 = 13;
> +  arm_linux_record_tdep.fcntl_F_SETLKW64 = 14;
> +
> +  arm_linux_record_tdep.arg1 = ARM_A1_REGNUM + 1;
> +  arm_linux_record_tdep.arg2 = ARM_A1_REGNUM + 2;
> +  arm_linux_record_tdep.arg3 = ARM_A1_REGNUM + 3;
> +  arm_linux_record_tdep.arg4 = ARM_A1_REGNUM + 3;
>  }
>
>  /* Provide a prototype to silence -Wmissing-prototypes.  */
> diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
> index ecaced7..8fc223d 100644
> --- a/gdb/arm-tdep.c
> +++ b/gdb/arm-tdep.c
> @@ -11936,27 +11936,38 @@ arm_record_coproc_data_proc (insn_decode_record *arm_insn_r)
>    struct gdbarch_tdep *tdep = gdbarch_tdep (arm_insn_r->gdbarch);
>    struct regcache *reg_cache = arm_insn_r->regcache;
>    uint32_t ret = 0; /* function return value: -1:record failure ;  0:success  */
> -
> -  /* Handle SWI insn; system call would be handled over here.  */
> +  ULONGEST u_regval = 0;
>
>    arm_insn_r->opcode = bits (arm_insn_r->arm_insn, 24, 27);
> +
> +  /* Handle arm SWI/SVC system call instructions.  */
>    if (15 == arm_insn_r->opcode)
> -  {
> -    /* Handle arm syscall insn.  */
> -    if (tdep->arm_swi_record != NULL)
> -      {
> -        ret = tdep->arm_swi_record(reg_cache);
> -      }
> -    else
> -      {
> -        printf_unfiltered (_("no syscall record support\n"));
> -        ret = -1;
> -      }
> -  }
> +    {
> +      if (tdep->arm_syscall_record != NULL)
> +        {
> +          ULONGEST svc_operand, svc_number;
> +
> +          svc_operand = (0x00ffffff & arm_insn_r->arm_insn);
> +
> +          if (svc_operand)  /* OABI.  */
> +            svc_number = svc_operand - 0x900000;
> +          else /* EABI.  */
> +            regcache_raw_read_unsigned (reg_cache, 7, &svc_number);
> +
> +          ret = tdep->arm_syscall_record (reg_cache, svc_number);
> +        }
> +      else
> +        {
> +          printf_unfiltered (_("no syscall record support\n"));
> +          ret = -1;
> +        }
> +    }
> +  else
> +    {
> +      arm_record_unsupported_insn(arm_insn_r);
> +      ret = -1;
> +    }
>
> -  printf_unfiltered (_("Process record does not support instruction "
> -                        "0x%0x at address %s.\n"),arm_insn_r->arm_insn,
> -                        paddress (arm_insn_r->gdbarch, arm_insn_r->this_addr));
>    return ret;
>  }
>
> @@ -12361,9 +12372,10 @@ thumb_record_ldm_stm_swi (insn_decode_record *thumb_insn_r)
>    else if (0x1F == opcode1)
>      {
>          /* Handle arm syscall insn.  */
> -        if (tdep->arm_swi_record != NULL)
> +        if (tdep->arm_syscall_record != NULL)
>            {
> -            ret = tdep->arm_swi_record(reg_cache);
> +            regcache_raw_read_unsigned (reg_cache, 7, &u_regval);
> +            ret = tdep->arm_syscall_record (reg_cache, u_regval);
>            }
>          else
>            {
> diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h
> index a1a2be5..b584a43 100644
> --- a/gdb/arm-tdep.h
> +++ b/gdb/arm-tdep.h
> @@ -205,8 +205,8 @@ struct gdbarch_tdep
>       instruction.  */
>    CORE_ADDR (*syscall_next_pc) (struct frame_info *frame);
>
> -   /* Parse swi insn args, sycall record.  */
> -  int (*arm_swi_record) (struct regcache *regcache);
> +   /* syscall record.  */
> +  int (*arm_syscall_record) (struct regcache *regcache, unsigned long svc_number);
>  };
>
>  /* Structures used for displaced stepping.  */

Ping! Looking for maintainer's approval for arm process record/replay 
improvement patches.
Pedro Alves Dec. 20, 2013, 12:37 p.m. | #2
On 11/24/2013 11:47 PM, Omair Javaid wrote:

> After incorporating all suggestions I am posting a final patch. Looking
> for a go ahead for commit.
> 
> This patch adds support for process record/replay system call recording 
> for arm targets.
> 

> 2013-11-08  Omair Javaid  <omair.javaid@linaro.org>
> 
> 	* arm-linux-tdep.c (struct arm_linux_record_tdep): Declare.
> 	(arm_canonicalize_syscall): New function.
> 	(arm_all_but_pc_registers_record): New function.
> 	(arm_linux_syscall_record): New function.
> 	(arm_linux_init_abi): Add syscall recording constructs.
...

> 	* arm-linux-tdep.c: Include "record-full.h" and
> 	"linux-record.h".

These two entries are in the same file, so merge them, like:

	* arm-linux-tdep.c: Include "record-full.h" and
	"linux-record.h".
	(struct arm_linux_record_tdep): Declare.
	(arm_canonicalize_syscall): New function.
	(arm_all_but_pc_registers_record): New function.
	(arm_linux_syscall_record): New function.
	(arm_linux_init_abi): Add syscall recording constructs.

> +/* ARM process record-replay constructs; syscall, signal etc.  */
> +
> +struct linux_record_tdep arm_linux_record_tdep;
> +
> +/* arm_canonicalize_syscall maps from the native arm Linux set
> +   of syscall ids into a canonical set of syscall ids used by
> +   process record.  */
> +
> +static enum gdb_syscall
> +arm_canonicalize_syscall (int syscall)
> +{
> +  enum { sys_process_vm_writev = 377 };
> +
> +  if (syscall <=  gdb_sys_sched_getaffinity)
                   ^^

Spurious space.

> +    return syscall;
> +  else if (syscall >= 243 && syscall <= 247 )
> +    return syscall + 2;
> +  else if (syscall >= 248 && syscall <= 253 )
> +    return syscall + 4;
> +
> +  return -1;
> +}
> +

> +}
> +
> +/* Handler for arm system call instruction and recording.  */

Spurious "and" ?  Otherwise I can't parse it.

> +
> +static int
> +arm_linux_syscall_record (struct regcache *regcache, unsigned long svc_number)
> +{
...
> +
> +  ret = record_linux_system_call (syscall_gdb, regcache,
> +                                  &arm_linux_record_tdep);
> +  if (ret)

  if (ret != 0)


> +    return ret;
> +



> +  arm_linux_record_tdep.ioctl_TIOCGSERIAL = 0x541E;
> +  arm_linux_record_tdep.ioctl_TIOCSSERIAL = 0x541F;
...

> +  arm_linux_record_tdep.ioctl_TCGETS2 = 0x802c542a;
> +  arm_linux_record_tdep.ioctl_TCSETS2 = 0x402c542b;

I see a mixup of uppercase and lowercase in these hex constants.
Could you make them all lowercase please?

> +  else
> +    {
> +      arm_record_unsupported_insn(arm_insn_r);

Space before parens.

> +      ret = -1;
> +    }

Otherwise looks good.

Patch

diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 7546d34..7f3420f 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -44,6 +44,9 @@ 
 #include "gdbthread.h"
 #include "symfile.h"
 
+#include "record-full.h"
+#include "linux-record.h"
+
 #include "cli/cli-utils.h"
 #include "stap-probe.h"
 #include "parser-defs.h"
@@ -1231,6 +1234,92 @@  arm_stap_parse_special_token (struct gdbarch *gdbarch,
   return 1;
 }
 
+/* ARM process record-replay constructs; syscall, signal etc.  */
+
+struct linux_record_tdep arm_linux_record_tdep;
+
+/* arm_canonicalize_syscall maps from the native arm Linux set
+   of syscall ids into a canonical set of syscall ids used by
+   process record.  */
+
+static enum gdb_syscall
+arm_canonicalize_syscall (int syscall)
+{
+  enum { sys_process_vm_writev = 377 };
+
+  if (syscall <=  gdb_sys_sched_getaffinity)
+    return syscall;
+  else if (syscall >= 243 && syscall <= 247 )
+    return syscall + 2;
+  else if (syscall >= 248 && syscall <= 253 )
+    return syscall + 4;
+
+  return -1;
+}
+
+/* Record all registers but PC register for process-record.  */
+
+static int
+arm_all_but_pc_registers_record (struct regcache *regcache)
+{
+  int i;
+
+  for (i = 0; i < ARM_PC_REGNUM; i++)
+    {
+      if (record_full_arch_list_add_reg (regcache, ARM_A1_REGNUM + i))
+        return -1;
+    }
+
+  if (record_full_arch_list_add_reg (regcache, ARM_PS_REGNUM))
+    return -1;
+
+  return 0;
+}
+
+/* Handler for arm system call instruction and recording.  */
+
+static int
+arm_linux_syscall_record (struct regcache *regcache, unsigned long svc_number)
+{
+  int ret = 0;
+  enum gdb_syscall syscall_gdb;
+
+  syscall_gdb = arm_canonicalize_syscall (svc_number);
+
+  if (syscall_gdb < 0)
+    {
+      printf_unfiltered (_("Process record and replay target doesn't "
+                           "support syscall number %s\n"),
+                           plongest (svc_number));
+      return -1;
+    }
+
+  if (syscall_gdb == gdb_sys_sigreturn
+      || syscall_gdb == gdb_sys_rt_sigreturn)
+   {
+     if (arm_all_but_pc_registers_record (regcache))
+       return -1;
+     return 0;
+   }
+
+  ret = record_linux_system_call (syscall_gdb, regcache,
+                                  &arm_linux_record_tdep);
+  if (ret)
+    return ret;
+
+  /* Record the return value of the system call.  */
+  if (record_full_arch_list_add_reg (regcache, ARM_A1_REGNUM))
+    return -1;
+  /* Record LR.  */
+  if (record_full_arch_list_add_reg (regcache, ARM_LR_REGNUM))
+    return -1;
+  /* Record CPSR.  */
+  if (record_full_arch_list_add_reg (regcache, ARM_PS_REGNUM))
+    return -1;
+
+  return 0;
+}
+
 static void
 arm_linux_init_abi (struct gdbarch_info info,
 		    struct gdbarch *gdbarch)
@@ -1350,7 +1439,164 @@  arm_linux_init_abi (struct gdbarch_info info,
   set_gdbarch_get_syscall_number (gdbarch, arm_linux_get_syscall_number);
 
   /* Syscall record.  */
-  tdep->arm_swi_record = NULL;
+  tdep->arm_syscall_record = arm_linux_syscall_record;
+
+  /* Initialize the arm_linux_record_tdep.  */
+  /* These values are the size of the type that will be used in a system
+     call.  They are obtained from Linux Kernel source.  */
+  arm_linux_record_tdep.size_pointer
+    = gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT;
+  arm_linux_record_tdep.size__old_kernel_stat = 32;
+  arm_linux_record_tdep.size_tms = 16;
+  arm_linux_record_tdep.size_loff_t = 8;
+  arm_linux_record_tdep.size_flock = 16;
+  arm_linux_record_tdep.size_oldold_utsname = 45;
+  arm_linux_record_tdep.size_ustat = 20;
+  arm_linux_record_tdep.size_old_sigaction = 140;
+  arm_linux_record_tdep.size_old_sigset_t = 128;
+  arm_linux_record_tdep.size_rlimit = 8;
+  arm_linux_record_tdep.size_rusage = 72;
+  arm_linux_record_tdep.size_timeval = 8;
+  arm_linux_record_tdep.size_timezone = 8;
+  arm_linux_record_tdep.size_old_gid_t = 2;
+  arm_linux_record_tdep.size_old_uid_t = 2;
+  arm_linux_record_tdep.size_fd_set = 128;
+  arm_linux_record_tdep.size_dirent = 268;
+  arm_linux_record_tdep.size_dirent64 = 276;
+  arm_linux_record_tdep.size_statfs = 64;
+  arm_linux_record_tdep.size_statfs64 = 84;
+  arm_linux_record_tdep.size_sockaddr = 16;
+  arm_linux_record_tdep.size_int
+    = gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT;
+  arm_linux_record_tdep.size_long
+    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
+  arm_linux_record_tdep.size_ulong
+    = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
+  arm_linux_record_tdep.size_msghdr = 28;
+  arm_linux_record_tdep.size_itimerval = 16;
+  arm_linux_record_tdep.size_stat = 88;
+  arm_linux_record_tdep.size_old_utsname = 325;
+  arm_linux_record_tdep.size_sysinfo = 64;
+  arm_linux_record_tdep.size_msqid_ds = 88;
+  arm_linux_record_tdep.size_shmid_ds = 84;
+  arm_linux_record_tdep.size_new_utsname = 390;
+  arm_linux_record_tdep.size_timex = 128;
+  arm_linux_record_tdep.size_mem_dqinfo = 24;
+  arm_linux_record_tdep.size_if_dqblk = 68;
+  arm_linux_record_tdep.size_fs_quota_stat = 68;
+  arm_linux_record_tdep.size_timespec = 8;
+  arm_linux_record_tdep.size_pollfd = 8;
+  arm_linux_record_tdep.size_NFS_FHSIZE = 32;
+  arm_linux_record_tdep.size_knfsd_fh = 132;
+  arm_linux_record_tdep.size_TASK_COMM_LEN = 16;
+  arm_linux_record_tdep.size_sigaction = 140;
+  arm_linux_record_tdep.size_sigset_t = 8;
+  arm_linux_record_tdep.size_siginfo_t = 128;
+  arm_linux_record_tdep.size_cap_user_data_t = 12;
+  arm_linux_record_tdep.size_stack_t = 12;
+  arm_linux_record_tdep.size_off_t = arm_linux_record_tdep.size_long;
+  arm_linux_record_tdep.size_stat64 = 96;
+  arm_linux_record_tdep.size_gid_t = 2;
+  arm_linux_record_tdep.size_uid_t = 2;
+  arm_linux_record_tdep.size_PAGE_SIZE = 4096;
+  arm_linux_record_tdep.size_flock64 = 24;
+  arm_linux_record_tdep.size_user_desc = 16;
+  arm_linux_record_tdep.size_io_event = 32;
+  arm_linux_record_tdep.size_iocb = 64;
+  arm_linux_record_tdep.size_epoll_event = 12;
+  arm_linux_record_tdep.size_itimerspec
+    = arm_linux_record_tdep.size_timespec * 2;
+  arm_linux_record_tdep.size_mq_attr = 32;
+  arm_linux_record_tdep.size_siginfo = 128;
+  arm_linux_record_tdep.size_termios = 36;
+  arm_linux_record_tdep.size_termios2 = 44;
+  arm_linux_record_tdep.size_pid_t = 4;
+  arm_linux_record_tdep.size_winsize = 8;
+  arm_linux_record_tdep.size_serial_struct = 60;
+  arm_linux_record_tdep.size_serial_icounter_struct = 80;
+  arm_linux_record_tdep.size_hayes_esp_config = 12;
+  arm_linux_record_tdep.size_size_t = 4;
+  arm_linux_record_tdep.size_iovec = 8;
+
+  /* These values are the second argument of system call "sys_ioctl".
+     They are obtained from Linux Kernel source.  */
+  arm_linux_record_tdep.ioctl_TCGETS = 0x5401;
+  arm_linux_record_tdep.ioctl_TCSETS = 0x5402;
+  arm_linux_record_tdep.ioctl_TCSETSW = 0x5403;
+  arm_linux_record_tdep.ioctl_TCSETSF = 0x5404;
+  arm_linux_record_tdep.ioctl_TCGETA = 0x5405;
+  arm_linux_record_tdep.ioctl_TCSETA = 0x5406;
+  arm_linux_record_tdep.ioctl_TCSETAW = 0x5407;
+  arm_linux_record_tdep.ioctl_TCSETAF = 0x5408;
+  arm_linux_record_tdep.ioctl_TCSBRK = 0x5409;
+  arm_linux_record_tdep.ioctl_TCXONC = 0x540A;
+  arm_linux_record_tdep.ioctl_TCFLSH = 0x540B;
+  arm_linux_record_tdep.ioctl_TIOCEXCL = 0x540C;
+  arm_linux_record_tdep.ioctl_TIOCNXCL = 0x540D;
+  arm_linux_record_tdep.ioctl_TIOCSCTTY = 0x540E;
+  arm_linux_record_tdep.ioctl_TIOCGPGRP = 0x540F;
+  arm_linux_record_tdep.ioctl_TIOCSPGRP = 0x5410;
+  arm_linux_record_tdep.ioctl_TIOCOUTQ = 0x5411;
+  arm_linux_record_tdep.ioctl_TIOCSTI = 0x5412;
+  arm_linux_record_tdep.ioctl_TIOCGWINSZ = 0x5413;
+  arm_linux_record_tdep.ioctl_TIOCSWINSZ = 0x5414;
+  arm_linux_record_tdep.ioctl_TIOCMGET = 0x5415;
+  arm_linux_record_tdep.ioctl_TIOCMBIS = 0x5416;
+  arm_linux_record_tdep.ioctl_TIOCMBIC = 0x5417;
+  arm_linux_record_tdep.ioctl_TIOCMSET = 0x5418;
+  arm_linux_record_tdep.ioctl_TIOCGSOFTCAR = 0x5419;
+  arm_linux_record_tdep.ioctl_TIOCSSOFTCAR = 0x541A;
+  arm_linux_record_tdep.ioctl_FIONREAD = 0x541B;
+  arm_linux_record_tdep.ioctl_TIOCINQ = arm_linux_record_tdep.ioctl_FIONREAD;
+  arm_linux_record_tdep.ioctl_TIOCLINUX = 0x541C;
+  arm_linux_record_tdep.ioctl_TIOCCONS = 0x541D;
+  arm_linux_record_tdep.ioctl_TIOCGSERIAL = 0x541E;
+  arm_linux_record_tdep.ioctl_TIOCSSERIAL = 0x541F;
+  arm_linux_record_tdep.ioctl_TIOCPKT = 0x5420;
+  arm_linux_record_tdep.ioctl_FIONBIO = 0x5421;
+  arm_linux_record_tdep.ioctl_TIOCNOTTY = 0x5422;
+  arm_linux_record_tdep.ioctl_TIOCSETD = 0x5423;
+  arm_linux_record_tdep.ioctl_TIOCGETD = 0x5424;
+  arm_linux_record_tdep.ioctl_TCSBRKP = 0x5425;
+  arm_linux_record_tdep.ioctl_TIOCTTYGSTRUCT = 0x5426;
+  arm_linux_record_tdep.ioctl_TIOCSBRK = 0x5427;
+  arm_linux_record_tdep.ioctl_TIOCCBRK = 0x5428;
+  arm_linux_record_tdep.ioctl_TIOCGSID = 0x5429;
+  arm_linux_record_tdep.ioctl_TCGETS2 = 0x802c542a;
+  arm_linux_record_tdep.ioctl_TCSETS2 = 0x402c542b;
+  arm_linux_record_tdep.ioctl_TCSETSW2 = 0x402c542c;
+  arm_linux_record_tdep.ioctl_TCSETSF2 = 0x402c542d;
+  arm_linux_record_tdep.ioctl_TIOCGPTN = 0x80045430;
+  arm_linux_record_tdep.ioctl_TIOCSPTLCK = 0x40045431;
+  arm_linux_record_tdep.ioctl_FIONCLEX = 0x5450;
+  arm_linux_record_tdep.ioctl_FIOCLEX = 0x5451;
+  arm_linux_record_tdep.ioctl_FIOASYNC = 0x5452;
+  arm_linux_record_tdep.ioctl_TIOCSERCONFIG = 0x5453;
+  arm_linux_record_tdep.ioctl_TIOCSERGWILD = 0x5454;
+  arm_linux_record_tdep.ioctl_TIOCSERSWILD = 0x5455;
+  arm_linux_record_tdep.ioctl_TIOCGLCKTRMIOS = 0x5456;
+  arm_linux_record_tdep.ioctl_TIOCSLCKTRMIOS = 0x5457;
+  arm_linux_record_tdep.ioctl_TIOCSERGSTRUCT = 0x5458;
+  arm_linux_record_tdep.ioctl_TIOCSERGETLSR = 0x5459;
+  arm_linux_record_tdep.ioctl_TIOCSERGETMULTI = 0x545A;
+  arm_linux_record_tdep.ioctl_TIOCSERSETMULTI = 0x545B;
+  arm_linux_record_tdep.ioctl_TIOCMIWAIT = 0x545C;
+  arm_linux_record_tdep.ioctl_TIOCGICOUNT = 0x545D;
+  arm_linux_record_tdep.ioctl_TIOCGHAYESESP = 0x545E;
+  arm_linux_record_tdep.ioctl_TIOCSHAYESESP = 0x545F;
+  arm_linux_record_tdep.ioctl_FIOQSIZE = 0x5460;
+
+  /* These values are the second argument of system call "sys_fcntl"
+     and "sys_fcntl64".  They are obtained from Linux Kernel source.  */
+  arm_linux_record_tdep.fcntl_F_GETLK = 5;
+  arm_linux_record_tdep.fcntl_F_GETLK64 = 12;
+  arm_linux_record_tdep.fcntl_F_SETLK64 = 13;
+  arm_linux_record_tdep.fcntl_F_SETLKW64 = 14;
+
+  arm_linux_record_tdep.arg1 = ARM_A1_REGNUM + 1;
+  arm_linux_record_tdep.arg2 = ARM_A1_REGNUM + 2;
+  arm_linux_record_tdep.arg3 = ARM_A1_REGNUM + 3;
+  arm_linux_record_tdep.arg4 = ARM_A1_REGNUM + 3;
 }
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index ecaced7..8fc223d 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -11936,27 +11936,38 @@  arm_record_coproc_data_proc (insn_decode_record *arm_insn_r)
   struct gdbarch_tdep *tdep = gdbarch_tdep (arm_insn_r->gdbarch);
   struct regcache *reg_cache = arm_insn_r->regcache;
   uint32_t ret = 0; /* function return value: -1:record failure ;  0:success  */
-
-  /* Handle SWI insn; system call would be handled over here.  */
+  ULONGEST u_regval = 0;
 
   arm_insn_r->opcode = bits (arm_insn_r->arm_insn, 24, 27);
+
+  /* Handle arm SWI/SVC system call instructions.  */
   if (15 == arm_insn_r->opcode)
-  {
-    /* Handle arm syscall insn.  */
-    if (tdep->arm_swi_record != NULL)
-      {
-        ret = tdep->arm_swi_record(reg_cache);
-      }
-    else
-      {
-        printf_unfiltered (_("no syscall record support\n"));
-        ret = -1;
-      }
-  }
+    {
+      if (tdep->arm_syscall_record != NULL)
+        {
+          ULONGEST svc_operand, svc_number;
+
+          svc_operand = (0x00ffffff & arm_insn_r->arm_insn);
+
+          if (svc_operand)  /* OABI.  */
+            svc_number = svc_operand - 0x900000;
+          else /* EABI.  */
+            regcache_raw_read_unsigned (reg_cache, 7, &svc_number);
+
+          ret = tdep->arm_syscall_record (reg_cache, svc_number);
+        }
+      else
+        {
+          printf_unfiltered (_("no syscall record support\n"));
+          ret = -1;
+        }
+    }
+  else
+    {
+      arm_record_unsupported_insn(arm_insn_r);
+      ret = -1;
+    }
 
-  printf_unfiltered (_("Process record does not support instruction "
-                        "0x%0x at address %s.\n"),arm_insn_r->arm_insn,
-                        paddress (arm_insn_r->gdbarch, arm_insn_r->this_addr));
   return ret;
 }
 
@@ -12361,9 +12372,10 @@  thumb_record_ldm_stm_swi (insn_decode_record *thumb_insn_r)
   else if (0x1F == opcode1)
     {
         /* Handle arm syscall insn.  */
-        if (tdep->arm_swi_record != NULL)
+        if (tdep->arm_syscall_record != NULL)
           {
-            ret = tdep->arm_swi_record(reg_cache);
+            regcache_raw_read_unsigned (reg_cache, 7, &u_regval);
+            ret = tdep->arm_syscall_record (reg_cache, u_regval);
           }
         else
           {
diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h
index a1a2be5..b584a43 100644
--- a/gdb/arm-tdep.h
+++ b/gdb/arm-tdep.h
@@ -205,8 +205,8 @@  struct gdbarch_tdep
      instruction.  */
   CORE_ADDR (*syscall_next_pc) (struct frame_info *frame);
 
-   /* Parse swi insn args, sycall record.  */
-  int (*arm_swi_record) (struct regcache *regcache);
+   /* syscall record.  */
+  int (*arm_syscall_record) (struct regcache *regcache, unsigned long svc_number);
 };
 
 /* Structures used for displaced stepping.  */