OSDN Git Service

gdb/
authorJan Kratochvil <jan.kratochvil@redhat.com>
Thu, 26 Mar 2009 14:47:14 +0000 (14:47 +0000)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Thu, 26 Mar 2009 14:47:14 +0000 (14:47 +0000)
Recognize missing DW_AT_location as <value optimized out>.
* dwarf2read.c
(new_symbol <DW_TAG_variable> <!DW_AT_location> <!DW_AT_external>):
Call add_symbol_to_list.

gdb/testsuite/
* gdb.dwarf2/dw2-noloc-main.c: New file.
* gdb.dwarf2/dw2-noloc.S: New symbols matrix.
(.text): Remove.
(.data): New.
(DW_AT_stmt_list, .debug_line, DW_AT_frame_base): Remove.
(DW_AT_low_pc, DW_AT_high_pc): Reference `dw2-noloc-main.c'.
(DW_TAG_subprogram func_cu1, noloc): Remove.
(main): New.
* gdb.dwarf2/dw2-noloc.exp: Use prepare_for_testing, compile also
`dw2-noloc-main.c'.  Test the new DIEs from `dw2-noloc.S'.
(file_symbols): New procedure.

gdb/ChangeLog
gdb/dwarf2read.c
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.dwarf2/dw2-noloc-main.c [new file with mode: 0644]
gdb/testsuite/gdb.dwarf2/dw2-noloc.S
gdb/testsuite/gdb.dwarf2/dw2-noloc.exp

index 497e3a3..fd87425 100644 (file)
@@ -1,3 +1,10 @@
+2009-03-26  Joel Brobecker  <brobecker@adacore.com>
+
+       Recognize missing DW_AT_location as <value optimized out>.
+       * dwarf2read.c
+       (new_symbol <DW_TAG_variable> <!DW_AT_location> <!DW_AT_external>):
+       Call add_symbol_to_list.
+
 2009-03-25  Tom Tromey  <tromey@redhat.com>
 
        * gdbtypes.h (CHECK_TYPEDEF): Don't yield a value.
index cf8f458..9ec4efa 100644 (file)
@@ -7659,6 +7659,12 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
                  SYMBOL_CLASS (sym) = LOC_UNRESOLVED;
                  add_symbol_to_list (sym, &global_symbols);
                }
+             else if (!die_is_declaration (die, cu))
+               {
+                 /* Use the default LOC_OPTIMIZED_OUT class.  */
+                 gdb_assert (SYMBOL_CLASS (sym) == LOC_OPTIMIZED_OUT);
+                 add_symbol_to_list (sym, cu->list_in_scope);
+               }
            }
          break;
        case DW_TAG_formal_parameter:
index 6d94121..7f68b92 100644 (file)
@@ -1,3 +1,17 @@
+2009-03-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.dwarf2/dw2-noloc-main.c: New file.
+       * gdb.dwarf2/dw2-noloc.S: New symbols matrix.
+       (.text): Remove.
+       (.data): New.
+       (DW_AT_stmt_list, .debug_line, DW_AT_frame_base): Remove.
+       (DW_AT_low_pc, DW_AT_high_pc): Reference `dw2-noloc-main.c'.
+       (DW_TAG_subprogram func_cu1, noloc): Remove.
+       (main): New.
+       * gdb.dwarf2/dw2-noloc.exp: Use prepare_for_testing, compile also
+       `dw2-noloc-main.c'.  Test the new DIEs from `dw2-noloc.S'.
+       (file_symbols): New procedure.
+
 2009-03-25  Tom Tromey  <tromey@redhat.com>
 
        * gdb.base/charset.exp (valid_target_charset): New proc.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc-main.c b/gdb/testsuite/gdb.dwarf2/dw2-noloc-main.c
