diff options
Diffstat (limited to 'gdb/testsuite/gdb.compile')
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-cplus-print.exp | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-cplus.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-ifunc.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-ops.exp | 622 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-print.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-setjmp.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile-tls.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile.exp | 14 |
8 files changed, 333 insertions, 328 deletions
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-print.exp b/gdb/testsuite/gdb.compile/compile-cplus-print.exp index d89bf61..e4e2782 100644 --- a/gdb/testsuite/gdb.compile/compile-cplus-print.exp +++ b/gdb/testsuite/gdb.compile/compile-cplus-print.exp @@ -22,7 +22,7 @@ require is_c_compiler_gcc require allow_compile_tests set options {} -if [test_compiler_info gcc*] { +if {[test_compiler_info gcc*]} { lappend options additional_flags=-g3 lappend options additional_flags=-std=gnu++11 lappend options c++ @@ -30,13 +30,14 @@ if [test_compiler_info gcc*] { set srcfilesoptions [list ${srcfile} ${options}] -if { [eval build_executable_from_specs ${testfile}.exp $testfile {$options} ${srcfilesoptions}] } { +if { [build_executable_from_specs $testfile.exp $testfile $options \ + {*}$srcfilesoptions] } { return -1 } clean_restart ${testfile} -if ![runto_main] { +if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-cplus.exp b/gdb/testsuite/gdb.compile/compile-cplus.exp index a0f5cf0..66ac76f 100644 --- a/gdb/testsuite/gdb.compile/compile-cplus.exp +++ b/gdb/testsuite/gdb.compile/compile-cplus.exp @@ -39,7 +39,9 @@ if { $srcfile3 != "" } { } set srcfile4options "nodebug c++" lappend srcfilesoptions $srcfile4 $srcfile4options -if { [eval build_executable_from_specs ${testfile}.exp $testfile {$options} ${srcfilesoptions}] } { + +if { [build_executable_from_specs $testfile.exp $testfile $options \ + {*}$srcfilesoptions] } { return -1 } @@ -52,7 +54,7 @@ clean_restart ${testfile} gdb_test_no_output "set language c++" \ "Set language to C++" -if ![runto_main] { +if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp index 068dce5..dbe84d5 100644 --- a/gdb/testsuite/gdb.compile/compile-ifunc.exp +++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp @@ -24,7 +24,7 @@ standard_testfile require is_c_compiler_gcc set flags "" -if [test_compiler_info gcc*] { +if {[test_compiler_info gcc*]} { set flags additional_flags=-Wno-attribute-alias } @@ -35,7 +35,7 @@ with_test_prefix "nodebug" { return -1 } - if ![runto_main] { + if {![runto_main]} { return -1 } @@ -65,7 +65,7 @@ with_test_prefix "debug" { return -1 } - if ![runto_main] { + if {![runto_main]} { return -1 } # gnu_ifunc (10): error: too many arguments to function 'gnu_ifunc' diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp index 410d5a4..e7103bc 100644 --- a/gdb/testsuite/gdb.compile/compile-ops.exp +++ b/gdb/testsuite/gdb.compile/compile-ops.exp @@ -33,328 +33,328 @@ standard_testfile .c -dbg.S # set assert_tos_non0 { - bra 3 - skip -3 + DW_OP_bra 3 + DW_OP_skip -3 } set assert_tos_0 [subst { - lit0 - eq + DW_OP_lit0 + DW_OP_eq $assert_tos_non0 }] set program [subst { - lit0 - nop + DW_OP_lit0 + DW_OP_nop $assert_tos_0 - lit1 - const1u 1 - eq + DW_OP_lit1 + DW_OP_const1u 1 + DW_OP_eq $assert_tos_non0 - lit16 - const2u 16 - eq + DW_OP_lit16 + DW_OP_const2u 16 + DW_OP_eq $assert_tos_non0 - lit31 - const4u 31 - ne + DW_OP_lit31 + DW_OP_const4u 31 + DW_OP_ne $assert_tos_0 - lit1 - neg - const1s -1 - eq - $assert_tos_non0 - lit16 - neg - const2s -16 - ne + DW_OP_lit1 + DW_OP_neg + DW_OP_const1s -1 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit16 + DW_OP_neg + DW_OP_const2s -16 + DW_OP_ne $assert_tos_0 - lit31 - const4s -31 - neg - ne + DW_OP_lit31 + DW_OP_const4s -31 + DW_OP_neg + DW_OP_ne $assert_tos_0 - lit7 - dup - plus_uconst 2 - lit9 - eq - $assert_tos_non0 - lit7 - eq - $assert_tos_non0 - lit20 - lit1 - drop - lit20 - eq - $assert_tos_non0 - lit17 - lit19 - over - lit17 - eq - $assert_tos_non0 - lit19 - eq - $assert_tos_non0 - lit17 - eq - $assert_tos_non0 - lit1 - lit2 - lit3 - lit4 - pick 2 - lit2 - eq - $assert_tos_non0 - lit4 - eq - $assert_tos_non0 - lit3 - eq - $assert_tos_non0 - pick 0 - lit2 - eq - $assert_tos_non0 - lit2 - eq - $assert_tos_non0 - lit1 - eq - $assert_tos_non0 - lit6 - lit12 - swap - lit6 - eq - $assert_tos_non0 - lit12 - eq - $assert_tos_non0 - lit7 - lit8 - lit9 - rot - lit8 - eq - $assert_tos_non0 - lit7 - eq - $assert_tos_non0 - lit9 - eq - $assert_tos_non0 - lit7 - abs - lit7 - eq - $assert_tos_non0 - const1s -123 - abs - const1u 123 - eq - $assert_tos_non0 - lit3 - lit6 - and - lit2 - eq - $assert_tos_non0 - lit3 - lit6 - or - lit7 - eq - $assert_tos_non0 - lit17 - lit2 - minus - lit15 - eq + DW_OP_lit7 + DW_OP_dup + DW_OP_plus_uconst 2 + DW_OP_lit9 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit7 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit20 + DW_OP_lit1 + DW_OP_drop + DW_OP_lit20 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit17 + DW_OP_lit19 + DW_OP_over + DW_OP_lit17 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit19 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit17 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit1 + DW_OP_lit2 + DW_OP_lit3 + DW_OP_lit4 + DW_OP_pick 2 + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit4 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit3 + DW_OP_eq + $assert_tos_non0 + DW_OP_pick 0 + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit1 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit6 + DW_OP_lit12 + DW_OP_swap + DW_OP_lit6 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit12 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit7 + DW_OP_lit8 + DW_OP_lit9 + DW_OP_rot + DW_OP_lit8 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit7 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit9 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit7 + DW_OP_abs + DW_OP_lit7 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -123 + DW_OP_abs + DW_OP_const1u 123 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit3 + DW_OP_lit6 + DW_OP_and + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit3 + DW_OP_lit6 + DW_OP_or + DW_OP_lit7 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit17 + DW_OP_lit2 + DW_OP_minus + DW_OP_lit15 + DW_OP_eq $assert_tos_non0 # Divide is signed truncating toward zero. - const1s -6 - const1s -2 - div - lit3 - eq - $assert_tos_non0 - const1s -7 - const1s 3 - div - const1s -2 - eq + DW_OP_const1s -6 + DW_OP_const1s -2 + DW_OP_div + DW_OP_lit3 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -7 + DW_OP_const1s 3 + DW_OP_div + DW_OP_const1s -2 + DW_OP_eq $assert_tos_non0 # Modulo is unsigned. - const1s -6 - const1s -4 - mod - const1s -6 - eq - $assert_tos_non0 - const1s -6 - lit4 - mod - lit2 - eq - $assert_tos_non0 - lit6 - const1s -4 - mod - lit6 - eq + DW_OP_const1s -6 + DW_OP_const1s -4 + DW_OP_mod + DW_OP_const1s -6 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -6 + DW_OP_lit4 + DW_OP_mod + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit6 + DW_OP_const1s -4 + DW_OP_mod + DW_OP_lit6 + DW_OP_eq $assert_tos_non0 # Signed modulo can be implemented using 'over over div mul minus'. - const1s -6 - const1s -4 - over - over - div - mul - minus - const1s -2 - eq - $assert_tos_non0 - const1s -7 - lit3 - over - over - div - mul - minus - const1s -1 - eq - $assert_tos_non0 - lit7 - const1s -3 - over - over - div - mul - minus - lit1 - eq - $assert_tos_non0 - lit16 - lit31 - plus_uconst 1 - mul - const2u 512 - eq - $assert_tos_non0 - lit5 - not - lit31 - and - lit26 - eq - $assert_tos_non0 - lit12 - lit31 - plus - const1u 43 - eq - $assert_tos_non0 - const1s -6 - lit2 - plus - const1s -4 - eq - $assert_tos_non0 - const1s -6 - plus_uconst 3 - const1s -3 - eq - $assert_tos_non0 - lit16 - lit4 - shl - const2u 256 - eq - $assert_tos_non0 - lit16 - lit3 - shr - lit2 - eq - $assert_tos_non0 - const1s -16 - lit3 - shra - const1s -2 - eq - $assert_tos_non0 - lit3 - lit6 - xor - lit5 - eq - $assert_tos_non0 - lit3 - lit6 - le - $assert_tos_non0 - lit3 - lit3 - le - $assert_tos_non0 - lit6 - lit3 - le + DW_OP_const1s -6 + DW_OP_const1s -4 + DW_OP_over + DW_OP_over + DW_OP_div + DW_OP_mul + DW_OP_minus + DW_OP_const1s -2 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -7 + DW_OP_lit3 + DW_OP_over + DW_OP_over + DW_OP_div + DW_OP_mul + DW_OP_minus + DW_OP_const1s -1 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit7 + DW_OP_const1s -3 + DW_OP_over + DW_OP_over + DW_OP_div + DW_OP_mul + DW_OP_minus + DW_OP_lit1 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit16 + DW_OP_lit31 + DW_OP_plus_uconst 1 + DW_OP_mul + DW_OP_const2u 512 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit5 + DW_OP_not + DW_OP_lit31 + DW_OP_and + DW_OP_lit26 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit12 + DW_OP_lit31 + DW_OP_plus + DW_OP_const1u 43 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -6 + DW_OP_lit2 + DW_OP_plus + DW_OP_const1s -4 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -6 + DW_OP_plus_uconst 3 + DW_OP_const1s -3 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit16 + DW_OP_lit4 + DW_OP_shl + DW_OP_const2u 256 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit16 + DW_OP_lit3 + DW_OP_shr + DW_OP_lit2 + DW_OP_eq + $assert_tos_non0 + DW_OP_const1s -16 + DW_OP_lit3 + DW_OP_shra + DW_OP_const1s -2 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit3 + DW_OP_lit6 + DW_OP_xor + DW_OP_lit5 + DW_OP_eq + $assert_tos_non0 + DW_OP_lit3 + DW_OP_lit6 + DW_OP_le + $assert_tos_non0 + DW_OP_lit3 + DW_OP_lit3 + DW_OP_le + $assert_tos_non0 + DW_OP_lit6 + DW_OP_lit3 + DW_OP_le $assert_tos_0 - lit3 - lit6 - lt + DW_OP_lit3 + DW_OP_lit6 + DW_OP_lt $assert_tos_non0 - lit3 - lit3 - lt + DW_OP_lit3 + DW_OP_lit3 + DW_OP_lt $assert_tos_0 - lit6 - lit3 - lt + DW_OP_lit6 + DW_OP_lit3 + DW_OP_lt $assert_tos_0 - lit3 - lit6 - ge + DW_OP_lit3 + DW_OP_lit6 + DW_OP_ge $assert_tos_0 - lit3 - lit3 - ge + DW_OP_lit3 + DW_OP_lit3 + DW_OP_ge $assert_tos_non0 - lit6 - lit3 - ge + DW_OP_lit6 + DW_OP_lit3 + DW_OP_ge $assert_tos_non0 - lit3 - lit6 - gt + DW_OP_lit3 + DW_OP_lit6 + DW_OP_gt $assert_tos_0 - lit3 - lit3 - gt + DW_OP_lit3 + DW_OP_lit3 + DW_OP_gt $assert_tos_0 - lit6 - lit3 - gt - $assert_tos_non0 - const1s -6 - lit1 - shr - lit0 - gt - $assert_tos_non0 - const1s -6 - lit1 - shra - lit0 - lt + DW_OP_lit6 + DW_OP_lit3 + DW_OP_gt + $assert_tos_non0 + DW_OP_const1s -6 + DW_OP_lit1 + DW_OP_shr + DW_OP_lit0 + DW_OP_gt + $assert_tos_non0 + DW_OP_const1s -6 + DW_OP_lit1 + DW_OP_shra + DW_OP_lit0 + DW_OP_lt $assert_tos_non0 # Finally some result. - addr ptr + DW_OP_addr ptr }] if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { @@ -375,36 +375,36 @@ Dwarf::assemble $asm_file { declare_labels int_label compile_unit { - {name file1.txt} - {language @DW_LANG_C} - {low_pc $func_start addr} - {high_pc $func_end addr} + DW_AT_name file1.txt + DW_AT_language @DW_LANG_C + DW_AT_low_pc $func_start addr + DW_AT_high_pc $func_end addr } { global program int_label: base_type { - {name int} - {byte_size 4 sdata} - {encoding @DW_ATE_signed} + DW_AT_name int + DW_AT_byte_size 4 sdata + DW_AT_encoding @DW_ATE_signed } subprogram { - {external 1 flag} - {name func} - {low_pc $func_start addr} - {high_pc $func_end addr} + DW_AT_external 1 flag + DW_AT_name func + DW_AT_low_pc $func_start addr + DW_AT_high_pc $func_end addr } { formal_parameter { - {name param} - {variable_parameter 1 flag} - {type :$int_label} - {location $program SPECIAL_expr} + DW_AT_name param + DW_AT_variable_parameter 1 flag + DW_AT_type :$int_label + DW_AT_location $program SPECIAL_expr } formal_parameter { - {name optimized_out} - {variable_parameter 1 flag} - {type :$int_label} + DW_AT_name optimized_out + DW_AT_variable_parameter 1 flag + DW_AT_type :$int_label } } } @@ -416,7 +416,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -if ![runto func] { +if {![runto func]} { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gdb.compile/compile-print.exp index 4c90a71..2d3ad2f 100644 --- a/gdb/testsuite/gdb.compile/compile-print.exp +++ b/gdb/testsuite/gdb.compile/compile-print.exp @@ -25,7 +25,7 @@ if { [prepare_for_testing "failed to prepare" "$testfile"] } { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/gdb.compile/compile-setjmp.exp index 73f6b8b..048d0a4 100644 --- a/gdb/testsuite/gdb.compile/compile-setjmp.exp +++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp @@ -25,7 +25,7 @@ if { [prepare_for_testing "failed to prepare" $testfile] } { return -1 } -if ![runto_main] { +if {![runto_main]} { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp index aaa8e03..e7db1da 100644 --- a/gdb/testsuite/gdb.compile/compile-tls.exp +++ b/gdb/testsuite/gdb.compile/compile-tls.exp @@ -26,7 +26,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ return -1 } -clean_restart ${binfile} +clean_restart ${::testfile} if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp index ff20b2e..66ac182 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -32,7 +32,8 @@ if { $srcfile3 != "" } { lappend srcfilesoptions $srcfile3 ${options} } lappend srcfilesoptions $srcfile4 "nodebug" -if { [eval build_executable_from_specs ${testfile}.exp $testfile {$options} ${srcfilesoptions}] } { +if { [build_executable_from_specs $testfile.exp $testfile $options \ + {*}$srcfilesoptions] } { return -1 } @@ -53,7 +54,7 @@ gdb_test "compile file -r ${srcdir}/${subdir}/${testfile}-mod.c" \ "The program must be running for the compile command to work.*" \ "test compile file command without running inferior" -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -378,8 +379,9 @@ if { $srcfile3 != "" } { require allow_shlib_tests -set libbin [standard_output_file ${testfile}-shlib.so] -set binfile [standard_output_file ${testfile}-shlib] +set testfile $testfile-shlib +set libbin [standard_output_file $testfile.so] +set binfile [standard_output_file $testfile] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} $binfile executable \ @@ -387,10 +389,10 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != "" return -1 } -clean_restart $binfile +clean_restart $testfile gdb_load_shlib $libbin -if ![runto_main] { +if {![runto_main]} { return -1 } |