From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1357 invoked by alias); 17 Nov 2008 17:57:09 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 1096 invoked by uid 9782); 17 Nov 2008 17:57:07 -0000 Date: Mon, 17 Nov 2008 17:57:00 -0000 Message-ID: <20081117175707.1052.qmail@sourceware.org> From: sergio@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-sergio-catch-syscall: Merge commit 'gdb/master' into catch-syscall X-Git-Refname: refs/heads/archer-sergio-catch-syscall X-Git-Reftype: branch X-Git-Oldrev: 19b2f7c625ef197434cc49818986cac0af65d0b8 X-Git-Newrev: 01b88af28154a60c8daef238c95d4ccb0552d0ba X-SW-Source: 2008-q4/txt/msg00117.txt.bz2 List-Id: The branch, archer-sergio-catch-syscall has been updated via 01b88af28154a60c8daef238c95d4ccb0552d0ba (commit) via 6b3e8b0e7a179e728d896a97c43decc6a12ca5c0 (commit) via 0c5574a0fc1b1b66e39bad41eb636efdc674eb05 (commit) via 3b2206da375fca94003d4db0f72e1822a4e1f28e (commit) via 33869c85b4b6321b1095b662a79fec48fd6fa34a (commit) via e7869269d3657b94d83ea440569ebdcd21c56189 (commit) via c52c9073d08225f822d625a8d76819ba5a0470bf (commit) via 3c505739f7646cd155eba4c1246894c7cf3b6eeb (commit) via 58748546abbdea125f5983ba745efee1ef896ced (commit) via 507dd87fc0367c004892eff4c104cdff063c5ba0 (commit) via 1cdf2961f034fc2f933315de34dc939e8d46b462 (commit) via da1b5d9dc941afa45eeb2b126c82f7502cd0525d (commit) via 227ad0969c90da67897154b45c19e65583a4bdfb (commit) via 08a70260985f89286a7457015055c769f19e1284 (commit) via d54b97879ae4232f0467b94fefbd131439075de8 (commit) via bd98e3b320b7e778efb2fae16cb1ff4cf521a415 (commit) via c67afd861dc3b441e5e32cf1d4cc8f4f1f41fd37 (commit) via 4d875ef896905769b46f4e2c09f8567e7d60a62a (commit) via a0f6254235a56c5bd94fded0376a17a3e8ca8291 (commit) via 2565f71572160a6a6157ff5528ef9c87534d9ff6 (commit) via 48e3b7eaf04d088c42933ccdc59234f60642cdfc (commit) via 232efe0b019677c5cb153521d6e65c2d9e8fcda8 (commit) via 8d867d71d0d189aeb38e60e2b8a1f1fd7300fcdc (commit) from 19b2f7c625ef197434cc49818986cac0af65d0b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 01b88af28154a60c8daef238c95d4ccb0552d0ba Merge: 19b2f7c625ef197434cc49818986cac0af65d0b8 6b3e8b0e7a179e728d896a97c43decc6a12ca5c0 Author: Sergio Durigan Junior Date: Mon Nov 17 09:56:51 2008 -0800 Merge commit 'gdb/master' into catch-syscall Conflicts: gdb/breakpoint.c gdb/breakpoint.h gdb/configure.tgt commit 6b3e8b0e7a179e728d896a97c43decc6a12ca5c0 Author: Vladimir Prus Date: Mon Nov 17 16:43:32 2008 +0000 Implement =thread-selected notification. * mi/mi-common.h (struct mi_interp): New, moved from ... * mi/mi-interp.c: ...here. * mi/mi-main.c (mi_execute_command): If the thread changed as result of command, report that. commit 0c5574a0fc1b1b66e39bad41eb636efdc674eb05 Author: Vladimir Prus Date: Mon Nov 17 16:39:50 2008 +0000 Implement continue/interrupt of thread groups. * mi/mi-main.c (proceed_thread_callback): New. (mi_cmd_exec_continue): If --thread-group is specified, resume all threads in that group. (interrupt_thread_callback): New. (mi_cmd_exec_interrupt): If --thread-group is specified, interrupt all threads in that group. commit 3b2206da375fca94003d4db0f72e1822a4e1f28e Author: Vladimir Prus Date: Mon Nov 17 16:37:32 2008 +0000 Implement '-target-detach pid'. * infcmd.c (detach_command): Make nonstatic. * inferior.h (detach_command): Declare. * mi/mi-cmds.c (mi_cmds): Don't route -target-detach via CLI. * mi/mi-cmds.h (mi_cmd_target_detach): Declare. * mi/mi-main.c (find_thread_of_process, mi_cmd_target_detach): New. commit 33869c85b4b6321b1095b662a79fec48fd6fa34a Author: Vladimir Prus Date: Mon Nov 17 12:34:18 2008 +0000 Include group-id in thread-created notification. * mi/mi-interp.c (mi_new_thread, mi_thread_exit): Include group id in the output. commit e7869269d3657b94d83ea440569ebdcd21c56189 Author: Vladimir Prus Date: Mon Nov 17 12:28:05 2008 +0000 Notification for attach/detach. * inferior.c: Call the process observers. * mi/mi-interp.c (mi_new_inferior, mi_inferior_exit): New. (mi_interpreter_init): Register the above. commit c52c9073d08225f822d625a8d76819ba5a0470bf Author: Vladimir Prus Date: Mon Nov 17 12:13:49 2008 +0000 Implement -list-thread-groups. * thread.c (print_thread_info): New parameter pid, to print threads of specific process. * gdbthread.h (print_thread_info): New parameter pid. * mi/mi-cmds.c (mi_cmds): Register -list-thread-groups. * mi/mi-cmds.h (mi_cmd_list_thread_groups): New. * mi/mi-main.c (mi_cmd_thread_info): Adjust. (print_one_process, mi_cmd_list_thread_groups): New. commit 3c505739f7646cd155eba4c1246894c7cf3b6eeb Author: gdbadmin Date: Mon Nov 17 00:00:33 2008 +0000 *** empty log message *** commit 58748546abbdea125f5983ba745efee1ef896ced Author: Alan Modra Date: Mon Nov 17 00:00:05 2008 +0000 daily update commit 507dd87fc0367c004892eff4c104cdff063c5ba0 Author: Joel Brobecker Date: Sun Nov 16 18:05:26 2008 +0000 Remove some unused macros related to the old load/unload catchpoints. * breakpoint.c (SOLIB_LOADED_LIBRARY_PATHNAME) (SOLIB_UNLOADED_LIBRARY_PATHNAME, SOLIB_CREATE_CATCH_LOAD_HOOK) (SOLIB_CREATE_CATCH_UNLOAD_HOOK): Delete. No longer used. commit 1cdf2961f034fc2f933315de34dc939e8d46b462 Author: Joel Brobecker Date: Sun Nov 16 18:03:25 2008 +0000 * gdb.base/help.exp: Remove the "catch load" and "catch unload" commands from the expected output for "help catch". commit da1b5d9dc941afa45eeb2b126c82f7502cd0525d Author: Joel Brobecker Date: Sun Nov 16 18:01:46 2008 +0000 Remove support for catch load and catch unload commands. * breakpoint.h (enum bptype): Remove bp_catch_load and bp_catch_unload. (struct breakpoint): Remove fields dll_pathname and triggered_dll_pathname. (bpstat_get_triggered_catchpoints, ep_is_shlib_catchpoint): Delete. * breakpoint.c (ep_is_catchpoint): Remove handling of bp_catch_load and bp_catch_unload. (print_it_typical, bpstat_check_location, bpstat_what) (print_one_breakpoint_location, print_one_breakpoint_location) (user_settable_breakpoint, allocate_bp_location) (set_raw_breakpoint_without_location, mention, delete_breakpoint, (breakpoint_re_set_one, disable_command, enable_command): Likewise. (ep_is_shlib_catchpoint, bpstat_get_triggered_catchpoints) (catch_load_command_1, catch_unload_command_1): Delete. (_initialize_breakpoint): Remove the "catch load" and "catch unload" command creation. * infrun.c (handle_inferior_event): Remove the handling of load/unload catchpoint events. commit 227ad0969c90da67897154b45c19e65583a4bdfb Author: Alan Modra Date: Sun Nov 16 00:00:05 2008 +0000 daily update commit 08a70260985f89286a7457015055c769f19e1284 Author: gdbadmin Date: Sun Nov 16 00:00:03 2008 +0000 *** empty log message *** commit d54b97879ae4232f0467b94fefbd131439075de8 Author: Joel Brobecker Date: Sat Nov 15 18:49:50 2008 +0000 From Jerome Guitton * dwarf2read.c (dwarf2_debug_line_missing_end_sequence_complaint): New function. (dwarf_decode_lines): Detect null file numbers. Detect the end of the line program sequence when no end sequence is emitted. commit bd98e3b320b7e778efb2fae16cb1ff4cf521a415 Author: Joel Brobecker Date: Sat Nov 15 18:30:38 2008 +0000 * gdb.ada/int_deref.exp: New testcase. commit c67afd861dc3b441e5e32cf1d4cc8f4f1f41fd37 Author: Joel Brobecker Date: Sat Nov 15 18:27:27 2008 +0000 * ada-lang.c (ada_evaluate_subexp): Improve handling of integer type dereferencing. commit 4d875ef896905769b46f4e2c09f8567e7d60a62a Author: Daniel Jacobowitz Date: Sat Nov 15 16:09:50 2008 +0000 * NEWS: Mention sparc64-linux-gnu gdbserver support. commit a0f6254235a56c5bd94fded0376a17a3e8ca8291 Author: Alan Modra Date: Sat Nov 15 00:00:05 2008 +0000 daily update commit 2565f71572160a6a6157ff5528ef9c87534d9ff6 Author: gdbadmin Date: Sat Nov 15 00:00:03 2008 +0000 *** empty log message *** commit 48e3b7eaf04d088c42933ccdc59234f60642cdfc Author: Daniel Jacobowitz Date: Fri Nov 14 22:06:41 2008 +0000 2008-11-14 Daniel Gutson * configure.tgt (sparc64-*-linux*): Added gdbserver support. * regformats/reg-sparc64.dat: New file. gdbserver/ 2008-11-14 Daniel Gutson * Makefile.in (SFILES, clean): Added sparc64 files. (reg-sparc64.o, reg-sparc64.c): New. * configure.srv (sparc*-*-linux*): New configuration. * linux-low.c (regsets_fetch_inferior_registers): Swap ptrace syscall arguments for SPARC. (regsets_store_inferior_registers): Likewise. * linux-sparc-low.c: New file. commit 232efe0b019677c5cb153521d6e65c2d9e8fcda8 Author: Eric B. Weddington Date: Fri Nov 14 21:37:52 2008 +0000 /bfd: 2008-11-14 Eric B. Weddington PR 7022 * elf32-avr.c (bfd_elf_avr_final_write_processing): Add missing break statements. commit 8d867d71d0d189aeb38e60e2b8a1f1fd7300fcdc Author: Tom Tromey Date: Fri Nov 14 18:38:31 2008 +0000 gdb PR mi/2549: * mi/mi-main.c (get_register): Use get_formatted_print_options. gdb/testsuite 2008-11-14 Nick Roberts * gdb.mi/gdb2549.exp: New file. ----------------------------------------------------------------------- Summary of changes: bfd/ChangeLog | 6 + bfd/elf32-avr.c | 3 + bfd/version.h | 2 +- gdb/ChangeLog | 114 +++++++++++ gdb/NEWS | 3 + gdb/ada-lang.c | 18 +- gdb/breakpoint.c | 337 +------------------------------ gdb/breakpoint.h | 29 --- gdb/configure.tgt | 1 + gdb/doc/ChangeLog | 9 + gdb/doc/gdb.texinfo | 13 ++ gdb/doc/observer.texi | 10 + gdb/dwarf2read.c | 35 ++- gdb/gdbserver/ChangeLog | 10 + gdb/gdbserver/Makefile.in | 8 +- gdb/gdbserver/configure.srv | 5 + gdb/gdbserver/linux-low.c | 14 ++- gdb/gdbserver/linux-sparc-low.c | 287 ++++++++++++++++++++++++++ gdb/gdbthread.h | 3 +- gdb/infcmd.c | 4 +- gdb/inferior.c | 5 + gdb/inferior.h | 2 + gdb/infrun.c | 37 ---- gdb/mi/mi-cmds.c | 3 +- gdb/mi/mi-cmds.h | 2 + gdb/mi/mi-common.h | 15 ++ gdb/mi/mi-interp.c | 48 +++-- gdb/mi/mi-main.c | 192 +++++++++++++++++- gdb/regformats/reg-sparc64.dat | 91 +++++++++ gdb/testsuite/ChangeLog | 26 +++ gdb/testsuite/gdb.ada/int_deref.exp | 45 ++++ gdb/testsuite/gdb.ada/int_deref/foo.adb | 21 ++ gdb/testsuite/gdb.ada/int_deref/pck.ads | 20 ++ gdb/testsuite/gdb.base/help.exp | 2 +- gdb/testsuite/gdb.mi/gdb2549.exp | 85 ++++++++ gdb/testsuite/gdb.mi/mi-nonstop.exp | 2 +- gdb/testsuite/gdb.mi/mi-pthreads.exp | 6 + gdb/testsuite/lib/mi-support.exp | 13 +- gdb/thread.c | 20 ++- gdb/version.in | 2 +- 40 files changed, 1086 insertions(+), 462 deletions(-) create mode 100644 gdb/gdbserver/linux-sparc-low.c create mode 100644 gdb/regformats/reg-sparc64.dat create mode 100644 gdb/testsuite/gdb.ada/int_deref.exp create mode 100644 gdb/testsuite/gdb.ada/int_deref/foo.adb create mode 100644 gdb/testsuite/gdb.ada/int_deref/pck.ads create mode 100644 gdb/testsuite/gdb.mi/gdb2549.exp First 500 lines of diff: diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b44e3ef..2adfb18 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2008-11-14 Eric B. Weddington + + PR 7022 + * elf32-avr.c (bfd_elf_avr_final_write_processing): + Add missing break statements. + 2008-11-14 Bob Wilson * xtensa-modules.c (xtensa_state_id): New enum, replacing STATE macros. diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c index fffd040..17e20fa 100644 --- a/bfd/elf32-avr.c +++ b/bfd/elf32-avr.c @@ -1298,6 +1298,7 @@ bfd_elf_avr_final_write_processing (bfd *abfd, case bfd_mach_avr25: val = E_AVR_MACH_AVR25; + break; case bfd_mach_avr3: val = E_AVR_MACH_AVR3; @@ -1305,9 +1306,11 @@ bfd_elf_avr_final_write_processing (bfd *abfd, case bfd_mach_avr31: val = E_AVR_MACH_AVR31; + break; case bfd_mach_avr35: val = E_AVR_MACH_AVR35; + break; case bfd_mach_avr4: val = E_AVR_MACH_AVR4; diff --git a/bfd/version.h b/bfd/version.h index 30b71f8..85021a3 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20081114 +#define BFD_VERSION_DATE 20081117 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b35e05..2327ee1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,117 @@ +2008-11-17 Vladimir Prus + + Implement =thread-selected notification. + + * mi/mi-common.h (struct mi_interp): New, moved from ... + * mi/mi-interp.c: ...here. + * mi/mi-main.c (mi_execute_command): If the thread changed + as result of command, report that. + +2008-11-17 Vladimir Prus + + Implement continue/interrupt of thread groups. + + * mi/mi-main.c (proceed_thread_callback): New. + (mi_cmd_exec_continue): If --thread-group is specified, resume all + threads in that group. + (interrupt_thread_callback): New. + (mi_cmd_exec_interrupt): If --thread-group is specified, interrupt + all threads in that group. + +2008-11-17 Vladimir Prus + + Implement '-target-detach pid'. + + * infcmd.c (detach_command): Make nonstatic. + * inferior.h (detach_command): Declare. + * mi/mi-cmds.c (mi_cmds): Don't route -target-detach via CLI. + * mi/mi-cmds.h (mi_cmd_target_detach): Declare. + * mi/mi-main.c (find_thread_of_process, mi_cmd_target_detach): New. + +2008-11-17 Vladimir Prus + + Include group-id in thread-created notification. + + * mi/mi-interp.c (mi_new_thread, mi_thread_exit): Include + group id in the output. + +2008-11-17 Vladimir Prus + + Notification for attach/detach. + + * inferior.c: Call the process observers. + * mi/mi-interp.c (mi_new_inferior, mi_inferior_exit): New. + (mi_interpreter_init): Register the above. + +2008-11-17 Vladimir Prus + + Implement -list-thread-groups. + + * thread.c (print_thread_info): New parameter pid, to print + threads of specific process. + * gdbthread.h (print_thread_info): New parameter pid. + * mi/mi-cmds.c (mi_cmds): Register -list-thread-groups. + * mi/mi-cmds.h (mi_cmd_list_thread_groups): New. + * mi/mi-main.c (mi_cmd_thread_info): Adjust. + (print_one_process, mi_cmd_list_thread_groups): New. + +2008-11-16 Joel Brobecker + + Remove some unused macros related to the old load/unload catchpoints. + + * breakpoint.c (SOLIB_LOADED_LIBRARY_PATHNAME) + (SOLIB_UNLOADED_LIBRARY_PATHNAME, SOLIB_CREATE_CATCH_LOAD_HOOK) + (SOLIB_CREATE_CATCH_UNLOAD_HOOK): Delete. No longer used. + +2008-11-16 Joel Brobecker + + Remove support for catch load and catch unload commands. + + * breakpoint.h (enum bptype): Remove bp_catch_load and bp_catch_unload. + (struct breakpoint): Remove fields dll_pathname and + triggered_dll_pathname. + (bpstat_get_triggered_catchpoints, ep_is_shlib_catchpoint): Delete. + * breakpoint.c (ep_is_catchpoint): Remove handling of + bp_catch_load and bp_catch_unload. + (print_it_typical, bpstat_check_location, bpstat_what) + (print_one_breakpoint_location, print_one_breakpoint_location) + (user_settable_breakpoint, allocate_bp_location) + (set_raw_breakpoint_without_location, mention, delete_breakpoint, + (breakpoint_re_set_one, disable_command, enable_command): Likewise. + (ep_is_shlib_catchpoint, bpstat_get_triggered_catchpoints) + (catch_load_command_1, catch_unload_command_1): Delete. + (_initialize_breakpoint): Remove the "catch load" and "catch unload" + command creation. + * infrun.c (handle_inferior_event): Remove the handling of + load/unload catchpoint events. + +2008-11-15 Joel Brobecker + + From Jerome Guitton + * dwarf2read.c (dwarf2_debug_line_missing_end_sequence_complaint): + New function. + (dwarf_decode_lines): Detect null file numbers. Detect the end of + the line program sequence when no end sequence is emitted. + +2008-11-15 Joel Brobecker + + * ada-lang.c (ada_evaluate_subexp): Improve handling of integer + type dereferencing. + +2008-11-15 Daniel Jacobowitz + + * NEWS: Mention sparc64-linux-gnu gdbserver support. + +2008-11-14 Daniel Gutson + + * configure.tgt (sparc64-*-linux*): Added gdbserver support. + * regformats/reg-sparc64.dat: New file. + +2008-11-14 Tom Tromey + + PR mi/2549: + * mi/mi-main.c (get_register): Use get_formatted_print_options. + 2008-11-13 Joel Brobecker * printcmd.c: define PRINTF_HAS_LONG_LONG only if not yet defined. diff --git a/gdb/NEWS b/gdb/NEWS index 6f8fb65..ab94020 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -85,6 +85,9 @@ are treated as the standard definitions, regardless of context. - gdbserver uses the new noack protocol mode for TCP connections to reduce communications latency, if also supported and enabled in GDB. + - Support for the sparc64-linux-gnu target is now included in + gdbserver. + * Python scripting GDB now has support for scripting using Python. Whether this is diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 9fdd944..2ccba78 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -9204,12 +9204,18 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, arg1 = ada_coerce_ref (arg1); /* FIXME: What is this for?? */ type = ada_check_typedef (value_type (arg1)); - if (TYPE_CODE (type) == TYPE_CODE_INT && expect_type != NULL) - /* GDB allows dereferencing an int. We give it the expected - type (which will be set in the case of a coercion or - qualification). */ - return ada_value_ind (value_cast (lookup_pointer_type (expect_type), - arg1)); + if (TYPE_CODE (type) == TYPE_CODE_INT) + /* GDB allows dereferencing an int. If we were given + the expect_type, then use that as the target type. + Otherwise, assume that the target type is an int. */ + { + if (expect_type != NULL) + return ada_value_ind (value_cast (lookup_pointer_type (expect_type), + arg1)); + else + return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int, + (CORE_ADDR) value_as_address (arg1)); + } if (ada_is_array_descriptor_type (type)) /* GDB allows dereferencing GNAT array descriptors. */ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ba3292e..4353c47 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -327,59 +327,6 @@ VEC(bp_location_p) *moribund_locations = NULL; int breakpoint_count; -/* This function returns a pointer to the string representation of the - pathname of the dynamically-linked library that has just been - loaded. - - This function must be used only when SOLIB_HAVE_LOAD_EVENT is TRUE, - or undefined results are guaranteed. - - This string's contents are only valid immediately after the - inferior has stopped in the dynamic linker hook, and becomes - invalid as soon as the inferior is continued. Clients should make - a copy of this string if they wish to continue the inferior and - then access the string. */ - -#ifndef SOLIB_LOADED_LIBRARY_PATHNAME -#define SOLIB_LOADED_LIBRARY_PATHNAME(pid) "" -#endif - -/* This function returns a pointer to the string representation of the - pathname of the dynamically-linked library that has just been - unloaded. - - This function must be used only when SOLIB_HAVE_UNLOAD_EVENT is - TRUE, or undefined results are guaranteed. - - This string's contents are only valid immediately after the - inferior has stopped in the dynamic linker hook, and becomes - invalid as soon as the inferior is continued. Clients should make - a copy of this string if they wish to continue the inferior and - then access the string. */ - -#ifndef SOLIB_UNLOADED_LIBRARY_PATHNAME -#define SOLIB_UNLOADED_LIBRARY_PATHNAME(pid) "" -#endif - -/* This function is called by the "catch load" command. It allows the - debugger to be notified by the dynamic linker when a specified - library file (or any library file, if filename is NULL) is loaded. */ - -#ifndef SOLIB_CREATE_CATCH_LOAD_HOOK -#define SOLIB_CREATE_CATCH_LOAD_HOOK(pid,tempflag,filename,cond_string) \ - error (_("catch of library loads not yet implemented on this platform")) -#endif - -/* This function is called by the "catch unload" command. It allows - the debugger to be notified by the dynamic linker when a specified - library file (or any library file, if filename is NULL) is - unloaded. */ - -#ifndef SOLIB_CREATE_CATCH_UNLOAD_HOOK -#define SOLIB_CREATE_CATCH_UNLOAD_HOOK(pid, tempflag, filename, cond_string) \ - error (_("catch of library unloads not yet implemented on this platform")) -#endif - /* Return whether a breakpoint is an active enabled breakpoint. */ static int breakpoint_enabled (struct breakpoint *b) @@ -1951,19 +1898,7 @@ breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid) int ep_is_catchpoint (struct breakpoint *ep) { - return (ep->type == bp_catchpoint) - || (ep->type == bp_catch_load) - || (ep->type == bp_catch_unload); - - /* ??rehrauer: Add more kinds here, as are implemented... */ -} - -int -ep_is_shlib_catchpoint (struct breakpoint *ep) -{ - return - (ep->type == bp_catch_load) - || (ep->type == bp_catch_unload); + return (ep->type == bp_catchpoint); } void @@ -2343,22 +2278,6 @@ print_it_typical (bpstat bs) return PRINT_NOTHING; break; - case bp_catch_load: - annotate_catchpoint (b->number); - printf_filtered (_("\nCatchpoint %d (loaded %s), "), - b->number, - b->triggered_dll_pathname); - return PRINT_SRC_AND_LOC; - break; - - case bp_catch_unload: - annotate_catchpoint (b->number); - printf_filtered (_("\nCatchpoint %d (unloaded %s), "), - b->number, - b->triggered_dll_pathname); - return PRINT_SRC_AND_LOC; - break; - case bp_watchpoint: case bp_hardware_watchpoint: annotate_watchpoint (b->number); @@ -2810,33 +2729,6 @@ bpstat_check_location (const struct bp_location *bl, CORE_ADDR bp_addr) return 0; } - /* Is this a catchpoint of a load or unload? If so, did we - get a load or unload of the specified library? If not, - ignore it. */ - if ((b->type == bp_catch_load) -#if defined(SOLIB_HAVE_LOAD_EVENT) - && (!SOLIB_HAVE_LOAD_EVENT (PIDGET (inferior_ptid)) - || ((b->dll_pathname != NULL) - && (strcmp (b->dll_pathname, - SOLIB_LOADED_LIBRARY_PATHNAME ( - PIDGET (inferior_ptid))) - != 0))) -#endif - ) - return 0; - - if ((b->type == bp_catch_unload) -#if defined(SOLIB_HAVE_UNLOAD_EVENT) - && (!SOLIB_HAVE_UNLOAD_EVENT (PIDGET (inferior_ptid)) - || ((b->dll_pathname != NULL) - && (strcmp (b->dll_pathname, - SOLIB_UNLOADED_LIBRARY_PATHNAME ( - PIDGET (inferior_ptid))) - != 0))) -#endif - ) - return 0; - if (b->type == bp_catchpoint) { gdb_assert (b->ops != NULL && b->ops->breakpoint_hit != NULL); @@ -3367,16 +3259,6 @@ bpstat_what (bpstat bs) case bp_overlay_event: bs_class = bp_nostop; break; - case bp_catch_load: - case bp_catch_unload: - /* Only if this catchpoint triggered should we cause the - step-out-of-dld behaviour. Otherwise, we ignore this - catchpoint. */ - if (bs->stop) - bs_class = catch_shlib_event; - else - bs_class = no_effect; - break; case bp_catchpoint: if (bs->stop) { @@ -3425,67 +3307,6 @@ bpstat_should_step (void) -/* Given a bpstat that records zero or more triggered eventpoints, this - function returns another bpstat which contains only the catchpoints - on that first list, if any. */ -void -bpstat_get_triggered_catchpoints (bpstat ep_list, bpstat *cp_list) -{ - struct bpstats root_bs[1]; - bpstat bs = root_bs; - struct breakpoint *ep; - char *dll_pathname; - - bpstat_clear (cp_list); - root_bs->next = NULL; - - for (; ep_list != NULL; ep_list = ep_list->next) - { - /* Is this eventpoint a catchpoint? If not, ignore it. */ - ep = ep_list->breakpoint_at->owner; - if (ep == NULL) - break; - if ((ep->type != bp_catch_load) && - (ep->type != bp_catch_unload)) - /* pai: (temp) ADD fork/vfork here!! */ - continue; - - /* Yes; add it to the list. */ - bs = bpstat_alloc (ep_list->breakpoint_at, bs); - *bs = *ep_list; - bs->next = NULL; - bs = root_bs->next; - -#if defined(SOLIB_ADD) - /* Also, for each triggered catchpoint, tag it with the name of - the library that caused this trigger. (We copy the name now, - because it's only guaranteed to be available NOW, when the - catchpoint triggers. Clients who may wish to know the name - later must get it from the catchpoint itself.) */ - if (ep->triggered_dll_pathname != NULL) - xfree (ep->triggered_dll_pathname); - if (ep->type == bp_catch_load) - dll_pathname = SOLIB_LOADED_LIBRARY_PATHNAME ( - PIDGET (inferior_ptid)); - else - dll_pathname = SOLIB_UNLOADED_LIBRARY_PATHNAME ( - PIDGET (inferior_ptid)); -#else - dll_pathname = NULL; -#endif - if (dll_pathname) - { - ep->triggered_dll_pathname = (char *) - xmalloc (strlen (dll_pathname) + 1); - strcpy (ep->triggered_dll_pathname, dll_pathname); - } - else - ep->triggered_dll_pathname = NULL; - } - - *cp_list = bs; -} - static void print_breakpoint_location (struct breakpoint *b, struct bp_location *loc, char *wrap_indent, @@ -3562,8 +3383,6 @@ print_one_breakpoint_location (struct breakpoint *b, {bp_thread_event, "thread events"}, {bp_overlay_event, "overlay events"}, {bp_catchpoint, "catchpoint"}, - {bp_catch_load, "catch load"}, - {bp_catch_unload, "catch unload"}, {bp_entry_breakpoint, "entry breakpoint"} }; @@ -3680,27 +3499,6 @@ print_one_breakpoint_location (struct breakpoint *b, ui_out_field_stream (uiout, "what", stb); break; - case bp_catch_load: - case bp_catch_unload: - /* Field 4, the address, is omitted (which makes the columns - not line up too nicely with the headers, but the effect - is relatively readable). */ - if (opts.addressprint) - ui_out_field_skip (uiout, "addr"); - annotate_field (5); - if (b->dll_pathname == NULL) - { - ui_out_field_string (uiout, "what", ""); - ui_out_spaces (uiout, 1); - } - else - { - ui_out_text (uiout, "library \""); - ui_out_field_string (uiout, "what", b->dll_pathname); - ui_out_text (uiout, "\" "); - } - break; - case bp_breakpoint: case bp_hardware_breakpoint: case bp_until: @@ -3899,8 +3697,6 @@ user_settable_breakpoint (const struct breakpoint *b) { return (b->type == bp_breakpoint || b->type == bp_catchpoint - || b->type == bp_catch_load - || b->type == bp_catch_unload || b->type == bp_hardware_breakpoint || b->type == bp_watchpoint || b->type == bp_read_watchpoint @@ -4290,8 +4086,6 @@ allocate_bp_location (struct breakpoint *bpt, enum bptype bp_type) case bp_entry_breakpoint: case bp_thread_event: case bp_overlay_event: - case bp_catch_load: - case bp_catch_unload: loc->loc_type = bp_loc_software_breakpoint; break; case bp_hardware_breakpoint: @@ -4345,8 +4139,6 @@ set_raw_breakpoint_without_location (enum bptype bptype) b->ignore_count = 0; b->commands = NULL; b->frame_id = null_frame_id; - b->dll_pathname = NULL; hooks/post-receive -- Repository for Project Archer.