new file mode 100644 (file)
index 0000000..6c59f23
--- /dev/null
@@ -0,0 +1,28 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+asm (".globl cu_text_start");
+asm ("cu_text_start:");
+
+int
+main (void)
+{
+  return 0;
+}
+
+asm (".globl cu_text_end");
+asm ("cu_text_end:");
index 2ec632b..fdd90f3 100644 (file)
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-       .text
-.Lbegin_text1:
-       .globl func_cu1
-       .type func_cu1, %function
-func_cu1:
-.Lbegin_func_cu1:
-       .int 0
-.Lend_func_cu1:
-       .size func_cu1, .-func_cu1
-.Lend_text1:
+       .data
+
+       .globl  file_locaddr_resolvable
+file_locaddr_resolvable:
+       .globl  file_locempty_resolvable
+file_locempty_resolvable:
+       .globl  file_locno_resolvable
+file_locno_resolvable:
+       .globl  file_extern_locaddr_resolvable
+file_extern_locaddr_resolvable:
+       .globl  file_extern_locempty_resolvable
+file_extern_locempty_resolvable:
+       .globl  file_extern_locno_resolvable
+file_extern_locno_resolvable:
+       .globl  main_local_locaddr_resolvable
+main_local_locaddr_resolvable:
+       .globl  main_local_locempty_resolvable
+main_local_locempty_resolvable:
+       .globl  main_local_locno_resolvable
+main_local_locno_resolvable:
+       .globl  main_extern_locaddr_resolvable
+main_extern_locaddr_resolvable:
+       .globl  main_extern_locno_resolvable
+main_extern_locno_resolvable:
+       .globl  main_extern_locempty_resolvable
+main_extern_locempty_resolvable:
+
+resolvable:
+       .4byte  1234567890
 
 /* Debug information */
 
@@ -39,36 +58,169 @@ func_cu1:
 
        /* CU die */
        .uleb128 1                              /* Abbrev: DW_TAG_compile_unit */
-       .4byte  .Lline1_begin                   /* DW_AT_stmt_list */
-       .4byte  .Lend_text1                     /* DW_AT_high_pc */
-       .4byte  .Lbegin_text1                   /* DW_AT_low_pc */
+       .4byte  cu_text_end                     /* DW_AT_high_pc */
+       .4byte  cu_text_start                   /* DW_AT_low_pc */
        .ascii  "file1.txt\0"                   /* DW_AT_name */
        .ascii  "GNU C 3.3.3\0"                 /* DW_AT_producer */
        .byte   1                               /* DW_AT_language (C) */
 
-       /* func_cu1 */
-       .uleb128        2                       /* Abbrev: DW_TAG_subprogram */
-       .byte           1                       /* DW_AT_external */
-       .byte           1                       /* DW_AT_decl_file */
-       .byte           2                       /* DW_AT_decl_line */
-       .ascii          "func_cu1\0"            /* DW_AT_name */
-       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
-       .4byte          .Lbegin_func_cu1        /* DW_AT_low_pc */
-       .4byte          .Lend_func_cu1          /* DW_AT_high_pc */
-       .byte           1                       /* DW_AT_frame_base: length */
-       .byte           0x55                    /* DW_AT_frame_base: DW_OP_reg5 */
-
 .Ltype_int:
        .uleb128        3                       /* Abbrev: DW_TAG_base_type */
        .ascii          "int\0"                 /* DW_AT_name */
        .byte           4                       /* DW_AT_byte_size */
        .byte           5                       /* DW_AT_encoding */
 
-       .uleb128        4                       /* Abbrev: DW_TAG_variable */
-       .ascii          "noloc\0"               /* DW_AT_name */
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "file_locaddr_resolvable\0"     /* DW_AT_name */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "file_locaddr_unresolvable\0"   /* DW_AT_name */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "file_locempty_resolvable\0"    /* DW_AT_name */
+       .byte           0                       /* DW_AT_location */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "file_locempty_unresolvable\0"  /* DW_AT_name */
+       .byte           0                       /* DW_AT_location */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        5                       /* Abbrev: DW_TAG_variable (bare) */
+       .ascii          "file_locno_resolvable\0"       /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        5                       /* Abbrev: DW_TAG_variable (bare) */
+       .ascii          "file_locno_unresolvable\0"     /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "file_extern_locaddr_resolvable\0"      /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "file_extern_locaddr_unresolvable\0"    /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "file_extern_locempty_resolvable\0"     /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           0                       /* DW_AT_location */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "file_extern_locempty_unresolvable\0"   /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           0                       /* DW_AT_location */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        4                       /* Abbrev: DW_TAG_variable (extern) */
+       .ascii          "file_extern_locno_resolvable\0"        /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        4                       /* Abbrev: DW_TAG_variable (extern) */
+       .ascii          "file_extern_locno_unresolvable\0"      /* DW_AT_name */
        .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
        .byte           1                       /* DW_AT_external */
 
