From d03285ec7b543bb910328d0cc55ff094486ea126 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 23 Jun 2010 12:46:37 +0000 Subject: ChangeLog: * infrun.c (handle_inferior_event): Handle presence of single-step breakpoints for TARGET_WAITKIND_FORKED and TARGET_WAITKIND_VFORKED. Cancel single-step breakpoints for TARGET_WAITKIND_EXITED, TARGET_WAITKIND_SIGNALED, and TARGET_WAITKIND_EXECD. * breakpoint.c (detach_single_step_breakpoints): New function. (detach_breakpoints): Call it. (cancel_single_step_breakpoints): New function. * breakpoint.h (cancel_single_step_breakpoints): Add prototype. * spu-tdep.c (spu_memory_remove_breakpoint): New function. (spu_gdbarch_init): Install it. testsuite/ChangeLog: * gdb.cell/fork.exp: New file. * gdb.cell/fork.c: Likewise. * gdb.cell/fork-spu.c: Likewise. --- gdb/testsuite/ChangeLog | 6 +++ gdb/testsuite/gdb.cell/fork-spu.c | 47 ++++++++++++++++++++++ gdb/testsuite/gdb.cell/fork.c | 77 +++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cell/fork.exp | 85 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 215 insertions(+) create mode 100644 gdb/testsuite/gdb.cell/fork-spu.c create mode 100644 gdb/testsuite/gdb.cell/fork.c create mode 100644 gdb/testsuite/gdb.cell/fork.exp (limited to 'gdb/testsuite') diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c53fc02..2d82d69 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-06-23 Ulrich Weigand + + * gdb.cell/fork.exp: New file. + * gdb.cell/fork.c: Likewise. + * gdb.cell/fork-spu.c: Likewise. + 2010-06-22 Pierre Muller * lib/gdb.exp (banned_variables_traced): New global variable. diff --git a/gdb/testsuite/gdb.cell/fork-spu.c b/gdb/testsuite/gdb.cell/fork-spu.c new file mode 100644 index 0000000..92a7b4c --- /dev/null +++ b/gdb/testsuite/gdb.cell/fork-spu.c @@ -0,0 +1,47 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2010 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 . + + Contributed by Ulrich Weigand */ + +#include + +int var; + +void +func (void) +{ +} + +int +main (unsigned long long speid, unsigned long long argp, + unsigned long long envp) +{ + /* Signal to PPU side that it should fork now. */ + spu_write_out_intr_mbox (0); + + /* Wait until fork completed. */ + spu_read_in_mbox (); + + /* Trigger watchpoint. */ + var = 1; + + /* Now call some function to trigger breakpoint. */ + func (); + + return 0; +} + diff --git a/gdb/testsuite/gdb.cell/fork.c b/gdb/testsuite/gdb.cell/fork.c new file mode 100644 index 0000000..c3f2587 --- /dev/null +++ b/gdb/testsuite/gdb.cell/fork.c @@ -0,0 +1,77 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2010 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 . + + Contributed by Ulrich Weigand */ + +#include +#include +#include +#include +#include +#include +#include + +extern spe_program_handle_t fork_spu; + +void * +spe_thread (void * arg) +{ + int flags = 0; + unsigned int entry = SPE_DEFAULT_ENTRY; + spe_context_ptr_t *ctx = (spe_context_ptr_t *) arg; + + spe_program_load (*ctx, &fork_spu); + spe_context_run (*ctx, &entry, flags, NULL, NULL, NULL); + + pthread_exit (NULL); +} + +int +main (void) +{ + pthread_t pts; + spe_context_ptr_t ctx; + unsigned int value; + unsigned int pid; + + ctx = spe_context_create (0, NULL); + pthread_create (&pts, NULL, &spe_thread, &ctx); + + /* Wait until the SPU thread is running. */ + spe_out_intr_mbox_read (ctx, &value, 1, SPE_MBOX_ALL_BLOCKING); + + pid = fork (); + if (pid == 0) + { + /* This is the child. Just exit immediately. */ + exit (0); + } + else + { + /* This is the parent. Wait for the child to exit. */ + waitpid (pid, NULL, 0); + } + + /* Tell SPU to continue. */ + spe_in_mbox_write (ctx, &value, 1, SPE_MBOX_ALL_BLOCKING); + + pthread_join (pts, NULL); + spe_context_destroy (ctx); + + return 0; +} + diff --git a/gdb/testsuite/gdb.cell/fork.exp b/gdb/testsuite/gdb.cell/fork.exp new file mode 100644 index 0000000..d2ac711 --- /dev/null +++ b/gdb/testsuite/gdb.cell/fork.exp @@ -0,0 +1,85 @@ +# Copyright 2010 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 . +# +# Contributed by Ulrich Weigand . +# +# Testsuite for Cell Broadband Engine combined debugger +# This testcases tests support for PPU-side fork during SPU debugging + +load_lib cell.exp + +set testfile "fork" +set ppu_file "fork" +set ppu_src ${srcdir}/${subdir}/${ppu_file}.c +set ppu_bin ${objdir}/${subdir}/${ppu_file} +set spu_file "fork-spu" +set spu_src ${srcdir}/${subdir}/${spu_file}.c +set spu_bin ${objdir}/${subdir}/${spu_file} + +if {[skip_cell_tests]} { + return 0 +} + +# Compile SPU binary. +if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}] != "" } { + unsupported "Compiling spu binary failed." + return -1 +} +# Compile PPU binary. +if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}] != "" } { + unsupported "Embedding spu binary failed." + return -1 +} +if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } { + unsupported "Compiling ppu binary failed." + return -1 +} + +if [get_compiler_info ${ppu_bin}] { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${ppu_bin} + +if ![runto_main] then { + fail "Can't run to main" + return 0 +} + +gdb_test_no_output "set spu stop-on-load" "set spu stop-on-load" + +gdb_test "continue" "Continuing\\..*Temporary breakpoint \[0-9\]+, main \\(speid=.*, argp=.*, envp=.*\\) at .*$spu_file\\.c:.*spu_write_out_intr_mbox.*" \ + "run until SPU main" + +gdb_test "break func" "Breakpoint \[0-9\]+ at.* file .*$spu_file.c, line \[0-9\]+\\." "break func" +gdb_test "watch var" "Watchpoint \[0-9\]+: var" "watch var" + +gdb_test "continue" "Continuing\\..*Watchpoint.*Old value = 0.*New value = 1.*" \ + "run until watchpoint hit" + +gdb_test_no_output "delete \$bpnum" "delete watchpoint" + +gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, func \\(\\) at .*$spu_file.c:.*" \ + "run until breakpoint hit" + +gdb_test "continue" "Continuing\\..*Program exited normally.*" \ + "run until end" + +gdb_exit + +return 0 -- cgit v1.1