From 9655e94382ad0bbaea3c1e3ab0dc75b3d367541b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 1 Sep 2011 07:17:46 +0000 Subject: [PATCH] gdb/ Revert: 2010-05-21 Pierre Muller * dwarf2read.c (new_symbol): Handle DW_AT_variable_parameter attribute. gdb/testsuite/ * dw2-ifort-parameter-debug.S: New file. * dw2-ifort-parameter.c: New file. * dw2-ifort-parameter.exp: New file. --- gdb/ChangeLog | 7 ++ gdb/dwarf2read.c | 8 -- gdb/testsuite/ChangeLog | 6 + .../gdb.dwarf2/dw2-ifort-parameter-debug.S | 122 +++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c | 31 ++++++ gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp | 40 +++++++ 6 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter-debug.S create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6926dd0..accaca3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-09-01 Jan Kratochvil + + Revert: + 2010-05-21 Pierre Muller + * dwarf2read.c (new_symbol): Handle DW_AT_variable_parameter + attribute. + 2011-08-29 Yao Qi * solib-dsbt.c (bfd_lookup_symbol): Removed. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index f66c1d9..9e0a0ef 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -11578,14 +11578,6 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu, { dwarf2_const_value (attr, sym, cu); } - attr = dwarf2_attr (die, DW_AT_variable_parameter, cu); - if (attr && DW_UNSND (attr)) - { - struct type *ref_type; - - ref_type = lookup_reference_type (SYMBOL_TYPE (sym)); - SYMBOL_TYPE (sym) = ref_type; - } list_to_add = cu->list_in_scope; break; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cfa7227..464bef5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-09-01 Jan Kratochvil + + * dw2-ifort-parameter-debug.S: New file. + * dw2-ifort-parameter.c: New file. + * dw2-ifort-parameter.exp: New file. + 2011-08-26 Jan Kratochvil * gdb.base/commands.exp (error_clears_commands_left): New function. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter-debug.S b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter-debug.S new file mode 100644 index 0000000..104f28b --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter-debug.S @@ -0,0 +1,122 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + + .section .debug_info +.Lcu1_begin: + /* CU header */ + .4byte .Lcu1_end - .Lcu1_start /* Length of Compilation Unit */ +.Lcu1_start: + .2byte 2 /* DWARF Version */ + .4byte .Labbrev1_begin /* Offset into abbrev section */ + .byte 4 /* Pointer size */ + + /* CU die */ + .uleb128 1 /* Abbrev: DW_TAG_compile_unit */ + .ascii "file1.txt\0" /* DW_AT_name */ + .ascii "GNU C 3.3.3\0" /* DW_AT_producer */ + .byte 1 /* DW_AT_language (C) */ + .4byte func /* DW_AT_low_pc */ + .4byte main /* DW_AT_high_pc */ + + .uleb128 2 /* Abbrev: DW_TAG_subprogram */ + .byte 1 /* DW_AT_external */ + .ascii "func\0" /* DW_AT_name */ + .4byte func /* DW_AT_low_pc */ + .4byte main /* DW_AT_high_pc */ + + .uleb128 3 /* Abbrev: DW_TAG_formal_parameter */ + .ascii "param\0" /* DW_AT_name */ + .byte 1 /* DW_AT_variable_parameter */ + .4byte .Ltype_int - .Lcu1_begin /* DW_AT_type */ + .byte 2f - 1f /* DW_AT_location */ +1: .byte 3 /* DW_OP_addr */ + .4byte ptr /* */ + .byte 0x6 /* DW_OP_deref */ +2: + + .byte 0 /* End of children of func */ + +.Ltype_int: + .uleb128 4 /* Abbrev: DW_TAG_base_type */ + .ascii "int\0" /* DW_AT_name */ + .byte 4 /* DW_AT_byte_size */ + .byte 5 /* DW_AT_encoding */ + + .byte 0 /* End of children of CU */ +.Lcu1_end: + +/* Abbrev table */ + .section .debug_abbrev +.Labbrev1_begin: + .uleb128 1 /* Abbrev code */ + .uleb128 0x11 /* DW_TAG_compile_unit */ + .byte 1 /* has_children */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x25 /* DW_AT_producer */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x13 /* DW_AT_language */ + .uleb128 0xb /* DW_FORM_data1 */ + .uleb128 0x11 /* DW_AT_low_pc */ + .uleb128 0x1 /* DW_FORM_addr */ + .uleb128 0x12 /* DW_AT_high_pc */ + .uleb128 0x1 /* DW_FORM_addr */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + + .uleb128 2 /* Abbrev code */ + .uleb128 0x2e /* DW_TAG_subprogram */ + .byte 1 /* has_children */ + .uleb128 0x3f /* DW_AT_external */ + .uleb128 0xc /* DW_FORM_flag */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x11 /* DW_AT_low_pc */ + .uleb128 0x1 /* DW_FORM_addr */ + .uleb128 0x12 /* DW_AT_high_pc */ + .uleb128 0x1 /* DW_FORM_addr */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + + .uleb128 3 /* Abbrev code */ + .uleb128 0x05 /* DW_TAG_formal_parameter */ + .byte 0 /* has_children */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x4b /* DW_AT_variable_parameter */ + .uleb128 0xb /* DW_FORM_data1 */ + .uleb128 0x49 /* DW_AT_type */ + .uleb128 0x13 /* DW_FORM_ref4 */ + .uleb128 0x2 /* DW_AT_location */ + .uleb128 0xa /* DW_FORM_block1 */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + + .uleb128 4 /* Abbrev code */ + .uleb128 0x24 /* DW_TAG_base_type */ + .byte 0 /* has_children */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0xb /* DW_AT_byte_size */ + .uleb128 0xb /* DW_FORM_data1 */ + .uleb128 0x3e /* DW_AT_encoding */ + .uleb128 0xb /* DW_FORM_data1 */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c new file mode 100644 index 0000000..fd16d1e --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c @@ -0,0 +1,31 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + +int value = 0xdeadf00d; +int *ptr = &value; + +void +func (void) +{ +} + +int +main (void) +{ + func (); + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp new file mode 100644 index 0000000..7f2bcdd --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp @@ -0,0 +1,40 @@ +# 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 . + +# Verify DW_AT_variable_parameter does not modify the data structures meaning +# for GDB, as being used by iFort. + +# This test can only be run on targets which support DWARF-2 and use gas. +# For now pick a sampling of likely targets. +if {![istarget *-*-linux*] + && ![istarget *-*-gnu*] + && ![istarget *-*-elf*] + && ![istarget *-*-openbsd*] + && ![istarget arm-*-eabi*] + && ![istarget powerpc-*-eabi*]} { + return 0 +} + +set testfile "dw2-ifort-parameter" + +if { [prepare_for_testing ${testfile}.exp ${testfile} [list ${testfile}.c ${testfile}-debug.S] {nodebug}] } { + return -1 +} + +if ![runto func] { + return -1 +} + +gdb_test "p/x param" " = 0xdeadf00d" -- 2.7.4