From patchwork Sat Oct 17 21:41:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marcin_Ko=C5=9Bcielnicki?= X-Patchwork-Id: 9212 Received: (qmail 59631 invoked by alias); 17 Oct 2015 21:41:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 59543 invoked by uid 89); 17 Oct 2015 21:41:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: xyzzy.0x04.net Received: from xyzzy.0x04.net (HELO xyzzy.0x04.net) (109.74.193.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 17 Oct 2015 21:41:46 +0000 Received: from hogfather.0x04.net (89-65-84-110.dynamic.chello.pl [89.65.84.110]) by xyzzy.0x04.net (Postfix) with ESMTPS id 147213FF2D for ; Sat, 17 Oct 2015 23:41:56 +0200 (CEST) Received: by hogfather.0x04.net (Postfix, from userid 1000) id 91AFC580244; Sat, 17 Oct 2015 23:41:27 +0200 (CEST) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: gdb-patches@sourceware.org Cc: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH 11/11] gdb/linux-record: Fix struct sizes for x32 + aarch64. Date: Sat, 17 Oct 2015 23:41:21 +0200 Message-Id: <1445118081-10908-12-git-send-email-koriakin@0x04.net> In-Reply-To: <1445118081-10908-1-git-send-email-koriakin@0x04.net> References: <1445118081-10908-1-git-send-email-koriakin@0x04.net> While x32 syscall interface is mostly shared with x86_64, some syscalls are truly 32-bit. Correct sizes accordingly. Also, size of struct termios is 36 bytes in syscall interface, 60 in glibc. Correct that mistake (also made on aarch64). --- gdb/aarch64-linux-tdep.c | 2 +- gdb/amd64-linux-tdep.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index a1dcd5b..aa35196 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -1053,7 +1053,7 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) aarch64_linux_record_tdep.size_epoll_event = 12; aarch64_linux_record_tdep.size_itimerspec = 32; aarch64_linux_record_tdep.size_mq_attr = 64; - aarch64_linux_record_tdep.size_termios = 60; + aarch64_linux_record_tdep.size_termios = 36; aarch64_linux_record_tdep.size_termios2 = 44; aarch64_linux_record_tdep.size_pid_t = 4; aarch64_linux_record_tdep.size_winsize = 8; diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 829d9b7..ee21635 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -1950,7 +1950,7 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) amd64_linux_record_tdep.size_epoll_event = 12; amd64_linux_record_tdep.size_itimerspec = 32; amd64_linux_record_tdep.size_mq_attr = 64; - amd64_linux_record_tdep.size_termios = 60; + amd64_linux_record_tdep.size_termios = 36; amd64_linux_record_tdep.size_termios2 = 44; amd64_linux_record_tdep.size_pid_t = 4; amd64_linux_record_tdep.size_winsize = 8; @@ -2133,7 +2133,7 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT; amd64_x32_linux_record_tdep.size_ulong = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT; - amd64_x32_linux_record_tdep.size_msghdr = 56; + amd64_x32_linux_record_tdep.size_msghdr = 28; amd64_x32_linux_record_tdep.size_itimerval = 32; amd64_x32_linux_record_tdep.size_stat = 144; amd64_x32_linux_record_tdep.size_old_utsname = 325; @@ -2154,7 +2154,7 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) amd64_x32_linux_record_tdep.size_sigset_t = 8; amd64_x32_linux_record_tdep.size_siginfo_t = 128; amd64_x32_linux_record_tdep.size_cap_user_data_t = 8; - amd64_x32_linux_record_tdep.size_stack_t = 24; + amd64_x32_linux_record_tdep.size_stack_t = 12; amd64_x32_linux_record_tdep.size_off_t = 8; amd64_x32_linux_record_tdep.size_stat64 = 144; amd64_x32_linux_record_tdep.size_gid_t = 4; @@ -2167,15 +2167,15 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) amd64_x32_linux_record_tdep.size_epoll_event = 12; amd64_x32_linux_record_tdep.size_itimerspec = 32; amd64_x32_linux_record_tdep.size_mq_attr = 64; - amd64_x32_linux_record_tdep.size_termios = 60; + amd64_x32_linux_record_tdep.size_termios = 36; amd64_x32_linux_record_tdep.size_termios2 = 44; amd64_x32_linux_record_tdep.size_pid_t = 4; amd64_x32_linux_record_tdep.size_winsize = 8; amd64_x32_linux_record_tdep.size_serial_struct = 72; amd64_x32_linux_record_tdep.size_serial_icounter_struct = 80; amd64_x32_linux_record_tdep.size_hayes_esp_config = 12; - amd64_x32_linux_record_tdep.size_size_t = 8; - amd64_x32_linux_record_tdep.size_iovec = 16; + amd64_x32_linux_record_tdep.size_size_t = 4; + amd64_x32_linux_record_tdep.size_iovec = 8; amd64_x32_linux_record_tdep.size_time_t = 8; /* These values are the second argument of system call "sys_fcntl"