+       /* main */
+       .uleb128        6                       /* Abbrev: DW_TAG_subprogram */
+       .byte           1                       /* DW_AT_decl_file */
+       .byte           2                       /* DW_AT_decl_line */
+       .ascii          "main\0"                /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .4byte          cu_text_start           /* DW_AT_low_pc */
+       .4byte          cu_text_end             /* DW_AT_high_pc */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "main_local_locaddr_resolvable\0"       /* DW_AT_name */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "main_local_locaddr_unresolvable\0"     /* DW_AT_name */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "main_local_locempty_resolvable\0"      /* DW_AT_name */
+       .byte           0                       /* DW_AT_location */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        7                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "main_local_locempty_unresolvable\0"    /* DW_AT_name */
+       .byte           0                       /* DW_AT_location */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        5                       /* Abbrev: DW_TAG_variable (bare) */
+       .ascii          "main_local_locno_resolvable\0" /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        5                       /* Abbrev: DW_TAG_variable (bare) */
+       .ascii          "main_local_locno_unresolvable\0"       /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "main_extern_locaddr_resolvable\0"      /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "main_extern_locaddr_unresolvable\0"    /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+       .4byte          resolvable              /*   <addr> */
+2:     .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "main_extern_locempty_resolvable\0"     /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           0                       /* DW_AT_location */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        8                       /* Abbrev: DW_TAG_variable (location+extern) */
+       .ascii          "main_extern_locempty_unresolvable\0"   /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           0                       /* DW_AT_location */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        4                       /* Abbrev: DW_TAG_variable (extern) */
+       .ascii          "main_extern_locno_resolvable\0"        /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           1                       /* DW_AT_external */
+
+       .uleb128        4                       /* Abbrev: DW_TAG_variable (extern) */
+       .ascii          "main_extern_locno_unresolvable\0"      /* DW_AT_name */
+       .4byte          .Ltype_int-.Lcu1_begin  /* DW_AT_type */
+       .byte           1                       /* DW_AT_external */
+
+       .byte           0                       /* End of children of main */
+
        .byte           0                       /* End of children of CU */
 
 .Lcu1_end:
@@ -79,8 +231,6 @@ func_cu1:
        .uleb128        1                       /* Abbrev code */
        .uleb128        0x11                    /* DW_TAG_compile_unit */
        .byte           1                       /* has_children */
-       .uleb128        0x10                    /* DW_AT_stmt_list */
-       .uleb128        0x6                     /* DW_FORM_data4 */
        .uleb128        0x12                    /* DW_AT_high_pc */
        .uleb128        0x1                     /* DW_FORM_addr */
        .uleb128        0x11                    /* DW_AT_low_pc */
@@ -94,11 +244,43 @@ func_cu1:
        .byte           0x0                     /* Terminator */
        .byte           0x0                     /* Terminator */
 
-       .uleb128        2                       /* Abbrev code */
-       .uleb128        0x2e                    /* DW_TAG_subprogram */
+       .uleb128        3                       /* 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 */
+
+       .uleb128        4                       /* Abbrev code (extern) */
+       .uleb128        0x34                    /* DW_TAG_variable */
+       .byte           0                       /* has_children */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
        .uleb128        0x3f                    /* DW_AT_external */
        .uleb128        0xc                     /* DW_FORM_flag */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        5                       /* Abbrev code (bare) */
+       .uleb128        0x34                    /* DW_TAG_variable */
+       .byte           0                       /* has_children */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        6                       /* Abbrev code */
+       .uleb128        0x2e                    /* DW_TAG_subprogram */
+       .byte           1                       /* has_children */
        .uleb128        0x3a                    /* DW_AT_decl_file */
        .uleb128        0xb                     /* DW_FORM_data1 */
        .uleb128        0x3b                    /* DW_AT_decl_line */
@@ -111,30 +293,30 @@ func_cu1:
        .uleb128        0x1                     /* DW_FORM_addr */
        .uleb128        0x12                    /* DW_AT_high_pc */
        .uleb128        0x1                     /* DW_FORM_addr */
-       .uleb128        0x40                    /* DW_AT_frame_base */
-       .uleb128        0xa                     /* DW_FORM_block1 */
        .byte           0x0                     /* Terminator */
        .byte           0x0                     /* Terminator */
 
