diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 00eee92d07..4ebcfc5c74 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,7 +1,13 @@ +2009-02-12 Jan Kratochvil + + PR fortran/9806 + * dwarf2read.c (process_die , read_module) + (scan_partial_symbols , add_partial_module): New. + 2009-02-11 Pierre Muller * dwarf2read.c (read_base_type): Set code to TYPE_CODE_CHAR - for DW_ATE_signed_char and DW_ATE_unisgned_char + for DW_ATE_signed_char and DW_ATE_unsigned_char for pascal language. 2009-02-11 Jim Meyering diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 988c4e5076..55868dae0d 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -774,6 +774,10 @@ static void add_partial_namespace (struct partial_die_info *pdi, CORE_ADDR *lowpc, CORE_ADDR *highpc, int need_pc, struct dwarf2_cu *cu); +static void add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc, + CORE_ADDR *highpc, int need_pc, + struct dwarf2_cu *cu); + static void add_partial_enumeration (struct partial_die_info *enum_pdi, struct dwarf2_cu *cu); @@ -956,6 +960,8 @@ static void read_common_block (struct die_info *, struct dwarf2_cu *); static void read_namespace (struct die_info *die, struct dwarf2_cu *); +static void read_module (struct die_info *die, struct dwarf2_cu *cu); + static const char *namespace_name (struct die_info *die, int *is_anonymous, struct dwarf2_cu *); @@ -1857,6 +1863,9 @@ scan_partial_symbols (struct partial_die_info *first_die, CORE_ADDR *lowpc, case DW_TAG_namespace: add_partial_namespace (pdi, lowpc, highpc, need_pc, cu); break; + case DW_TAG_module: + add_partial_module (pdi, lowpc, highpc, need_pc, cu); + break; default: break; } @@ -2176,6 +2185,20 @@ add_partial_namespace (struct partial_die_info *pdi, scan_partial_symbols (pdi->die_child, lowpc, highpc, need_pc, cu); } +/* Read a partial die corresponding to a Fortran module. */ + +static void +add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc, + CORE_ADDR *highpc, int need_pc, struct dwarf2_cu *cu) +{ + /* Now scan partial symbols in that module. + + FIXME: Support the separate Fortran module namespaces. */ + + if (pdi->has_children) + scan_partial_symbols (pdi->die_child, lowpc, highpc, need_pc, cu); +} + /* Read a partial die corresponding to a subprogram and create a partial symbol for that subprogram. When the CU language allows it, this routine also defines a partial symbol for each nested subprogram @@ -2839,6 +2862,9 @@ process_die (struct die_info *die, struct dwarf2_cu *cu) processing_has_namespace_info = 1; read_namespace (die, cu); break; + case DW_TAG_module: + read_module (die, cu); + break; case DW_TAG_imported_declaration: case DW_TAG_imported_module: /* FIXME: carlton/2002-10-16: Eventually, we should use the @@ -4748,6 +4774,22 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu) } } +/* Read a Fortran module. */ + +static void +read_module (struct die_info *die, struct dwarf2_cu *cu) +{ + struct die_info *child_die = die->child; + + /* FIXME: Support the separate Fortran module namespaces. */ + + while (child_die && child_die->tag) + { + process_die (child_die, cu); + child_die = sibling_die (child_die); + } +} + /* Return the name of the namespace represented by DIE. Set *IS_ANONYMOUS to tell whether or not the namespace is an anonymous namespace. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d51a49a98b..93971001c5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-12 Jan Kratochvil + + PR fortran/9806 + * gdb.fortran/module.exp, gdb.fortran/module.f90: New. + 2009-02-06 Paul Pluzhnikov * gdb.cp/pr9594.cc: Prevent GCC from optimizing 'a' out. diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp new file mode 100644 index 0000000000..342ccee923 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -0,0 +1,35 @@ +# Copyright 2009 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 . + +set testfile "module" +set srcfile ${testfile}.f90 +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } { + untested "Couldn't compile ${srcfile}" + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if ![runto MAIN__] then { + perror "couldn't run to breakpoint MAIN__" + continue +} + +gdb_test "print i" " = 42" diff --git a/gdb/testsuite/gdb.fortran/module.f90 b/gdb/testsuite/gdb.fortran/module.f90 new file mode 100644 index 0000000000..501ccc82c1 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/module.f90 @@ -0,0 +1,22 @@ +! Copyright 2009 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 . + +module mod + integer :: i = 42 +end module mod + + use mod + print *, i +end