From: schauer Date: Mon, 6 Nov 2000 20:38:01 +0000 (+0000) Subject: * gdb.base/callfuncs.c (main): Moved to end of file, call X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ac87d4847f7c309c931c39eb9e1176dba81fd4c;p=pf3gnuchains%2Fpf3gnuchains3x.git * gdb.base/callfuncs.c (main): Moved to end of file, call t_double_values to initialize the FPU before inferior calls are made. * gdb.base/callfuncs.exp: Test for register preservation after calling inferior functions. Add tests for continuining, finishing and returning from a stop in a call dummy. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0155fb8e0a..91f97eb84b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2000-11-06 Peter Schauer + + * gdb.base/callfuncs.c (main): Moved to end of file, call + t_double_values to initialize the FPU before inferior calls are made. + * gdb.base/callfuncs.exp: Test for register preservation after calling + inferior functions. Add tests for continuining, finishing and + returning from a stop in a call dummy. + 2000-10-24 Michael Snyder * gdb.base/commands.exp: Break up long lines, and re-indent. diff --git a/gdb/testsuite/gdb.base/callfuncs.c b/gdb/testsuite/gdb.base/callfuncs.c index 56b9ba8153..f53bd3177c 100644 --- a/gdb/testsuite/gdb.base/callfuncs.c +++ b/gdb/testsuite/gdb.base/callfuncs.c @@ -8,6 +8,9 @@ #define PARAMS(paramlist) paramlist #endif +# include +# include + char char_val1 = 'a'; char char_val2 = 'b'; @@ -28,8 +31,8 @@ double double_val2 = -67.66; #define DELTA (0.001) -char *string_val1 = "string 1"; -char *string_val2 = "string 2"; +char *string_val1 = (char *)"string 1"; +char *string_val2 = (char *)"string 2"; char char_array_val1[] = "carray 1"; char char_array_val2[] = "carray 2"; @@ -46,15 +49,20 @@ struct struct1 { /* Some functions that can be passed as arguments to other test functions, or called directly. */ - -int add (a, b) -int a, b; +#ifdef PROTOTYPES +int add (int a, int b) +#else +int add (a, b) int a, b; +#endif { return (a + b); } -int doubleit (a) -int a; +#ifdef PROTOTYPES +int doubleit (int a) +#else +int doubleit (a) int a; +#endif { return (a + a); } @@ -69,20 +77,29 @@ enum enumtype enum_val1 = enumval1; enum enumtype enum_val2 = enumval2; enum enumtype enum_val3 = enumval3; -int t_enum_value1 (enum_arg) -enum enumtype enum_arg; +#ifdef PROTOTYPES +int t_enum_value1 (enum enumtype enum_arg) +#else +int t_enum_value1 (enum_arg) enum enumtype enum_arg; +#endif { return (enum_arg == enum_val1); } -int t_enum_value2 (enum_arg) -enum enumtype enum_arg; +#ifdef PROTOTYPES +int t_enum_value2 (enum enumtype enum_arg) +#else +int t_enum_value2 (enum_arg) enum enumtype enum_arg; +#endif { return (enum_arg == enum_val2); } -int t_enum_value3 (enum_arg) -enum enumtype enum_arg; +#ifdef PROTOTYPES +int t_enum_value3 (enum enumtype enum_arg) +#else +int t_enum_value3 (enum_arg) enum enumtype enum_arg; +#endif { return (enum_arg == enum_val3); } @@ -90,9 +107,11 @@ enum enumtype enum_arg; /* A function that takes a vector of integers (along with an explicit count) and returns their sum. */ -int sum_args (argc, argv) -int argc; -int argv[]; +#ifdef PROTOTYPES +int sum_args (int argc, int argv[]) +#else +int sum_args (argc, argv) int argc; int argv[]; +#endif { int sumval = 0; int idx; @@ -107,6 +126,15 @@ int argv[]; /* Test that we can call functions that take structs and return members from that struct */ +#ifdef PROTOTYPES +char t_structs_c (struct struct1 tstruct) { return (tstruct.c); } +short t_structs_s (struct struct1 tstruct) { return (tstruct.s); } +int t_structs_i (struct struct1 tstruct) { return (tstruct.i); } +long t_structs_l (struct struct1 tstruct) { return (tstruct.l); } +float t_structs_f (struct struct1 tstruct) { return (tstruct.f); } +double t_structs_d (struct struct1 tstruct) { return (tstruct.d); } +char *t_structs_a (struct struct1 tstruct) { return (tstruct.a); } +#else char t_structs_c (tstruct) struct struct1 tstruct; { return (tstruct.c); } short t_structs_s (tstruct) struct struct1 tstruct; { return (tstruct.s); } int t_structs_i (tstruct) struct struct1 tstruct; { return (tstruct.i); } @@ -114,52 +142,55 @@ long t_structs_l (tstruct) struct struct1 tstruct; { return (tstruct.l); } float t_structs_f (tstruct) struct struct1 tstruct; { return (tstruct.f); } double t_structs_d (tstruct) struct struct1 tstruct; { return (tstruct.d); } char *t_structs_a (tstruct) struct struct1 tstruct; { return (tstruct.a); } +#endif /* Test that calling functions works if there are a lot of arguments. */ +#ifdef PROTOTYPES +int +sum10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9) +#else int sum10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9) int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9; +#endif { return i0 + i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9; } /* Test that args are passed in the right order. */ +#ifdef PROTOTYPES +int +cmp10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9) +#else int cmp10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9) int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9; +#endif { return (i0 == 0) && (i1 == 1) && (i2 == 2) && (i3 == 3) && (i4 == 4) && (i5 == 5) && (i6 == 6) && (i7 == 7) && (i8 == 8) && (i9 == 9); } - -/* Gotta have a main to be able to generate a linked, runnable - executable, and also provide a useful place to set a breakpoint. */ -extern void * malloc() ; -int main () -{ -#ifdef usestubs - set_debug_traps(); - breakpoint(); -#endif - malloc(1); - t_structs_c(struct_val1); - return 0 ; -} - /* Functions that expect specific values to be passed and return either 0 or 1, depending upon whether the values were passed incorrectly or correctly, respectively. */ +#ifdef PROTOTYPES +int t_char_values (char char_arg1, char char_arg2) +#else int t_char_values (char_arg1, char_arg2) char char_arg1, char_arg2; +#endif { return ((char_arg1 == char_val1) && (char_arg2 == char_val2)); } int -#ifdef NO_PROTOTYPES +#ifdef PROTOTYPES +t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5, + char arg6, short arg7, int arg8, short arg9, short arg10) +#else t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) char arg1; short arg2; @@ -171,34 +202,47 @@ t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) int arg8; short arg9; short arg10; -#else -t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5, - char arg6, short arg7, int arg8, short arg9, short arg10) #endif { return arg1 + arg2 + arg3 + arg4 + arg5 + arg6 + arg7 + arg8 + arg9 + arg10; } +#ifdef PROTOTYPES +int t_short_values (short short_arg1, short short_arg2) +#else int t_short_values (short_arg1, short_arg2) -short short_arg1, short_arg2; + short short_arg1, short_arg2; +#endif { return ((short_arg1 == short_val1) && (short_arg2 == short_val2)); } +#ifdef PROTOTYPES +int t_int_values (int int_arg1, int int_arg2) +#else int t_int_values (int_arg1, int_arg2) int int_arg1, int_arg2; +#endif { return ((int_arg1 == int_val1) && (int_arg2 == int_val2)); } +#ifdef PROTOTYPES +int t_long_values (long long_arg1, long long_arg2) +#else int t_long_values (long_arg1, long_arg2) long long_arg1, long_arg2; +#endif { return ((long_arg1 == long_val1) && (long_arg2 == long_val2)); } +#ifdef PROTOTYPES +int t_float_values (float float_arg1, float float_arg2) +#else int t_float_values (float_arg1, float_arg2) float float_arg1, float_arg2; +#endif { return ((float_arg1 - float_val1) < DELTA && (float_arg1 - float_val1) > -DELTA @@ -207,13 +251,13 @@ float float_arg1, float_arg2; } int -#ifdef NO_PROTOTYPES +#ifdef PROTOTYPES +t_float_values2 (float float_arg1, float float_arg2) +#else /* In this case we are just duplicating t_float_values, but that is the easiest way to deal with either ANSI or non-ANSI. */ t_float_values2 (float_arg1, float_arg2) float float_arg1, float_arg2; -#else -t_float_values2 (float float_arg1, float float_arg2) #endif { return ((float_arg1 - float_val1) < DELTA @@ -222,8 +266,12 @@ t_float_values2 (float float_arg1, float float_arg2) && (float_arg2 - float_val2) > -DELTA); } +#ifdef PROTOTYPES +int t_double_values (double double_arg1, double double_arg2) +#else int t_double_values (double_arg1, double_arg2) double double_arg1, double_arg2; +#endif { return ((double_arg1 - double_val1) < DELTA && (double_arg1 - double_val1) > -DELTA @@ -231,15 +279,23 @@ double double_arg1, double_arg2; && (double_arg2 - double_val2) > -DELTA); } +#ifdef PROTOTYPES +int t_string_values (char *string_arg1, char *string_arg2) +#else int t_string_values (string_arg1, string_arg2) char *string_arg1, *string_arg2; +#endif { return (!strcmp (string_arg1, string_val1) && !strcmp (string_arg2, string_val2)); } +#ifdef PROTOTYPES +int t_char_array_values (char char_array_arg1[], char char_array_arg2[]) +#else int t_char_array_values (char_array_arg1, char_array_arg2) char char_array_arg1[], char_array_arg2[]; +#endif { return (!strcmp (char_array_arg1, char_array_val1) && !strcmp (char_array_arg2, char_array_val2)); @@ -264,17 +320,41 @@ char char_array_arg1[], char_array_arg2[]; that function indirectly through the function pointer. This would fail on the HPPA. */ +#ifdef PROTOTYPES +int t_func_values (int (*func_arg1)(int, int), int (*func_arg2)(int)) +#else int t_func_values (func_arg1, func_arg2) int (*func_arg1) PARAMS ((int, int)); int (*func_arg2) PARAMS ((int)); +#endif { return ((*func_arg1) (5,5) == (*func_val1) (5,5) && (*func_arg2) (6) == (*func_val2) (6)); } +#ifdef PROTOTYPES +int t_call_add (int (*func_arg1)(int, int), int a, int b) +#else int t_call_add (func_arg1, a, b) int (*func_arg1) PARAMS ((int, int)); int a, b; +#endif { return ((*func_arg1)(a, b)); } + + +/* Gotta have a main to be able to generate a linked, runnable + executable, and also provide a useful place to set a breakpoint. */ +extern void * malloc() ; +int main () +{ +#ifdef usestubs + set_debug_traps(); + breakpoint(); +#endif + malloc(1); + t_double_values(double_val1, double_val2); + t_structs_c(struct_val1); + return 0 ; +} diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 19b5c965a9..eab99dd6dc 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -31,14 +31,8 @@ set testfile "callfuncs" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} -set prototypes 1 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - set prototypes 0; - # built the second test case since we can't use prototypes - warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES" - if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DNO_PROTOTYPES}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." - } } # Create and source the file that provides information about the compiler @@ -48,6 +42,12 @@ if [get_compiler_info ${binfile}] { return -1; } +if {$hp_aCC_compiler} { + set prototypes 1 +} else { + set prototypes 0 +} + # The a29k can't call functions, so don't even bother with this test. if [target_info exists gdb,cannot_call_functions] { setup_xfail "*-*-*" 2416 @@ -94,6 +94,8 @@ proc set_lang_c {} { proc do_function_calls {} { global prototypes global gcc_compiled + global gdb_prompt + # We need to up this because this can be really slow on some boards. set timeout 60; @@ -144,7 +146,7 @@ proc do_function_calls {} { # Although PR 5318 mentions SunOS specifically, this seems # to be a generic problem on quite a few platforms. if $prototypes then { - setup_xfail "hppa*-*-*" "sparc-*-*" "mips*-*-*" 5318 + setup_xfail "sparc-*-*" "mips*-*-*" 5318 if {!$gcc_compiled} then { setup_xfail "alpha-dec-osf2*" "i*86-*-sysv4*" 5318 } @@ -185,29 +187,22 @@ proc do_function_calls {} { # the RS6000. setup_xfail "rs6000*-*-*" setup_xfail "powerpc*-*-*" - if {!$gcc_compiled && [istarget hppa*-*-hpux*]} then { - gdb_test "p t_func_values(add,func_val2)" "You cannot.*ignored.*" - } else { + if {![istarget hppa*-*-hpux*]} then { gdb_test "p t_func_values(add,func_val2)" " = 1" } setup_xfail "rs6000*-*-*" setup_xfail "powerpc*-*-*" - if {!$gcc_compiled && [istarget hppa*-*-hpux*]} then { - gdb_test "p t_func_values(func_val1,doubleit)" "You cannot.*ignored.*" - } else { + if {![istarget hppa*-*-hpux*]} then { gdb_test "p t_func_values(func_val1,doubleit)" " = 1" } - gdb_test "p t_call_add(func_val1,3,4)" " = 7" - setup_xfail "rs6000*-*-*" setup_xfail "powerpc*-*-*" - if {!$gcc_compiled && [istarget hppa*-*-hpux*]} then { - gdb_test "p t_call_add(add,3,4)" "You cannot.*ignored.*" - } else { + if {![istarget hppa*-*-hpux*]} then { gdb_test "p t_call_add(add,3,4)" " = 7" } + gdb_test "p t_call_add(func_val1,3,4)" " = 7" gdb_test "p t_enum_value1(enumval1)" " = 1" gdb_test "p t_enum_value1(enum_val1)" " = 1" @@ -234,16 +229,32 @@ proc do_function_calls {} { "call inferior func with struct - returns int" gdb_test "p t_structs_l(struct_val1)" "= 51" \ "call inferior func with struct - returns long" - setup_xfail "i*86-*-*" gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \ "call inferior func with struct - returns float" - setup_xfail "i*86-*-*" gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \ "call inferior func with struct - returns double" gdb_test "p t_structs_a(struct_val1)" "= (.unsigned char .. )?\"foo\"" \ "call inferior func with struct - returns char *" } +# Procedure to get current content of all registers. +global all_registers_content +set all_registers_content "" +proc do_get_all_registers { } { + global gdb_prompt + global expect_out + global all_registers_content + + set all_registers_content "" + send_gdb "info all-registers\n" + gdb_expect { + -re "info all-registers\r\n(.*)$gdb_prompt $" { + set all_registers_content $expect_out(1,string) + } + default {} + } +} + # Start with a fresh gdb. gdb_exit @@ -255,15 +266,103 @@ gdb_test "set print sevenbit-strings" "" gdb_test "set print address off" "" gdb_test "set width 0" "" -if { ![set_lang_c] } { - gdb_suppress_tests; -} else { +if { $hp_aCC_compiler } { + # Do not set language explicitly to 'C'. This will cause aCC + # tests to fail because promotion rules are different. Just let + # the language be set to the default. + if { ![runto_main] } { gdb_suppress_tests; } + + # However, turn off overload-resolution for aCC. Having it on causes + # a lot of failures. + + gdb_test "set overload-resolution 0" ".*" +} else { + if { ![set_lang_c] } { + gdb_suppress_tests; + } else { + if { ![runto_main] } { + gdb_suppress_tests; + } + } } -gdb_test "next" ".*" +# Make sure that malloc gets called and that the floating point unit +# is initialized via a call to t_double_values. +gdb_test "next" "t_double_values\\(double_val1, double_val2\\);.*" +gdb_test "next" "t_structs_c\\(struct_val1\\);.*" + +# Save all register contents. +do_get_all_registers +set old_reg_content $all_registers_content + +# Perform function calls. do_function_calls +# Check if all registers still have the same value. +do_get_all_registers +set new_reg_content $all_registers_content +if ![string compare $old_reg_content $new_reg_content] then { + pass "gdb function calls preserve register contents" +} else { + set old_reg_content $all_registers_content + fail "gdb function calls preserve register contents" +} + +# Set breakpoint at a function we will call from gdb. +gdb_breakpoint add + +# Call function (causing a breakpoint hit in the call dummy) and do a continue, +# make sure we are back at main and still have the same register contents. +gdb_test "print add(4,5)" "The program being debugged stopped while.*" "" +gdb_test "continue" "Continuing.*" "continue from call dummy breakpoint" +if ![gdb_test "bt 2" \ + "#0 main.*" \ + "bt after continuing from call dummy breakpoint"] then { + do_get_all_registers + set new_reg_content $all_registers_content + if ![string compare $old_reg_content $new_reg_content] then { + pass "continue after stop in call dummy preserves register contents" + } else { + fail "continue after stop in call dummy preserves register contents" + } +} + +# Call function (causing a breakpoint hit in the call dummy) and do a finish, +# make sure we are back at main and still have the same register contents. +gdb_test "print add(4,5)" "The program being debugged stopped while.*" "" +gdb_test "finish" \ + "Value returned is.* = 9" \ + "finish from call dummy breakpoint returns correct value" +if ![gdb_test "bt 2" \ + "#0 main.*" \ + "bt after finishing from call dummy breakpoint"] then { + do_get_all_registers + set new_reg_content $all_registers_content + if ![string compare $old_reg_content $new_reg_content] then { + pass "finish after stop in call dummy preserves register contents" + } else { + fail "finish after stop in call dummy preserves register contents" + } +} + +# Call function (causing a breakpoint hit in the call dummy) and do a return +# with a value, make sure we are back at main with the same register contents. +gdb_test "print add(4,5)" "The program being debugged stopped while.*" "" +if ![gdb_test "return 7" \ + "#0 main.*" \ + "back at main after return from call dummy breakpoint" \ + "Make add return now. .y or n.*" \ + "y"] then { + do_get_all_registers + set new_reg_content $all_registers_content + if ![string compare $old_reg_content $new_reg_content] then { + pass "return after stop in call dummy preserves register contents" + } else { + fail "return after stop in call dummy preserves register contents" + } +} + return 0