From: "Marcin Kościelnicki" <koriakin@0x04.net>
To: palves@redhat.com, qiyaoltc@gmail.com
Cc: gdb-patches@sourceware.org, "Marcin Kościelnicki" <koriakin@0x04.net>
Subject: [PATCH v2 05/13] gdb/linux-record: Fix readdir and getdents handling
Date: Thu, 22 Oct 2015 15:06:00 -0000 [thread overview]
Message-ID: <1445521166-14492-5-git-send-email-koriakin@0x04.net> (raw)
In-Reply-To: <1445521166-14492-1-git-send-email-koriakin@0x04.net>
getdents buffer size is given in bytes, not dirent entries (which have
variable size anyway). We don't need size_dirent and size_dirent64 for
this reason.
readdir, on the other hand, needs size of old_linux_dirent, which is
a somewhat different structure. Accordingly, rename size_dirent
to size_old_dirent.
gdb/ChangeLog:
* aarch64-linux-tdep.c (aarch64_linux_init_abi): Remove
size_dirent{,64}, add size_old_dirent.
* amd64-linux-tdep.c (amd64_linux_init_abi): Remove size_dirent{,64},
add size_old_dirent.
(amd64_x32_linux_init_abi): Remove size_dirent{,64}, add
size_old_dirent.
* arm-linux-tdep.c (arm_linux_init_abi): Remove size_dirent{,64},
add size_old_dirent.
* i386-linux-tdep.c (i386_linux_init_abi): Remove size_dirent{,64},
add size_old_dirent.
* linux-record.c (record_linux_system_call): Fix handling of readdir
and getdents{,64}.
* linux-record.h (struct linux_record_tdep): Remove size_dirent{,64},
add size_old_dirent.
* ppc-linux-tdep.c (ppc_init_linux_record_tdep): Remove
size_dirent{,64}, add size_old_dirent.
---
gdb/ChangeLog | 19 +++++++++++++++++++
gdb/aarch64-linux-tdep.c | 3 +--
gdb/amd64-linux-tdep.c | 8 ++++----
gdb/arm-linux-tdep.c | 3 +--
gdb/i386-linux-tdep.c | 3 +--
gdb/linux-record.c | 19 +++----------------
gdb/linux-record.h | 3 +--
gdb/ppc-linux-tdep.c | 6 ++----
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e3e446c..9e128a5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,24 @@
2015-10-22 Marcin Kościelnicki <koriakin@0x04.net>
+ * aarch64-linux-tdep.c (aarch64_linux_init_abi): Remove
+ size_dirent{,64}, add size_old_dirent.
+ * amd64-linux-tdep.c (amd64_linux_init_abi): Remove size_dirent{,64},
+ add size_old_dirent.
+ (amd64_x32_linux_init_abi): Remove size_dirent{,64}, add
+ size_old_dirent.
+ * arm-linux-tdep.c (arm_linux_init_abi): Remove size_dirent{,64},
+ add size_old_dirent.
+ * i386-linux-tdep.c (i386_linux_init_abi): Remove size_dirent{,64},
+ add size_old_dirent.
+ * linux-record.c (record_linux_system_call): Fix handling of readdir
+ and getdents{,64}.
+ * linux-record.h (struct linux_record_tdep): Remove size_dirent{,64},
+ add size_old_dirent.
+ * ppc-linux-tdep.c (ppc_init_linux_record_tdep): Remove
+ size_dirent{,64}, add size_old_dirent.
+
+2015-10-22 Marcin Kościelnicki <koriakin@0x04.net>
+
* aarch64-linux-tdep.c (aarch64_linux_init_abi): Fix size_sigaction,
size_sigset_t, size_old_sigaction, size_old_sigset_t.
* amd64-linux-tdep.c (amd64_linux_init_abi): Fix size_sigaction,
diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index 57cb973..0a3fbb3 100644
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -1009,8 +1009,7 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
aarch64_linux_record_tdep.size_old_gid_t = 2;
aarch64_linux_record_tdep.size_old_uid_t = 2;
aarch64_linux_record_tdep.size_fd_set = 128;
- aarch64_linux_record_tdep.size_dirent = 280;
- aarch64_linux_record_tdep.size_dirent64 = 280;
+ aarch64_linux_record_tdep.size_old_dirent = 280;
aarch64_linux_record_tdep.size_statfs = 120;
aarch64_linux_record_tdep.size_statfs64 = 120;
aarch64_linux_record_tdep.size_sockaddr = 16;
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 3bca3c8..0b068c3 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -1905,8 +1905,8 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
but sys_getresuid. */
amd64_linux_record_tdep.size_old_uid_t = 2;
amd64_linux_record_tdep.size_fd_set = 128;
- amd64_linux_record_tdep.size_dirent = 280;
- amd64_linux_record_tdep.size_dirent64 = 280;
+ /* ADM64 doesn't need this size because it doesn't have sys_readdir. */
+ amd64_linux_record_tdep.size_old_dirent = 280;
amd64_linux_record_tdep.size_statfs = 120;
amd64_linux_record_tdep.size_statfs64 = 120;
amd64_linux_record_tdep.size_sockaddr = 16;
@@ -2121,8 +2121,8 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
but sys_getresuid. */
amd64_x32_linux_record_tdep.size_old_uid_t = 2;
amd64_x32_linux_record_tdep.size_fd_set = 128;
- amd64_x32_linux_record_tdep.size_dirent = 280;
- amd64_x32_linux_record_tdep.size_dirent64 = 280;
+ /* ADM64 doesn't need this size because it doesn't have sys_readdir. */
+ amd64_x32_linux_record_tdep.size_old_dirent = 268;
amd64_x32_linux_record_tdep.size_statfs = 120;
amd64_x32_linux_record_tdep.size_statfs64 = 120;
amd64_x32_linux_record_tdep.size_sockaddr = 16;
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 88d818d..a820e74 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -1496,8 +1496,7 @@ arm_linux_init_abi (struct gdbarch_info info,
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_old_dirent = 268;
arm_linux_record_tdep.size_statfs = 64;
arm_linux_record_tdep.size_statfs64 = 84;
arm_linux_record_tdep.size_sockaddr = 16;
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 0bf2cdc..8847ad3 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -815,8 +815,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
i386_linux_record_tdep.size_old_gid_t = 2;
i386_linux_record_tdep.size_old_uid_t = 2;
i386_linux_record_tdep.size_fd_set = 128;
- i386_linux_record_tdep.size_dirent = 268;
- i386_linux_record_tdep.size_dirent64 = 276;
+ i386_linux_record_tdep.size_old_dirent = 268;
i386_linux_record_tdep.size_statfs = 64;
i386_linux_record_tdep.size_statfs64 = 84;
i386_linux_record_tdep.size_sockaddr = 16;
diff --git a/gdb/linux-record.c b/gdb/linux-record.c
index d1e02f4..e950e8d 100644
--- a/gdb/linux-record.c
+++ b/gdb/linux-record.c
@@ -689,7 +689,7 @@ record_linux_system_call (enum gdb_syscall syscall,
case gdb_old_readdir:
regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest);
if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest,
- tdep->size_dirent))
+ tdep->size_old_dirent))
return -1;
break;
@@ -1344,14 +1344,14 @@ Do you want to stop the program?"),
break;
case gdb_sys_getdents:
+ case gdb_sys_getdents64:
{
ULONGEST count;
regcache_raw_read_unsigned (regcache, tdep->arg2,
&tmpulongest);
regcache_raw_read_unsigned (regcache, tdep->arg3, &count);
- if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest,
- tdep->size_dirent * count))
+ if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest, count))
return -1;
}
break;
@@ -1745,19 +1745,6 @@ Do you want to stop the program?"),
case gdb_sys_madvise:
break;
- case gdb_sys_getdents64:
- {
- ULONGEST count;
-
- regcache_raw_read_unsigned (regcache, tdep->arg2,
- &tmpulongest);
- regcache_raw_read_unsigned (regcache, tdep->arg3, &count);
- if (record_full_arch_list_add_mem ((CORE_ADDR) tmpulongest,
- tdep->size_dirent64 * count))
- return -1;
- }
- break;
-
case gdb_sys_fcntl64:
regcache_raw_read_unsigned (regcache, tdep->arg2, &tmpulongest);
if (tmpulongest == tdep->fcntl_F_GETLK64)
diff --git a/gdb/linux-record.h b/gdb/linux-record.h
index 839bd31..9af0bdb 100644
--- a/gdb/linux-record.h
+++ b/gdb/linux-record.h
@@ -39,8 +39,7 @@ struct linux_record_tdep
int size_old_gid_t;
int size_old_uid_t;
int size_fd_set;
- int size_dirent;
- int size_dirent64;
+ int size_old_dirent;
int size_statfs;
int size_statfs64;
int size_sockaddr;
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index 896f410..cf71cf3 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -1432,8 +1432,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
record_tdep->size_old_gid_t = 4;
record_tdep->size_old_uid_t = 4;
record_tdep->size_fd_set = 128;
- record_tdep->size_dirent = 280;
- record_tdep->size_dirent64 = 280;
+ record_tdep->size_old_dirent = 280;
record_tdep->size_statfs = 120;
record_tdep->size_statfs64 = 120;
record_tdep->size_sockaddr = 16;
@@ -1499,8 +1498,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep,
record_tdep->size_old_gid_t = 4;
record_tdep->size_old_uid_t = 4;
record_tdep->size_fd_set = 128;
- record_tdep->size_dirent = 268;
- record_tdep->size_dirent64 = 280;
+ record_tdep->size_old_dirent = 268;
record_tdep->size_statfs = 64;
record_tdep->size_statfs64 = 88;
record_tdep->size_sockaddr = 16;
--
2.6.1
next prev parent reply other threads:[~2015-10-22 13:45 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-17 21:41 gdb/linux-record fixes Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 08/11] gdb/linux-record: Fix newfstatat handling Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 09/11] gdb/linux-record: Fix old_select syscall handling Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 06/11] gdb/linux-record: Support time, waitpid, pipe syscalls Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 03/11] gdb/linux-record: Fix sizes of sigaction and sigset_t Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 07/11] gdb/linux-record: Fix [sg]etgroups16 syscall Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 04/11] gdb/linux-record: Fix readdir and getdents handling Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 01/11] gdb/linux-record: Remove size_siginfo Marcin Kościelnicki
2015-10-17 21:41 ` [PATCH 11/11] gdb/linux-record: Fix struct sizes for x32 + aarch64 Marcin Kościelnicki
2015-10-17 21:49 ` [PATCH 02/11] gdb/linux-record: Fix size_[ug]id values Marcin Kościelnicki
2015-10-17 21:49 ` [PATCH 10/11] gdb/linux-record: TASK_COMM_LEN is 16 on ppc too Marcin Kościelnicki
2015-10-17 21:49 ` [PATCH 05/11] gdb/linux-record: Fix msghdr parsing on 64-bit targets Marcin Kościelnicki
2015-10-19 15:37 ` gdb/linux-record fixes Pedro Alves
2015-10-19 17:18 ` Marcin Kościelnicki
2015-10-20 11:07 ` Pedro Alves
2015-10-20 11:16 ` Marcin Kościelnicki
2015-10-22 13:39 ` Marcin Kościelnicki
2015-10-22 13:39 ` [PATCH v2 01/13] gdb/linux-record: Add testcases for a few syscalls Marcin Kościelnicki
2015-10-22 13:43 ` [PATCH v2 11/13] gdb/linux-record: TASK_COMM_LEN is 16 on ppc too Marcin Kościelnicki
2015-10-22 13:45 ` [PATCH v2 12/13] gdb/linux-record: Fix size_termios for x32, amd64, aarch64 Marcin Kościelnicki
2015-10-22 13:45 ` [PATCH v2 13/13] gdb/linux-record: Fix struct sizes for x32 Marcin Kościelnicki
2015-10-22 13:45 ` [PATCH v2 03/13] gdb/linux-record: Fix size_[ug]id values Marcin Kościelnicki
2015-10-22 13:49 ` [PATCH v2 10/13] gdb/linux-record: Fix old_select syscall handling Marcin Kościelnicki
2015-10-22 13:51 ` [PATCH v2 06/13] gdb/linux-record: Fix msghdr parsing on 64-bit targets Marcin Kościelnicki
2015-10-22 13:51 ` [PATCH v2 04/13] gdb/linux-record: Fix sizes of sigaction and sigset_t Marcin Kościelnicki
2015-10-22 13:55 ` [PATCH v2 07/13] gdb/linux-record: Support time, waitpid, pipe syscalls Marcin Kościelnicki
2015-10-22 14:32 ` [PATCH v2 02/13] gdb/linux-record: Remove size_siginfo Marcin Kościelnicki
2015-10-22 15:01 ` [PATCH v2 08/13] gdb/linux-record: Fix [gs]etgroups16 syscall Marcin Kościelnicki
2015-10-22 15:06 ` Marcin Kościelnicki [this message]
2015-10-22 15:07 ` [PATCH v2 09/13] gdb/linux-record: Fix newfstatat handling Marcin Kościelnicki
2015-10-29 13:03 ` [PATCH v2 01/13] gdb/linux-record: Add testcases for a few syscalls Pedro Alves
2015-10-29 13:03 ` Marcin Kościelnicki
2015-10-30 14:52 ` Pedro Alves
2015-10-30 10:36 ` Marcin Kościelnicki
2015-10-30 15:05 ` Pedro Alves
2015-11-02 1:34 ` Marcin Kościelnicki
2015-11-02 16:40 ` Pedro Alves
2015-11-02 18:53 ` [PATCH] gdb/reverse: Fix continue_to_breakpoint in syscall testcases Marcin Kościelnicki
2015-11-02 19:17 ` Pedro Alves
2015-11-02 19:58 ` [PATCH 1/2] " Marcin Kościelnicki
2015-11-02 19:58 ` [PATCH 1/2] Obvious typo fix in gdb.reverse/readv-reverse.exp Marcin Kościelnicki
2015-11-02 20:00 ` Pedro Alves
2015-11-02 19:59 ` [PATCH 1/2] gdb/reverse: Fix continue_to_breakpoint in syscall testcases Pedro Alves
2015-10-30 10:37 ` [PATCH 01/13] gdb/record: Add testcases for a few syscalls Marcin Kościelnicki
2015-10-30 15:41 ` Pedro Alves
2015-10-30 15:55 ` [PATCH v4 " Marcin Kościelnicki
2015-10-31 18:59 ` Pedro Alves
2015-10-29 13:03 ` gdb/linux-record fixes Pedro Alves
2015-10-29 13:03 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445521166-14492-5-git-send-email-koriakin@0x04.net \
--to=koriakin@0x04.net \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
--cc=qiyaoltc@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox