[gdb/record] Make enum gdb_syscall value names consistent

In enum gdb_syscall, there are 3 entries that do not have the gdb_sys_ prefix
...
$ grep gdb_old_ gdb/linux-record.h
  gdb_old_select = 82,
  gdb_old_readdir = 89,
  gdb_old_mmap = 90,
...
like all the other entries:
...
  gdb_sys_restart_syscall = 0,
  gdb_sys_exit = 1,
  gdb_sys_fork = 2,
  gdb_sys_read = 3,
...

The three correspond to these entries in
arch/x86/entry/syscalls/syscall_32.tbl:
...
<number>  <abi>   <name>     <entry point>      [<compat entry point> [noreturn]]
82        i386    select     sys_old_select     compat_sys_old_select
89        i386    readdir    sys_old_readdir    compat_sys_old_readdir
90        i386    mmap       sys_old_mmap       compat_sys_ia32_mmap
...

As we can see, the enum uses the entry point name, but without the sys_
prefix.

There doesn't seem to be a good reason for this.

There's another enum value:
...
  gdb_sys_old_getrlimit = 76,
...
corresponding to:
...
76        i386    getrlimit  sys_old_getrlimit  compat_sys_old_getrlimit
...
where we do use the sys_ prefix.

Fix this by consistenly using the gdb_sys_ prefix in enum gdb_syscall.

No functional changes.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index ec68ade441737427621226e314d7937fdf5cd21a..c8256997c9718d433958676a932cc354448ce209 100644 (file)
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -2275,7 +2275,7 @@ aarch64_canonicalize_syscall (enum aarch64_syscall syscall_number)
       SYSCALL_MAP (clone);
       SYSCALL_MAP (execve);
 
-      SYSCALL_MAP_RENAME (mmap, gdb_old_mmap);
+      SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap);
 
       SYSCALL_MAP (fadvise64);
       SYSCALL_MAP (swapon);

diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 69e2054cfb6973d493308c0711bff70783407d54..a7868c35cd54f7458b7e07670e3222f95d63bade 100644 (file)
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -412,7 +412,7 @@ amd64_canonicalize_syscall (enum amd64_syscall syscall_number)
 
   case amd64_sys_mmap:
   case amd64_x32_sys_mmap:
-    return gdb_old_mmap;
+    return gdb_sys_old_mmap;
 
   case amd64_sys_mprotect:
   case amd64_x32_sys_mprotect:

diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 858705e40227396180eadbe2855d8df3286e18b6..53c8a05c59c7691ef3c880b5c91c6f10b08cef06 100644 (file)
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -1361,8 +1361,8 @@ arm_canonicalize_syscall (int syscall)
     case 86: return gdb_sys_uselib;
     case 87: return gdb_sys_swapon;
     case 88: return gdb_sys_reboot;
-    case 89: return gdb_old_readdir;
-    case 90: return gdb_old_mmap;
+    case 89: return gdb_sys_old_readdir;
+    case 90: return gdb_sys_old_mmap;
     case 91: return gdb_sys_munmap;
     case 92: return gdb_sys_truncate;
     case 93: return gdb_sys_ftruncate;

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 3fb1c1765e44d10bad36a3c9851bff58e8217678..2b7bd2b521fe1faaf77240fe419c17fa549228b8 100644 (file)
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -484,15 +484,15 @@ i386_canonicalize_syscall (int syscall)
       SYSCALL_MAP (settimeofday);
       SYSCALL_MAP_RENAME (getgroups, gdb_sys_getgroups16);
       SYSCALL_MAP_RENAME (setgroups, gdb_sys_setgroups16);
-      SYSCALL_MAP_RENAME (select, gdb_old_select);
+      SYSCALL_MAP_RENAME (select, gdb_sys_old_select);
       SYSCALL_MAP (symlink);
       SYSCALL_MAP_RENAME (oldlstat, gdb_sys_lstat);
       SYSCALL_MAP (readlink);
       SYSCALL_MAP (uselib);
       SYSCALL_MAP (swapon);
       SYSCALL_MAP (reboot);
-      SYSCALL_MAP_RENAME (readdir, gdb_old_readdir);
-      SYSCALL_MAP_RENAME (mmap, gdb_old_mmap);
+      SYSCALL_MAP_RENAME (readdir, gdb_sys_old_readdir);
+      SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap);
       SYSCALL_MAP (munmap);
       SYSCALL_MAP (truncate);
       SYSCALL_MAP (ftruncate);

diff --git a/gdb/linux-record.c b/gdb/linux-record.c
index 0b2709b30b2b9cba54ca0d3dc77884c20d07ae44..2f66337e8850653b7c82de6a3dd5ce8d39928759 100644 (file)
--- a/gdb/linux-record.c
+++ b/gdb/linux-record.c
@@ -609,7 +609,7 @@ record_linux_system_call (enum gdb_syscall syscall,
     case gdb_sys_setgroups16:
       break;
 
-    case gdb_old_select:
+    case gdb_sys_old_select:
       {
        unsigned long sz_sel_arg = tdep->size_long + tdep->size_pointer * 4;
        gdb_byte *a = (gdb_byte *) alloca (sz_sel_arg);
@@ -668,12 +668,12 @@ record_linux_system_call (enum gdb_syscall syscall,
        return 1;
       break;
 
-    case gdb_old_readdir:
+    case gdb_sys_old_readdir:
       if (record_mem_at_reg (regcache, tdep->arg2, tdep->size_old_dirent))
        return -1;
       break;
 
-    case gdb_old_mmap:
+    case gdb_sys_old_mmap:
       break;
 
     case gdb_sys_munmap:

diff --git a/gdb/linux-record.h b/gdb/linux-record.h
index 6d6ba07308994c943855bbc479fce1d5a07c31e8..6656106255126403009a6f066d27aa8e01c57785 100644 (file)
--- a/gdb/linux-record.h
+++ b/gdb/linux-record.h
@@ -266,15 +266,15 @@ enum gdb_syscall {
   gdb_sys_settimeofday = 79,
   gdb_sys_getgroups16 = 80,
   gdb_sys_setgroups16 = 81,
-  gdb_old_select = 82,
+  gdb_sys_old_select = 82,
   gdb_sys_symlink = 83,
   gdb_sys_lstat = 84,
   gdb_sys_readlink = 85,
   gdb_sys_uselib = 86,
   gdb_sys_swapon = 87,
   gdb_sys_reboot = 88,
-  gdb_old_readdir = 89,
-  gdb_old_mmap = 90,
+  gdb_sys_old_readdir = 89,
+  gdb_sys_old_mmap = 90,
   gdb_sys_munmap = 91,
   gdb_sys_truncate = 92,
   gdb_sys_ftruncate = 93,

diff --git a/gdb/loongarch-linux-tdep.c b/gdb/loongarch-linux-tdep.c
index 949327ddf1f2b5c46260ef0f67494b7e56170a96..031031b84ba9e85315f211d1cc15467f686c326e 100644 (file)
--- a/gdb/loongarch-linux-tdep.c
+++ b/gdb/loongarch-linux-tdep.c
@@ -812,7 +812,7 @@ loongarch_canonicalize_syscall (enum loongarch_syscall syscall_number)
       SYSCALL_MAP (clone);
       SYSCALL_MAP (execve);
 
-      SYSCALL_MAP_RENAME (mmap, gdb_old_mmap);
+      SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap);
 
       SYSCALL_MAP (fadvise64);
       SYSCALL_MAP (swapon);