-       .uleb128        3                       /* Abbrev code */
-       .uleb128        0x24                    /* DW_TAG_base_type */
+       .uleb128        7                       /* Abbrev code (location) */
+       .uleb128        0x34                    /* DW_TAG_variable */
        .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 */
+       .uleb128        0x2                     /* DW_AT_location */
+       .uleb128        0xa                     /* DW_FORM_block1 */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
        .byte           0x0                     /* Terminator */
        .byte           0x0                     /* Terminator */
 
-       .uleb128        4                       /* Abbrev code */
+       .uleb128        8                       /* Abbrev code (location+extern) */
        .uleb128        0x34                    /* DW_TAG_variable */
        .byte           0                       /* has_children */
        .uleb128        0x3                     /* DW_AT_name */
        .uleb128        0x8                     /* DW_FORM_string */
        .uleb128        0x49                    /* DW_AT_type */
        .uleb128        0x13                    /* DW_FORM_ref4 */
+       .uleb128        0x2                     /* DW_AT_location */
+       .uleb128        0xa                     /* DW_FORM_block1 */
        .uleb128        0x3f                    /* DW_AT_external */
        .uleb128        0xc                     /* DW_FORM_flag */
        .byte           0x0                     /* Terminator */
@@ -142,69 +324,3 @@ func_cu1:
 
        .byte           0x0                     /* Terminator */
        .byte           0x0                     /* Terminator */
-
-/* Line table */
-       .section .debug_line
-.Lline1_begin:
-       .4byte          .Lline1_end - .Lline1_start     /* Initial length */
-.Lline1_start:
-       .2byte          2                       /* Version */
-       .4byte          .Lline1_lines - .Lline1_hdr     /* header_length */
-.Lline1_hdr:
-       .byte           1                       /* Minimum insn length */
-       .byte           1                       /* default_is_stmt */
-       .byte           1                       /* line_base */
-       .byte           1                       /* line_range */
-       .byte           0x10                    /* opcode_base */
-
-       /* Standard lengths */
-       .byte           0
-       .byte           1
-       .byte           1
-       .byte           1
-       .byte           1
-       .byte           0
-       .byte           0
-       .byte           0
-       .byte           1
-       .byte           0
-       .byte           0
-       .byte           1
-       .byte           0
-       .byte           0
-       .byte           0
-
-       /* Include directories */
-       .byte           0
-
-       /* File names */
-       .ascii          "file1.txt\0"
-       .uleb128        0
-       .uleb128        0
-       .uleb128        0
-
-       .byte           0
-
-.Lline1_lines:
-       .byte           0       /* DW_LNE_set_address */
-       .uleb128        5
-       .byte           2
-       .4byte          .Lbegin_func_cu1
-
-       .byte           3       /* DW_LNS_advance_line */
-       .sleb128        3       /* ... to 4 */
-
-       .byte           1       /* DW_LNS_copy */
-
-       .byte           1       /* DW_LNS_copy (second time as an end-of-prologue marker) */
-
-       .byte           0       /* DW_LNE_set_address */
-       .uleb128        5
-       .byte           2
-       .4byte          .Lend_func_cu1
-
-       .byte           0       /* DW_LNE_end_of_sequence */
-       .uleb128        1
-       .byte           1
-
-.Lline1_end:
index e16cbfd..3351caa 100644 (file)
@@ -24,25 +24,109 @@ if {![istarget *-*-linux*]
     return 0  
 }
 
