From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29583 invoked by alias); 12 Apr 2010 13:22:43 -0000 Received: (qmail 29557 invoked by uid 22791); 12 Apr 2010 13:22:35 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM,TW_CP,TW_EG,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga12.intel.com (HELO azsmga102.ch.intel.com) (143.182.124.36) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Apr 2010 13:22:27 +0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 12 Apr 2010 06:22:24 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.107]) by azsmga001.ch.intel.com with ESMTP; 12 Apr 2010 06:22:25 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id 9BA88812386; Mon, 12 Apr 2010 06:22:25 -0700 (PDT) Date: Mon, 12 Apr 2010 13:22:00 -0000 From: "H.J. Lu" To: mark.kettenis@xs4all.nl Cc: GDB , jan.kratochvil@redhat.com Subject: Re: PATCH: PR corefiles/11467: amd64 gdb generates corrupted 32bit core file Message-ID: <20100412132225.GA5932@intel.com> Reply-To: "H.J. Lu" References: <20100410221943.GA9675@intel.com> <20100410222742.GA9901@intel.com> <20100411000053.GA12675@intel.com> <20100411205250.GA24158@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100411205250.GA24158@intel.com> User-Agent: Mutt/1.5.20 (2009-08-17) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-04/txt/msg00346.txt.bz2 On Sun, Apr 11, 2010 at 01:52:50PM -0700, H.J. Lu wrote: > Hi, > > Thanks for Mark's pointer. Solution is very simple. We just need to > make sure that we call the right fill_gregset for 32bit executable > on both Linux/x86-64 and Linux/i386. OK to install? > > Thanks. > > Small update to use tdep->gregset_reg_offset instead of i386_linux_gregset_reg_offset. OK to install? Thanks. H.J. --- gdb/ 2010-04-11 H.J. Lu PR corefiles/11467 PR corefiles/11467 * amd64-linux-nat.c (fill_gregset): Call i386_linux_fill_gregset for 32bit. * i386-linux-nat.c (fill_gregset): Call i386_linux_fill_gregset. * i386-linux-tdep.c (i386_linux_fill_gregset): New. * i386-linux-tdep.h (i386_linux_fill_gregset): Likewise. gdb/testsuite/ 2010-04-11 H.J. Lu PR corefiles/11467 * gdb.arch/amd64-gcore32.exp: New. * gdb.arch/gcore.c: Likewise. diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 9812610..336232e 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -141,7 +141,11 @@ void fill_gregset (const struct regcache *regcache, elf_gregset_t *gregsetp, int regnum) { - amd64_collect_native_gregset (regcache, gregsetp, regnum); + struct gdbarch *gdbarch = get_regcache_arch (regcache); + if (gdbarch_ptr_bit (gdbarch) == 32) + i386_linux_fill_gregset (regcache, gregsetp, regnum); + else + amd64_collect_native_gregset (regcache, gregsetp, regnum); } /* Transfering floating-point registers between GDB, inferiors and cores. */ diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index d559811..2ba120b 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -245,18 +245,7 @@ void fill_gregset (const struct regcache *regcache, elf_gregset_t *gregsetp, int regno) { - elf_greg_t *regp = (elf_greg_t *) gregsetp; - int i; - - for (i = 0; i < I386_NUM_GREGS; i++) - if (regno == -1 || regno == i) - regcache_raw_collect (regcache, i, regp + regmap[i]); - - if ((regno == -1 || regno == I386_LINUX_ORIG_EAX_REGNUM) - && I386_LINUX_ORIG_EAX_REGNUM - < gdbarch_num_regs (get_regcache_arch (regcache))) - regcache_raw_collect (regcache, I386_LINUX_ORIG_EAX_REGNUM, - regp + ORIG_EAX); + i386_linux_fill_gregset (regcache, gregsetp, regno); } #ifdef HAVE_PTRACE_GETREGS diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 72aced5..513e4c1 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -567,6 +567,34 @@ static int i386_linux_sc_reg_offset[] = 0 * 4 /* %gs */ }; +/* Fill register REGNUM (if it is a general-purpose register) in + *GREGS with the value in GDB's register array. If REGNUM is -1, + do this for all registers. */ + +void +i386_linux_fill_gregset (const struct regcache *regcache, + void *gregs, int regnum) +{ + char *regs = gregs; + struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int *reg_offset = tdep->gregset_reg_offset; + int num_regs = tdep->gregset_num_regs; + int i; + + gdb_assert (num_regs == gdbarch_num_regs (gdbarch)); + for (i = 0; i < num_regs; i++) + { + if (regnum == -1 || regnum == i) + { + int offset = reg_offset[i]; + + if (offset != -1) + regcache_raw_collect (regcache, i, regs + offset); + } + } +} + /* Get XSAVE extended state xcr0 from core dump. */ uint64_t diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h index 1228681..d1830b7 100644 --- a/gdb/i386-linux-tdep.h +++ b/gdb/i386-linux-tdep.h @@ -39,6 +39,11 @@ extern uint64_t i386_linux_core_read_xcr0 (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd); +/* Fill general-purpose register with the value in GDB's register + array. */ +extern void i386_linux_fill_gregset (const struct regcache *regcache, + void *gregs, int regnum); + /* Linux target description. */ extern struct target_desc *tdesc_i386_linux; extern struct target_desc *tdesc_i386_mmx_linux; diff --git a/gdb/testsuite/gdb.arch/amd64-gcore32.exp b/gdb/testsuite/gdb.arch/amd64-gcore32.exp new file mode 100644 index 0000000..83dad1e --- /dev/null +++ b/gdb/testsuite/gdb.arch/amd64-gcore32.exp @@ -0,0 +1,230 @@ +# Copyright 2010 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if $tracelevel then { + strace $tracelevel +} + +set prms_id 0 +set bug_id 0 + +if { ![istarget x86_64-*-linux* ] } { + verbose "Skipping amd64-linux 32bit gcore tests." + return +} + +set testfile "amd64-gcore32" +set srcfile gcore.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-m32"]] != "" } { + untested amd64-gcore32.exp + return -1 +} + +# Start with a fresh gdb. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +# Does this gdb support gcore? +send_gdb "help gcore\n" +gdb_expect { + -re "Undefined command: .gcore.*$gdb_prompt $" { + # gcore command not supported -- nothing to test here. + unsupported "gdb does not support gcore on this target" + return -1; + } + -re "Save a core file .*$gdb_prompt $" { + pass "help gcore" + } + -re ".*$gdb_prompt $" { + fail "help gcore" + } + timeout { + fail "help gcore (timeout)" + } +} + +if { ! [ runto_main ] } then { + untested amd64-gcore32.exp + return -1 +} + +proc capture_command_output { command prefix } { + global gdb_prompt + global expect_out + + set output_string "" + gdb_test_multiple "$command" "capture_command_output for $command" { + -re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" { + set output_string $expect_out(1,string) + } + } + return $output_string +} + +gdb_test "break terminal_func" "Breakpoint .* at .*${srcfile}, line .*" \ + "set breakpoint at terminal_func" + +gdb_test "continue" "Breakpoint .* terminal_func.*" \ + "continue to terminal_func" + +set print_prefix ".\[0123456789\]* = " + +set pre_corefile_backtrace [capture_command_output "backtrace" ""] +set pre_corefile_regs [capture_command_output "info registers" ""] +set pre_corefile_allregs [capture_command_output "info all-reg" ""] +set pre_corefile_static_array \ + [capture_command_output "print static_array" "$print_prefix"] +set pre_corefile_uninit_array \ + [capture_command_output "print un_initialized_array" "$print_prefix"] +set pre_corefile_heap_string \ + [capture_command_output "print heap_string" "$print_prefix"] +set pre_corefile_local_array \ + [capture_command_output "print array_func::local_array" "$print_prefix"] +set pre_corefile_extern_array \ + [capture_command_output "print extern_array" "$print_prefix"] + +set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test] + +set core_supported 0 +gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \ + "save a corefile" \ +{ + -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" { + pass "save a corefile" + global core_supported + set core_supported 1 + } + -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" { + unsupported "save a corefile" + global core_supported + set core_supported 0 + } +} + +if {!$core_supported} { + return -1 +} + +# Now restart gdb and load the corefile. +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +send_gdb "core ${objdir}/${subdir}/gcore.test\n" +gdb_expect { + -re ".* is not a core dump:.*$gdb_prompt $" { + fail "re-load generated corefile (bad file format)" + # No use proceeding from here. + return; + } + -re ".*: No such file or directory.*$gdb_prompt $" { + fail "re-load generated corefile (file not found)" + # No use proceeding from here. + return; + } + -re ".*Couldn't find .* registers in core file.*$gdb_prompt $" { + fail "re-load generated corefile (incomplete note section)" + } + -re "Core was generated by .*$gdb_prompt $" { + pass "re-load generated corefile" + } + -re ".*$gdb_prompt $" { + fail "re-load generated corefile" + } + timeout { + fail "re-load generated corefile (timeout)" + } +} + +send_gdb "where\n" +gdb_expect_list "where in corefile" ".*$gdb_prompt $" { + ".*\[\r\n\]+#0 .* terminal_func \\(\\) at " + ".*\[\r\n\]+#1 .* array_func \\(\\) at " + ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at " + ".*\[\r\n\]+#3 .* factorial_func \\(value=2\\) at " + ".*\[\r\n\]+#4 .* factorial_func \\(value=3\\) at " + ".*\[\r\n\]+#5 .* factorial_func \\(value=4\\) at " + ".*\[\r\n\]+#6 .* factorial_func \\(value=5\\) at " + ".*\[\r\n\]+#7 .* factorial_func \\(value=6\\) at " + ".*\[\r\n\]+#8 .* main \\(.*\\) at " +} + +set post_corefile_regs [capture_command_output "info registers" ""] +if ![string compare $pre_corefile_regs $post_corefile_regs] then { + pass "corefile restored general registers" +} else { + fail "corefile restored general registers" +} + +set post_corefile_allregs [capture_command_output "info all-reg" ""] +if ![string compare $pre_corefile_allregs $post_corefile_allregs] then { + pass "corefile restored all registers" +} else { + fail "corefile restored all registers" +} + +set post_corefile_extern_array \ + [capture_command_output "print extern_array" "$print_prefix"] +if ![string compare $pre_corefile_extern_array $post_corefile_extern_array] { + pass "corefile restored extern array" +} else { + fail "corefile restored extern array" +} + +set post_corefile_static_array \ + [capture_command_output "print static_array" "$print_prefix"] +if ![string compare $pre_corefile_static_array $post_corefile_static_array] { + pass "corefile restored static array" +} else { + fail "corefile restored static array" +} + +set post_corefile_uninit_array \ + [capture_command_output "print un_initialized_array" "$print_prefix"] +if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array] { + pass "corefile restored un-initialized array" +} else { + fail "corefile restored un-initialized array" +} + +set post_corefile_heap_string \ + [capture_command_output "print heap_string" "$print_prefix"] +if ![string compare $pre_corefile_heap_string $post_corefile_heap_string] { + pass "corefile restored heap array" +} else { + fail "corefile restored heap array" +} + +set post_corefile_local_array \ + [capture_command_output "print array_func::local_array" "$print_prefix"] +if ![string compare $pre_corefile_local_array $post_corefile_local_array] { + pass "corefile restored stack array" +} else { + fail "corefile restored stack array" +} + +set post_corefile_backtrace [capture_command_output "backtrace" ""] +if ![string compare $pre_corefile_backtrace $post_corefile_backtrace] { + pass "corefile restored backtrace" +} else { + fail "corefile restored backtrace" +} diff --git a/gdb/testsuite/gdb.arch/gcore.c b/gdb/testsuite/gdb.arch/gcore.c new file mode 100644 index 0000000..3eb10b2 --- /dev/null +++ b/gdb/testsuite/gdb.arch/gcore.c @@ -0,0 +1,70 @@ +/* Copyright 2002, 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* + * Test GDB's ability to save and reload a corefile. + */ + +#include +#include + +int extern_array[4] = {1, 2, 3, 4}; +static int static_array[4] = {5, 6, 7, 8}; +static int un_initialized_array[4]; +static char *heap_string; + +void +terminal_func () +{ + return; +} + +void +array_func () +{ + int local_array[4]; + int i; + + heap_string = (char *) malloc (80); + strcpy (heap_string, "I'm a little teapot, short and stout..."); + for (i = 0; i < 4; i++) + { + un_initialized_array[i] = extern_array[i] + 8; + local_array[i] = extern_array[i] + 12; + } + terminal_func (); +} + +#ifdef PROTOTYPES +int factorial_func (int value) +#else +int factorial_func (value) + int value; +#endif +{ + if (value > 1) { + value *= factorial_func (value - 1); + } + array_func (); + return (value); +} + +main() +{ + factorial_func (6); + return 0; +}