-# Copyright 2002, 2003, 2005, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright 2002-2018 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
# relocate.exp -- Expect script to test loading symbols from unrelocated
# object files.
-if $tracelevel then {
- strace $tracelevel
-}
-
-set testfile relocate
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}.o
+standard_testfile .c
+append binfile .o
remote_exec build "rm -f ${binfile}"
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
- untested relocate.exp
+ untested "failed to compile"
return -1
}
-proc get_var_address { var } {
- global gdb_prompt hex
-
- # Match output like:
- # $1 = (int *) 0x0
- # $5 = (int (*)()) 0
- # $6 = (int (*)()) 0x24 <function_bar>
-
- gdb_test_multiple "print &${var}" "get address of ${var}" {
- -re "\\\$\[0-9\]+ = \\(.*\\) (0|$hex)( <${var}>)?\[\r\n\]+${gdb_prompt} $" {
- pass "get address of ${var}"
- if { $expect_out(1,string) == "0" } {
- return "0x0"
- } else {
- return $expect_out(1,string)
- }
- }
- }
- return ""
-}
-
-
-
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
+#Check that invalid options are rejected.
+foreach x {"-raednow" "readnow" "foo" "-readnow s"} {
+ set word [lindex $x [expr [llength $x]-1]]
+ gdb_test "add-symbol-file ${binfile} 0 $x" \
+ "Unrecognized argument \"$word\"" \
+ "add-symbol-file: unknown option $word"
+}
+
+# Check that we can pass parameters using any position in the command
+# line.
+set test "add-symbol-file positionless -readnow"
+gdb_test_multiple "add-symbol-file -readnow $binfile 0x100 -s .bss 0x3" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\.bss_addr = 0x3\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+# When we use -s as the first argument, the section will be printed
+# first as well.
+set test "add-symbol-file positionless -s"
+gdb_test_multiple "add-symbol-file -s .bss 0x3 -readnow $binfile 0x100" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\.bss_addr = 0x3\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+set test "add-symbol-file positionless -s, no -readnow"
+gdb_test_multiple "add-symbol-file $binfile 0x100 -s .bss 0x3" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\.bss_addr = 0x3\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+# Check that passing "-s .text", no matter the position, always has
+# the same result.
+set test "add-symbol-file different -s .text, after file"
+gdb_test_multiple "add-symbol-file $binfile 0x100 -s .text 0x200" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\.text_addr = 0x200\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+set test "add-symbol-file different -s .text, before file"
+gdb_test_multiple "add-symbol-file -s .text 0x200 $binfile 0x100" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\.text_addr = 0x200\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+# Test that passing "--" disables option processing.
+gdb_test "add-symbol-file -- $binfile 0x100 -s .bss 0x3" \
+ "Unrecognized argument \"-s\"" \
+ "add-symbol-file with -- disables option processing"
+set test "add-symbol-file with -- disables option processing, non-existent filename"
+gdb_test_multiple "add-symbol-file -- -non-existent-file 0x100" $test {
+ -re "add symbol table from file \"-non-existent-file\" at\r\n\t\.text_addr = 0x100\r\n\\(y or n\\) " {
+ gdb_test "y" "-non-existent-file: No such file or directory\." $test
+ }
+}
+# Test that passing the wrong number of arguments to '-s' leads to an
+# error.
+gdb_test "add-symbol-file $binfile -s" \
+ "Missing section name after \"-s\"" \
+ "add-symbol-file with -s without section name"
+gdb_test "add-symbol-file $binfile -s .bss" \
+ "Missing section address after \"-s\"" \
+ "add-symbol-file with -s without section address"
+# Test that '-s' accepts section names with '-'
+set test "add-symbol-file with -s using section name starting with dash"
+gdb_test_multiple "add-symbol-file -s -section-name 0x200 $binfile 0x100" $test {
+ -re "add symbol table from file \"${binfile}\" at\r\n\t\.text_addr = 0x100\r\n\t\-section-name_addr = 0x200\r\n\\(y or n\\) " {
+ gdb_test "n" "Not confirmed\." $test
+ }
+}
+# Since we're here, might as well test the 'symbol-file' command and
+# if its arguments can also be passed at any position.
+gdb_test "symbol-file -readnow $binfile" \
+ "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+ "symbol-file with -readnow first"
+clean_restart
+gdb_test "symbol-file $binfile -readnow" \
+ "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+ "symbol-file with -readnow second"
+gdb_test "symbol-file -readnow" \
+ "no symbol file name was specified" \
+ "symbol-file without filename"
+gdb_test "symbol-file -- -non-existent-file" \
+ "-non-existent-file: No such file or directory\." \
+ "symbol-file with -- disables option processing"
+clean_restart
+gdb_test "symbol-file -readnow -- $binfile" \
+ "Reading symbols from ${binfile}\.\.\.expanding to full symbols\.\.\.done\." \
+ "symbol-file with -- and -readnow"
+gdb_test "symbol-file -- $binfile -readnow" \
+ "Unrecognized argument \"-readnow\"" \
+ "symbol-file with -- and -readnow, invalid option"
+
+clean_restart
+
+gdb_test "add-symbol-file ${binfile} 0 -s" \
+ "Missing section name after .-s." \
+ "add-symbol-file bare -s"
+gdb_test "add-symbol-file ${binfile} 0 -s .whatever" \
+ "Missing section address after .-s." \
+ "add-symbol-file missing address"
+
# Load the object file.
gdb_test "add-symbol-file ${binfile} 0" \
"Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "set \$offset = 0x10000" ""
+gdb_test_no_output "set \$offset = 0x10000"
# Load the object file.
gdb_test "add-symbol-file ${binfile} \$offset" \
pass "function foo has a different address"
}
+# Load the object using symbol-file with an offset and check that
+# all addresses are moved by that offset.
+
+set offset 0x10000
+clean_restart
+gdb_test "symbol-file -o $offset $binfile" \
+ "Reading symbols from ${binfile}\.\.\.done\." \
+ "symbol-file with offset"
+
+# Make sure the address of a static variable is moved by offset.
+set new_static_foo_addr [get_var_address static_foo]
+gdb_assert {${new_static_foo_addr} == ${static_foo_addr} + $offset} \
+ "static variable foo is moved by offset"
+
+# Make sure the address of a global variable is moved by offset.
+set new_global_foo_addr [get_var_address global_foo]
+gdb_assert {${new_global_foo_addr} == ${global_foo_addr} + $offset} \
+ "global variable foo is moved by offset"
+
+# Make sure the address of a function is moved by offset.
+set new_function_foo_addr [get_var_address function_foo]
+gdb_assert {${new_function_foo_addr} == ${function_foo_addr} + $offset} \
+ "function foo is moved by offset"
+
# Now try loading the object as an exec-file; we should be able to print
# the values of variables after we do this.