-set testfile "dw2-noloc"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-if  { [gdb_compile "${srcdir}/${subdir}/main.c" "main.o" object {debug}] != "" } {
+if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
     return -1
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {nodebug}] != "" } {
-    return -1
+# Symbols have the form: {file,main}_loc{addr,empty,no}_{,un}resolvable
+# file: Symbol DIE is placed in DW_TAG_compile_unit.
+# main: Symbol DIE is placed in DW_TAG_subprogram.
+# locaddr: DW_AT_location is using DW_FORM_block DW_OP_addr <addr>.
+# locempty: DW_AT_location has zero DW_FORM_block size.
+# locno: DW_AT_location is not present.
+# resolvable: .symtab entry exists for this symbol name.
+# unresolvable: .symtab entry does not exist for this symbol name.
+# DW_AT_declaration is not present in any of these DIEs.
+
+proc file_symbols {type} {
+    global pf_prefix
+    set old_prefix $pf_prefix
+    lappend pf_prefix "$type:"
+
+    global gdb_prompt
+
+    gdb_test "print file_locaddr_resolvable" "= 1234567890"
+    gdb_test "ptype file_locaddr_resolvable" "type = int"
+
+    gdb_test "print file_locaddr_unresolvable" "= 1234567890"
+    gdb_test "ptype file_locaddr_unresolvable" "type = int"
+
+    gdb_test "print file_locempty_resolvable" "= <value optimized out>"
+    gdb_test "ptype file_locempty_resolvable" "type = int"
+
+    gdb_test "print file_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "ptype file_locempty_unresolvable" "type = int"
+
+    gdb_test "print file_locno_resolvable" "= <value optimized out>"
+    gdb_test "ptype file_locno_resolvable" "type = int"
+
+    gdb_test "print file_locno_unresolvable" "= <value optimized out>"
+    gdb_test "ptype file_locno_unresolvable" "type = int"
+
+    gdb_test "print file_extern_locaddr_resolvable" "= 1234567890"
+    gdb_test "ptype file_extern_locaddr_resolvable" "type = int"
+
+    gdb_test "print file_extern_locaddr_unresolvable" "= 1234567890"
+    gdb_test "ptype file_extern_locaddr_unresolvable" "type = int"
+
+    gdb_test "print file_extern_locempty_resolvable" "= <value optimized out>"
+    gdb_test "ptype file_extern_locempty_resolvable" "type = int"
+
+    gdb_test "print file_extern_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "ptype file_extern_locempty_unresolvable" "type = int"
+
+    gdb_test "print file_extern_locno_resolvable" "= 1234567890"
+    gdb_test "ptype file_extern_locno_resolvable" "type = int"
+
+    # `print file_extern_locno_unresolvable' currently prints
+    # Address of symbol "file_extern_locno_unresolvable" is unknown.
+    # As DW_AT_declaration is not present in this DIE
+    # it should print <value optimized out>.  As usefulness of such DIE is not
+    # clear its resolution is not being tested.
+
+    set pf_prefix $old_prefix
 }
 
-if  { [gdb_compile "${testfile}.o main.o" "${binfile}" executable {debug}] != "" } {
+file_symbols no-run
+
+if ![runto_main] {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+file_symbols in-main
+
+
+gdb_test "print main_local_locaddr_resolvable" "= 1234567890"
+gdb_test "ptype main_local_locaddr_resolvable" "type = int"
+
+gdb_test "print main_local_locaddr_unresolvable" "= 1234567890"
+gdb_test "ptype main_local_locaddr_unresolvable" "type = int"
+
+gdb_test "print main_local_locempty_resolvable" "= <value optimized out>"
+gdb_test "ptype main_local_locempty_resolvable" "type = int"
+
+gdb_test "print main_local_locempty_unresolvable" "= <value optimized out>"
+gdb_test "ptype main_local_locempty_unresolvable" "type = int"
+
+gdb_test "print main_local_locno_resolvable" "= <value optimized out>"
+gdb_test "ptype main_local_locno_resolvable" "type = int"
+
+gdb_test "print main_local_locno_unresolvable" "= <value optimized out>"
+gdb_test "ptype main_local_locno_unresolvable" "type = int"
+
+gdb_test "print main_extern_locaddr_resolvable" "= 1234567890"
+gdb_test "ptype main_extern_locaddr_resolvable" "type = int"
+
+gdb_test "print main_extern_locaddr_unresolvable" "= 1234567890"
+gdb_test "ptype main_extern_locaddr_unresolvable" "type = int"
+
+gdb_test "print main_extern_locempty_resolvable" "= <value optimized out>"
+gdb_test "ptype main_extern_locempty_resolvable" "type = int"
+
+gdb_test "print main_extern_locempty_unresolvable" "= <value optimized out>"
+gdb_test "ptype main_extern_locempty_unresolvable" "type = int"
+
+gdb_test "print main_extern_locno_resolvable" "= 1234567890"
+gdb_test "ptype main_extern_locno_resolvable" "type = int"
 
-gdb_test "print noloc" "Address of symbol \"noloc\" is unknown." "print noloc"
+# For `main_extern_locno_unresolvable' see `file_extern_locno_unresolvable'.