diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 18 | ||||
| -rw-r--r-- | gdb/gnu-nat.c | 32 | ||||
| -rw-r--r-- | gdb/monitor.c | 39 | ||||
| -rw-r--r-- | gdb/ppc-bdm.c | 34 | ||||
| -rw-r--r-- | gdb/remote-array.c | 37 | ||||
| -rw-r--r-- | gdb/remote-e7000.c | 35 | ||||
| -rw-r--r-- | gdb/remote-es.c | 80 | ||||
| -rw-r--r-- | gdb/remote-rdp.c | 36 | ||||
| -rw-r--r-- | gdb/remote-sim.c | 35 | ||||
| -rw-r--r-- | gdb/remote-st.c | 37 | ||||
| -rw-r--r-- | gdb/sol-thread.c | 21 | ||||
| -rw-r--r-- | gdb/v850ice.c | 19 | ||||
| -rw-r--r-- | gdb/win32-nat.c | 6 | ||||
| -rw-r--r-- | gdb/wince.c | 2 | ||||
| -rw-r--r-- | gdb/windows-nat.c | 6 |
15 files changed, 18 insertions, 419 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2299e64..67a160d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2002-11-12 Daniel Jacobowitz <drow@mvista.com> + + * gnu-nat.c (init_gnu_ops): Remove NULL initializations. + * monitor.c (init_base_monitor_ops): Likewise. + * ppc-bdm.c (init_bdm_ppc_ops): Likewise. + * remote-array.c (init_array_ops): Likewise. + * remote-e7000.c (init_e7000_ops): Likewise. + * remote-es.c (init_es1800_ops): Likewise. + (init_es1800_child_ops): Likewise. + * remote-rdp.c (init_remote_rdp_ops): Likewise. + * remote-sim.c (init_gdbsim_ops): Likewise. + * remote-st.c (init_st2000_ops): Likewise. + * sol-thread.c (init_sol_core_ops): Likewise. + (init_sol_thread_ops): Likewise. + * v850ice.c (init_850ice_ops): Likewise. + * win32-nat.c (init_child_ops): Likewise. + * wince.c (init_child_ops): Likewise. + 2002-11-12 Andrew Cagney <ac131313@redhat.com> * utils.c (gdb_realpath): Make rp a constant pointer. diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index e332dba..8be456f 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -2592,21 +2592,15 @@ init_gnu_ops (void) gnu_ops.to_longname = "GNU Hurd process"; /* to_longname */ gnu_ops.to_doc = "GNU Hurd process"; /* to_doc */ gnu_ops.to_open = gnu_open; /* to_open */ - gnu_ops.to_close = 0; /* to_close */ gnu_ops.to_attach = gnu_attach; /* to_attach */ - gnu_ops.to_post_attach = NULL; - gnu_ops.to_require_attach = NULL; /* to_require_attach */ gnu_ops.to_detach = gnu_detach; /* to_detach */ - gnu_ops.to_require_detach = NULL; /* to_require_detach */ gnu_ops.to_resume = gnu_resume; /* to_resume */ gnu_ops.to_wait = gnu_wait; /* to_wait */ - gnu_ops.to_post_wait = NULL; /* to_post_wait */ gnu_ops.to_fetch_registers = gnu_fetch_registers; /* to_fetch_registers */ gnu_ops.to_store_registers = gnu_store_registers; /* to_store_registers */ gnu_ops.to_prepare_to_store = gnu_prepare_to_store; /* to_prepare_to_store */ gnu_ops.to_xfer_memory = gnu_xfer_memory; /* to_xfer_memory */ gnu_ops.to_find_memory_regions = gnu_find_memory_regions; - gnu_ops.to_files_info = 0; /* to_files_info */ gnu_ops.to_insert_breakpoint = memory_insert_breakpoint; gnu_ops.to_remove_breakpoint = memory_remove_breakpoint; gnu_ops.to_terminal_init = gnu_terminal_init_inferior; @@ -2616,45 +2610,19 @@ init_gnu_ops (void) gnu_ops.to_terminal_ours = terminal_ours; gnu_ops.to_terminal_info = child_terminal_info; gnu_ops.to_kill = gnu_kill_inferior; /* to_kill */ - gnu_ops.to_load = 0; /* to_load */ - gnu_ops.to_lookup_symbol = 0; /* to_lookup_symbol */ gnu_ops.to_create_inferior = gnu_create_inferior; /* to_create_inferior */ - gnu_ops.to_post_startup_inferior = NULL; /* to_post_startup_inferior */ - /* to_acknowledge_created_inferior */ - gnu_ops.to_acknowledge_created_inferior = NULL; - /* to_clone_and_follow_inferior */ - gnu_ops.to_clone_and_follow_inferior = NULL; - /* to_post_follow_inferior_by_clone */ - gnu_ops.to_post_follow_inferior_by_clone = NULL; - gnu_ops.to_insert_fork_catchpoint = NULL; - gnu_ops.to_remove_fork_catchpoint = NULL; - gnu_ops.to_insert_vfork_catchpoint = NULL; - gnu_ops.to_remove_vfork_catchpoint = NULL; - gnu_ops.to_has_forked = NULL; /* to_has_forked */ - gnu_ops.to_has_vforked = NULL; /* to_has_vforked */ - gnu_ops.to_can_follow_vfork_prior_to_exec = NULL; - gnu_ops.to_post_follow_vfork = NULL; /* to_post_follow_vfork */ - gnu_ops.to_insert_exec_catchpoint = NULL; - gnu_ops.to_remove_exec_catchpoint = NULL; - gnu_ops.to_has_execd = NULL; - gnu_ops.to_reported_exec_events_per_exec_call = NULL; - gnu_ops.to_has_exited = NULL; gnu_ops.to_mourn_inferior = gnu_mourn_inferior; /* to_mourn_inferior */ gnu_ops.to_can_run = gnu_can_run; /* to_can_run */ - gnu_ops.to_notice_signals = 0; /* to_notice_signals */ gnu_ops.to_thread_alive = gnu_thread_alive; /* to_thread_alive */ gnu_ops.to_pid_to_str = gnu_pid_to_str; /* to_pid_to_str */ gnu_ops.to_stop = gnu_stop; /* to_stop */ gnu_ops.to_pid_to_exec_file = gnu_pid_to_exec_file; /* to_pid_to_exec_file */ gnu_ops.to_stratum = process_stratum; /* to_stratum */ - gnu_ops.DONT_USE = 0; /* to_next */ gnu_ops.to_has_all_memory = 1; /* to_has_all_memory */ gnu_ops.to_has_memory = 1; /* to_has_memory */ gnu_ops.to_has_stack = 1; /* to_has_stack */ gnu_ops.to_has_registers = 1; /* to_has_registers */ gnu_ops.to_has_execution = 1; /* to_has_execution */ - gnu_ops.to_sections = 0; /* sections */ - gnu_ops.to_sections_end = 0; /* sections_end */ gnu_ops.to_magic = OPS_MAGIC; /* to_magic */ } /* init_gnu_ops */ diff --git a/gdb/monitor.c b/gdb/monitor.c index 559c0a2..5a9bb60 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -2294,19 +2294,10 @@ static struct target_ops monitor_ops; static void init_base_monitor_ops (void) { - monitor_ops.to_shortname = NULL; - monitor_ops.to_longname = NULL; - monitor_ops.to_doc = NULL; - monitor_ops.to_open = NULL; monitor_ops.to_close = monitor_close; - monitor_ops.to_attach = NULL; - monitor_ops.to_post_attach = NULL; - monitor_ops.to_require_attach = NULL; monitor_ops.to_detach = monitor_detach; - monitor_ops.to_require_detach = NULL; monitor_ops.to_resume = monitor_resume; monitor_ops.to_wait = monitor_wait; - monitor_ops.to_post_wait = NULL; monitor_ops.to_fetch_registers = monitor_fetch_registers; monitor_ops.to_store_registers = monitor_store_registers; monitor_ops.to_prepare_to_store = monitor_prepare_to_store; @@ -2314,48 +2305,18 @@ init_base_monitor_ops (void) monitor_ops.to_files_info = monitor_files_info; monitor_ops.to_insert_breakpoint = monitor_insert_breakpoint; monitor_ops.to_remove_breakpoint = monitor_remove_breakpoint; - monitor_ops.to_terminal_init = 0; - monitor_ops.to_terminal_inferior = 0; - monitor_ops.to_terminal_ours_for_output = 0; - monitor_ops.to_terminal_ours = 0; - monitor_ops.to_terminal_info = 0; monitor_ops.to_kill = monitor_kill; monitor_ops.to_load = monitor_load; - monitor_ops.to_lookup_symbol = 0; monitor_ops.to_create_inferior = monitor_create_inferior; - monitor_ops.to_post_startup_inferior = NULL; - monitor_ops.to_acknowledge_created_inferior = NULL; - monitor_ops.to_clone_and_follow_inferior = NULL; - monitor_ops.to_post_follow_inferior_by_clone = NULL; - monitor_ops.to_insert_fork_catchpoint = NULL; - monitor_ops.to_remove_fork_catchpoint = NULL; - monitor_ops.to_insert_vfork_catchpoint = NULL; - monitor_ops.to_remove_vfork_catchpoint = NULL; - monitor_ops.to_has_forked = NULL; - monitor_ops.to_has_vforked = NULL; - monitor_ops.to_can_follow_vfork_prior_to_exec = NULL; - monitor_ops.to_post_follow_vfork = NULL; - monitor_ops.to_insert_exec_catchpoint = NULL; - monitor_ops.to_remove_exec_catchpoint = NULL; - monitor_ops.to_has_execd = NULL; - monitor_ops.to_reported_exec_events_per_exec_call = NULL; - monitor_ops.to_has_exited = NULL; monitor_ops.to_mourn_inferior = monitor_mourn_inferior; - monitor_ops.to_can_run = 0; - monitor_ops.to_notice_signals = 0; - monitor_ops.to_thread_alive = 0; monitor_ops.to_stop = monitor_stop; monitor_ops.to_rcmd = monitor_rcmd; - monitor_ops.to_pid_to_exec_file = NULL; monitor_ops.to_stratum = process_stratum; - monitor_ops.DONT_USE = 0; monitor_ops.to_has_all_memory = 1; monitor_ops.to_has_memory = 1; monitor_ops.to_has_stack = 1; monitor_ops.to_has_registers = 1; monitor_ops.to_has_execution = 1; - monitor_ops.to_sections = 0; - monitor_ops.to_sections_end = 0; monitor_ops.to_magic = OPS_MAGIC; } /* init_base_monitor_ops */ diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c index 0797e0d..7631e95 100644 --- a/gdb/ppc-bdm.c +++ b/gdb/ppc-bdm.c @@ -321,14 +321,9 @@ a wiggler, specify wiggler and then the port it is connected to\n\ (e.g. wiggler lpt1)."; /* to_doc */ bdm_ppc_ops.to_open = bdm_ppc_open; bdm_ppc_ops.to_close = ocd_close; - bdm_ppc_ops.to_attach = NULL; - bdm_ppc_ops.to_post_attach = NULL; - bdm_ppc_ops.to_require_attach = NULL; bdm_ppc_ops.to_detach = ocd_detach; - bdm_ppc_ops.to_require_detach = NULL; bdm_ppc_ops.to_resume = ocd_resume; bdm_ppc_ops.to_wait = bdm_ppc_wait; - bdm_ppc_ops.to_post_wait = NULL; bdm_ppc_ops.to_fetch_registers = bdm_ppc_fetch_registers; bdm_ppc_ops.to_store_registers = bdm_ppc_store_registers; bdm_ppc_ops.to_prepare_to_store = ocd_prepare_to_store; @@ -336,47 +331,18 @@ a wiggler, specify wiggler and then the port it is connected to\n\ bdm_ppc_ops.to_files_info = ocd_files_info; bdm_ppc_ops.to_insert_breakpoint = ocd_insert_breakpoint; bdm_ppc_ops.to_remove_breakpoint = ocd_remove_breakpoint; - bdm_ppc_ops.to_terminal_init = NULL; - bdm_ppc_ops.to_terminal_inferior = NULL; - bdm_ppc_ops.to_terminal_ours_for_output = NULL; - bdm_ppc_ops.to_terminal_ours = NULL; - bdm_ppc_ops.to_terminal_info = NULL; bdm_ppc_ops.to_kill = ocd_kill; bdm_ppc_ops.to_load = ocd_load; - bdm_ppc_ops.to_lookup_symbol = NULL; bdm_ppc_ops.to_create_inferior = ocd_create_inferior; - bdm_ppc_ops.to_post_startup_inferior = NULL; - bdm_ppc_ops.to_acknowledge_created_inferior = NULL; - bdm_ppc_ops.to_clone_and_follow_inferior = NULL; - bdm_ppc_ops.to_post_follow_inferior_by_clone = NULL; - bdm_ppc_ops.to_insert_fork_catchpoint = NULL; - bdm_ppc_ops.to_remove_fork_catchpoint = NULL; - bdm_ppc_ops.to_insert_vfork_catchpoint = NULL; - bdm_ppc_ops.to_remove_vfork_catchpoint = NULL; - bdm_ppc_ops.to_has_forked = NULL; - bdm_ppc_ops.to_has_vforked = NULL; - bdm_ppc_ops.to_can_follow_vfork_prior_to_exec = NULL; - bdm_ppc_ops.to_post_follow_vfork = NULL; - bdm_ppc_ops.to_insert_exec_catchpoint = NULL; - bdm_ppc_ops.to_remove_exec_catchpoint = NULL; - bdm_ppc_ops.to_has_execd = NULL; - bdm_ppc_ops.to_reported_exec_events_per_exec_call = NULL; - bdm_ppc_ops.to_has_exited = NULL; bdm_ppc_ops.to_mourn_inferior = ocd_mourn; - bdm_ppc_ops.to_can_run = 0; - bdm_ppc_ops.to_notice_signals = 0; bdm_ppc_ops.to_thread_alive = ocd_thread_alive; bdm_ppc_ops.to_stop = ocd_stop; - bdm_ppc_ops.to_pid_to_exec_file = NULL; bdm_ppc_ops.to_stratum = process_stratum; - bdm_ppc_ops.DONT_USE = NULL; bdm_ppc_ops.to_has_all_memory = 1; bdm_ppc_ops.to_has_memory = 1; bdm_ppc_ops.to_has_stack = 1; bdm_ppc_ops.to_has_registers = 1; bdm_ppc_ops.to_has_execution = 1; - bdm_ppc_ops.to_sections = NULL; - bdm_ppc_ops.to_sections_end = NULL; bdm_ppc_ops.to_magic = OPS_MAGIC; } /* init_bdm_ppc_ops */ diff --git a/gdb/remote-array.c b/gdb/remote-array.c index ed0c40e..da9bfc7 100644 --- a/gdb/remote-array.c +++ b/gdb/remote-array.c @@ -115,14 +115,9 @@ init_array_ops (void) Specify the serial device it is connected to (e.g. /dev/ttya)."; array_ops.to_open = array_open; array_ops.to_close = array_close; - array_ops.to_attach = NULL; - array_ops.to_post_attach = NULL; - array_ops.to_require_attach = NULL; array_ops.to_detach = array_detach; - array_ops.to_require_detach = NULL; array_ops.to_resume = array_resume; array_ops.to_wait = array_wait; - array_ops.to_post_wait = NULL; array_ops.to_fetch_registers = array_fetch_registers; array_ops.to_store_registers = array_store_registers; array_ops.to_prepare_to_store = array_prepare_to_store; @@ -130,47 +125,15 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; array_ops.to_files_info = array_files_info; array_ops.to_insert_breakpoint = array_insert_breakpoint; array_ops.to_remove_breakpoint = array_remove_breakpoint; - array_ops.to_terminal_init = 0; - array_ops.to_terminal_inferior = 0; - array_ops.to_terminal_ours_for_output = 0; - array_ops.to_terminal_ours = 0; - array_ops.to_terminal_info = 0; array_ops.to_kill = array_kill; - array_ops.to_load = 0; - array_ops.to_lookup_symbol = 0; array_ops.to_create_inferior = array_create_inferior; - array_ops.to_post_startup_inferior = NULL; - array_ops.to_acknowledge_created_inferior = NULL; - array_ops.to_clone_and_follow_inferior = NULL; - array_ops.to_post_follow_inferior_by_clone = NULL; - array_ops.to_insert_fork_catchpoint = NULL; - array_ops.to_remove_fork_catchpoint = NULL; - array_ops.to_insert_vfork_catchpoint = NULL; - array_ops.to_remove_vfork_catchpoint = NULL; - array_ops.to_has_forked = NULL; - array_ops.to_has_vforked = NULL; - array_ops.to_can_follow_vfork_prior_to_exec = NULL; - array_ops.to_post_follow_vfork = NULL; - array_ops.to_insert_exec_catchpoint = NULL; - array_ops.to_remove_exec_catchpoint = NULL; - array_ops.to_has_execd = NULL; - array_ops.to_reported_exec_events_per_exec_call = NULL; - array_ops.to_has_exited = NULL; array_ops.to_mourn_inferior = array_mourn_inferior; - array_ops.to_can_run = 0; - array_ops.to_notice_signals = 0; - array_ops.to_thread_alive = 0; - array_ops.to_stop = 0; - array_ops.to_pid_to_exec_file = NULL; array_ops.to_stratum = process_stratum; - array_ops.DONT_USE = 0; array_ops.to_has_all_memory = 1; array_ops.to_has_memory = 1; array_ops.to_has_stack = 1; array_ops.to_has_registers = 1; array_ops.to_has_execution = 1; - array_ops.to_sections = 0; - array_ops.to_sections_end = 0; array_ops.to_magic = OPS_MAGIC; }; diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c index d9cf5e8..33e5c00 100644 --- a/gdb/remote-e7000.c +++ b/gdb/remote-e7000.c @@ -2143,14 +2143,9 @@ target e7000 /dev/ttya 9600\n\ target e7000 foobar"; e7000_ops.to_open = e7000_open; e7000_ops.to_close = e7000_close; - e7000_ops.to_attach = 0; - e7000_ops.to_post_attach = NULL; - e7000_ops.to_require_attach = NULL; e7000_ops.to_detach = e7000_detach; - e7000_ops.to_require_detach = NULL; e7000_ops.to_resume = e7000_resume; e7000_ops.to_wait = e7000_wait; - e7000_ops.to_post_wait = NULL; e7000_ops.to_fetch_registers = e7000_fetch_register; e7000_ops.to_store_registers = e7000_store_register; e7000_ops.to_prepare_to_store = e7000_prepare_to_store; @@ -2158,47 +2153,17 @@ target e7000 foobar"; e7000_ops.to_files_info = e7000_files_info; e7000_ops.to_insert_breakpoint = e7000_insert_breakpoint; e7000_ops.to_remove_breakpoint = e7000_remove_breakpoint; - e7000_ops.to_terminal_init = 0; - e7000_ops.to_terminal_inferior = 0; - e7000_ops.to_terminal_ours_for_output = 0; - e7000_ops.to_terminal_ours = 0; - e7000_ops.to_terminal_info = 0; e7000_ops.to_kill = e7000_kill; e7000_ops.to_load = e7000_load; - e7000_ops.to_lookup_symbol = 0; e7000_ops.to_create_inferior = e7000_create_inferior; - e7000_ops.to_post_startup_inferior = NULL; - e7000_ops.to_acknowledge_created_inferior = NULL; - e7000_ops.to_clone_and_follow_inferior = NULL; - e7000_ops.to_post_follow_inferior_by_clone = NULL; - e7000_ops.to_insert_fork_catchpoint = NULL; - e7000_ops.to_remove_fork_catchpoint = NULL; - e7000_ops.to_insert_vfork_catchpoint = NULL; - e7000_ops.to_remove_vfork_catchpoint = NULL; - e7000_ops.to_has_forked = NULL; - e7000_ops.to_has_vforked = NULL; - e7000_ops.to_can_follow_vfork_prior_to_exec = NULL; - e7000_ops.to_post_follow_vfork = NULL; - e7000_ops.to_insert_exec_catchpoint = NULL; - e7000_ops.to_remove_exec_catchpoint = NULL; - e7000_ops.to_has_execd = NULL; - e7000_ops.to_reported_exec_events_per_exec_call = NULL; - e7000_ops.to_has_exited = NULL; e7000_ops.to_mourn_inferior = e7000_mourn_inferior; - e7000_ops.to_can_run = 0; - e7000_ops.to_notice_signals = 0; - e7000_ops.to_thread_alive = 0; e7000_ops.to_stop = e7000_stop; - e7000_ops.to_pid_to_exec_file = NULL; e7000_ops.to_stratum = process_stratum; - e7000_ops.DONT_USE = 0; e7000_ops.to_has_all_memory = 1; e7000_ops.to_has_memory = 1; e7000_ops.to_has_stack = 1; e7000_ops.to_has_registers = 1; e7000_ops.to_has_execution = 1; - e7000_ops.to_sections = 0; - e7000_ops.to_sections_end = 0; e7000_ops.to_magic = OPS_MAGIC; }; diff --git a/gdb/remote-es.c b/gdb/remote-es.c index 24183cc..452e02e 100644 --- a/gdb/remote-es.c +++ b/gdb/remote-es.c @@ -1981,61 +1981,17 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; es1800_ops.to_open = es1800_open; es1800_ops.to_close = es1800_close; es1800_ops.to_attach = es1800_attach; - es1800_ops.to_post_attach = NULL; - es1800_ops.to_require_attach = NULL; es1800_ops.to_detach = es1800_detach; - es1800_ops.to_require_detach = NULL; es1800_ops.to_resume = es1800_resume; - es1800_ops.to_wait = NULL; - es1800_ops.to_post_wait = NULL; - es1800_ops.to_fetch_registers = NULL; - es1800_ops.to_store_registers = NULL; es1800_ops.to_prepare_to_store = es1800_prepare_to_store; es1800_ops.to_xfer_memory = es1800_xfer_inferior_memory; es1800_ops.to_files_info = es1800_files_info; es1800_ops.to_insert_breakpoint = es1800_insert_breakpoint; es1800_ops.to_remove_breakpoint = es1800_remove_breakpoint; - es1800_ops.to_terminal_init = NULL; - es1800_ops.to_terminal_inferior = NULL; - es1800_ops.to_terminal_ours_for_output = NULL; - es1800_ops.to_terminal_ours = NULL; - es1800_ops.to_terminal_info = NULL; - es1800_ops.to_kill = NULL; es1800_ops.to_load = es1800_load; - es1800_ops.to_lookup_symbol = NULL; es1800_ops.to_create_inferior = es1800_create_inferior; - es1800_ops.to_post_startup_inferior = NULL; - es1800_ops.to_acknowledge_created_inferior = NULL; - es1800_ops.to_clone_and_follow_inferior = NULL; - es1800_ops.to_post_follow_inferior_by_clone = NULL; - es1800_ops.to_insert_fork_catchpoint = NULL; - es1800_ops.to_remove_fork_catchpoint = NULL; - es1800_ops.to_insert_vfork_catchpoint = NULL; - es1800_ops.to_remove_vfork_catchpoint = NULL; - es1800_ops.to_has_forked = NULL; - es1800_ops.to_has_vforked = NULL; - es1800_ops.to_can_follow_vfork_prior_to_exec = NULL; - es1800_ops.to_post_follow_vfork = NULL; - es1800_ops.to_insert_exec_catchpoint = NULL; - es1800_ops.to_remove_exec_catchpoint = NULL; - es1800_ops.to_has_execd = NULL; - es1800_ops.to_reported_exec_events_per_exec_call = NULL; - es1800_ops.to_has_exited = NULL; - es1800_ops.to_mourn_inferior = NULL; - es1800_ops.to_can_run = 0; - es1800_ops.to_notice_signals = 0; - es1800_ops.to_thread_alive = 0; - es1800_ops.to_stop = 0; - es1800_ops.to_pid_to_exec_file = NULL; es1800_ops.to_stratum = core_stratum; - es1800_ops.DONT_USE = 0; - es1800_ops.to_has_all_memory = 0; es1800_ops.to_has_memory = 1; - es1800_ops.to_has_stack = 0; - es1800_ops.to_has_registers = 0; - es1800_ops.to_has_execution = 0; - es1800_ops.to_sections = NULL; - es1800_ops.to_sections_end = NULL; es1800_ops.to_magic = OPS_MAGIC; } @@ -2051,15 +2007,10 @@ init_es1800_child_ops (void) es1800_child_ops.to_doc = "Remote debugging on the es1800 emulator via a serial line.\n\ Specify the serial device it is connected to (e.g. /dev/ttya)."; es1800_child_ops.to_open = es1800_child_open; - es1800_child_ops.to_close = NULL; es1800_child_ops.to_attach = es1800_attach; - es1800_child_ops.to_post_attach = NULL; - es1800_child_ops.to_require_attach = NULL; es1800_child_ops.to_detach = es1800_child_detach; - es1800_child_ops.to_require_detach = NULL; es1800_child_ops.to_resume = es1800_resume; es1800_child_ops.to_wait = es1800_wait; - es1800_child_ops.to_post_wait = NULL; es1800_child_ops.to_fetch_registers = es1800_fetch_register; es1800_child_ops.to_store_registers = es1800_store_register; es1800_child_ops.to_prepare_to_store = es1800_prepare_to_store; @@ -2067,47 +2018,16 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; es1800_child_ops.to_files_info = es1800_files_info; es1800_child_ops.to_insert_breakpoint = es1800_insert_breakpoint; es1800_child_ops.to_remove_breakpoint = es1800_remove_breakpoint; - es1800_child_ops.to_terminal_init = NULL; - es1800_child_ops.to_terminal_inferior = NULL; - es1800_child_ops.to_terminal_ours_for_output = NULL; - es1800_child_ops.to_terminal_ours = NULL; - es1800_child_ops.to_terminal_info = NULL; es1800_child_ops.to_kill = es1800_kill; es1800_child_ops.to_load = es1800_load; - es1800_child_ops.to_lookup_symbol = NULL; es1800_child_ops.to_create_inferior = es1800_create_inferior; - es1800_child_ops.to_post_startup_inferior = NULL; - es1800_child_ops.to_acknowledge_created_inferior = NULL; - es1800_child_ops.to_clone_and_follow_inferior = NULL; - es1800_child_ops.to_post_follow_inferior_by_clone = NULL; - es1800_child_ops.to_insert_fork_catchpoint = NULL; - es1800_child_ops.to_remove_fork_catchpoint = NULL; - es1800_child_ops.to_insert_vfork_catchpoint = NULL; - es1800_child_ops.to_remove_vfork_catchpoint = NULL; - es1800_child_ops.to_has_forked = NULL; - es1800_child_ops.to_has_vforked = NULL; - es1800_child_ops.to_can_follow_vfork_prior_to_exec = NULL; - es1800_child_ops.to_post_follow_vfork = NULL; - es1800_child_ops.to_insert_exec_catchpoint = NULL; - es1800_child_ops.to_remove_exec_catchpoint = NULL; - es1800_child_ops.to_has_execd = NULL; - es1800_child_ops.to_reported_exec_events_per_exec_call = NULL; - es1800_child_ops.to_has_exited = NULL; es1800_child_ops.to_mourn_inferior = es1800_mourn_inferior; - es1800_child_ops.to_can_run = 0; - es1800_child_ops.to_notice_signals = 0; - es1800_child_ops.to_thread_alive = 0; - es1800_child_ops.to_stop = 0; - es1800_child_ops.to_pid_to_exec_file = NULL; es1800_child_ops.to_stratum = process_stratum; - es1800_child_ops.DONT_USE = 0; es1800_child_ops.to_has_all_memory = 1; es1800_child_ops.to_has_memory = 1; es1800_child_ops.to_has_stack = 1; es1800_child_ops.to_has_registers = 1; es1800_child_ops.to_has_execution = 1; - es1800_child_ops.to_sections = NULL; - es1800_child_ops.to_sections_end = NULL; es1800_child_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c index 07b340b..20ed516 100644 --- a/gdb/remote-rdp.c +++ b/gdb/remote-rdp.c @@ -1383,13 +1383,8 @@ init_remote_rdp_ops (void) remote_rdp_ops.to_open = remote_rdp_open; remote_rdp_ops.to_close = remote_rdp_close; remote_rdp_ops.to_attach = remote_rdp_attach; - remote_rdp_ops.to_post_attach = NULL; - remote_rdp_ops.to_require_attach = NULL; - remote_rdp_ops.to_detach = NULL; - remote_rdp_ops.to_require_detach = NULL; remote_rdp_ops.to_resume = remote_rdp_resume; remote_rdp_ops.to_wait = remote_rdp_wait; - remote_rdp_ops.to_post_wait = NULL; remote_rdp_ops.to_fetch_registers = remote_rdp_fetch_register; remote_rdp_ops.to_store_registers = remote_rdp_store_register; remote_rdp_ops.to_prepare_to_store = remote_rdp_prepare_to_store; @@ -1397,47 +1392,16 @@ init_remote_rdp_ops (void) remote_rdp_ops.to_files_info = remote_rdp_files_info; remote_rdp_ops.to_insert_breakpoint = remote_rdp_insert_breakpoint; remote_rdp_ops.to_remove_breakpoint = remote_rdp_remove_breakpoint; - remote_rdp_ops.to_terminal_init = NULL; - remote_rdp_ops.to_terminal_inferior = NULL; - remote_rdp_ops.to_terminal_ours_for_output = NULL; - remote_rdp_ops.to_terminal_ours = NULL; - remote_rdp_ops.to_terminal_info = NULL; remote_rdp_ops.to_kill = remote_rdp_kill; remote_rdp_ops.to_load = generic_load; - remote_rdp_ops.to_lookup_symbol = NULL; remote_rdp_ops.to_create_inferior = remote_rdp_create_inferior; - remote_rdp_ops.to_post_startup_inferior = NULL; - remote_rdp_ops.to_acknowledge_created_inferior = NULL; - remote_rdp_ops.to_clone_and_follow_inferior = NULL; - remote_rdp_ops.to_post_follow_inferior_by_clone = NULL; - remote_rdp_ops.to_insert_fork_catchpoint = NULL; - remote_rdp_ops.to_remove_fork_catchpoint = NULL; - remote_rdp_ops.to_insert_vfork_catchpoint = NULL; - remote_rdp_ops.to_remove_vfork_catchpoint = NULL; - remote_rdp_ops.to_has_forked = NULL; - remote_rdp_ops.to_has_vforked = NULL; - remote_rdp_ops.to_can_follow_vfork_prior_to_exec = NULL; - remote_rdp_ops.to_post_follow_vfork = NULL; - remote_rdp_ops.to_insert_exec_catchpoint = NULL; - remote_rdp_ops.to_remove_exec_catchpoint = NULL; - remote_rdp_ops.to_has_execd = NULL; - remote_rdp_ops.to_reported_exec_events_per_exec_call = NULL; - remote_rdp_ops.to_has_exited = NULL; remote_rdp_ops.to_mourn_inferior = generic_mourn_inferior; - remote_rdp_ops.to_can_run = NULL; - remote_rdp_ops.to_notice_signals = 0; - remote_rdp_ops.to_thread_alive = 0; - remote_rdp_ops.to_stop = 0; - remote_rdp_ops.to_pid_to_exec_file = NULL; remote_rdp_ops.to_stratum = process_stratum; - remote_rdp_ops.DONT_USE = NULL; remote_rdp_ops.to_has_all_memory = 1; remote_rdp_ops.to_has_memory = 1; remote_rdp_ops.to_has_stack = 1; remote_rdp_ops.to_has_registers = 1; remote_rdp_ops.to_has_execution = 1; - remote_rdp_ops.to_sections = NULL; - remote_rdp_ops.to_sections_end = NULL; remote_rdp_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index c2c435c..3e2a7cd 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -897,14 +897,9 @@ init_gdbsim_ops (void) gdbsim_ops.to_doc = "Use the compiled-in simulator."; gdbsim_ops.to_open = gdbsim_open; gdbsim_ops.to_close = gdbsim_close; - gdbsim_ops.to_attach = NULL; - gdbsim_ops.to_post_attach = NULL; - gdbsim_ops.to_require_attach = NULL; gdbsim_ops.to_detach = gdbsim_detach; - gdbsim_ops.to_require_detach = NULL; gdbsim_ops.to_resume = gdbsim_resume; gdbsim_ops.to_wait = gdbsim_wait; - gdbsim_ops.to_post_wait = NULL; gdbsim_ops.to_fetch_registers = gdbsim_fetch_register; gdbsim_ops.to_store_registers = gdbsim_store_register; gdbsim_ops.to_prepare_to_store = gdbsim_prepare_to_store; @@ -912,47 +907,17 @@ init_gdbsim_ops (void) gdbsim_ops.to_files_info = gdbsim_files_info; gdbsim_ops.to_insert_breakpoint = gdbsim_insert_breakpoint; gdbsim_ops.to_remove_breakpoint = gdbsim_remove_breakpoint; - gdbsim_ops.to_terminal_init = NULL; - gdbsim_ops.to_terminal_inferior = NULL; - gdbsim_ops.to_terminal_ours_for_output = NULL; - gdbsim_ops.to_terminal_ours = NULL; - gdbsim_ops.to_terminal_info = NULL; gdbsim_ops.to_kill = gdbsim_kill; gdbsim_ops.to_load = gdbsim_load; - gdbsim_ops.to_lookup_symbol = NULL; gdbsim_ops.to_create_inferior = gdbsim_create_inferior; - gdbsim_ops.to_post_startup_inferior = NULL; - gdbsim_ops.to_acknowledge_created_inferior = NULL; - gdbsim_ops.to_clone_and_follow_inferior = NULL; - gdbsim_ops.to_post_follow_inferior_by_clone = NULL; - gdbsim_ops.to_insert_fork_catchpoint = NULL; - gdbsim_ops.to_remove_fork_catchpoint = NULL; - gdbsim_ops.to_insert_vfork_catchpoint = NULL; - gdbsim_ops.to_remove_vfork_catchpoint = NULL; - gdbsim_ops.to_has_forked = NULL; - gdbsim_ops.to_has_vforked = NULL; - gdbsim_ops.to_can_follow_vfork_prior_to_exec = NULL; - gdbsim_ops.to_post_follow_vfork = NULL; - gdbsim_ops.to_insert_exec_catchpoint = NULL; - gdbsim_ops.to_remove_exec_catchpoint = NULL; - gdbsim_ops.to_has_execd = NULL; - gdbsim_ops.to_reported_exec_events_per_exec_call = NULL; - gdbsim_ops.to_has_exited = NULL; gdbsim_ops.to_mourn_inferior = gdbsim_mourn_inferior; - gdbsim_ops.to_can_run = 0; - gdbsim_ops.to_notice_signals = 0; - gdbsim_ops.to_thread_alive = 0; gdbsim_ops.to_stop = gdbsim_stop; - gdbsim_ops.to_pid_to_exec_file = NULL; gdbsim_ops.to_stratum = process_stratum; - gdbsim_ops.DONT_USE = NULL; gdbsim_ops.to_has_all_memory = 1; gdbsim_ops.to_has_memory = 1; gdbsim_ops.to_has_stack = 1; gdbsim_ops.to_has_registers = 1; gdbsim_ops.to_has_execution = 1; - gdbsim_ops.to_sections = NULL; - gdbsim_ops.to_sections_end = NULL; gdbsim_ops.to_magic = OPS_MAGIC; #ifdef TARGET_REDEFINE_DEFAULT_OPS diff --git a/gdb/remote-st.c b/gdb/remote-st.c index c27ddeb..7c452a2 100644 --- a/gdb/remote-st.c +++ b/gdb/remote-st.c @@ -767,14 +767,9 @@ Arguments are the name of the device for the serial line,\n\ the speed to connect at in bits per second."; st2000_ops.to_open = st2000_open; st2000_ops.to_close = st2000_close; - st2000_ops.to_attach = 0; - st2000_run_ops.to_post_attach = NULL; - st2000_ops.to_require_attach = NULL; st2000_ops.to_detach = st2000_detach; - st2000_ops.to_require_detach = NULL; st2000_ops.to_resume = st2000_resume; st2000_ops.to_wait = st2000_wait; - st2000_ops.to_post_wait = NULL; st2000_ops.to_fetch_registers = st2000_fetch_register; st2000_ops.to_store_registers = st2000_store_register; st2000_ops.to_prepare_to_store = st2000_prepare_to_store; @@ -782,47 +777,15 @@ the speed to connect at in bits per second."; st2000_ops.to_files_info = st2000_files_info; st2000_ops.to_insert_breakpoint = st2000_insert_breakpoint; st2000_ops.to_remove_breakpoint = st2000_remove_breakpoint; /* Breakpoints */ - st2000_ops.to_terminal_init = 0; - st2000_ops.to_terminal_inferior = 0; - st2000_ops.to_terminal_ours_for_output = 0; - st2000_ops.to_terminal_ours = 0; - st2000_ops.to_terminal_info = 0; /* Terminal handling */ st2000_ops.to_kill = st2000_kill; - st2000_ops.to_load = 0; /* load */ - st2000_ops.to_lookup_symbol = 0; /* lookup_symbol */ st2000_ops.to_create_inferior = st2000_create_inferior; - st2000_ops.to_post_startup_inferior = NULL; - st2000_ops.to_acknowledge_created_inferior = NULL; - st2000_ops.to_clone_and_follow_inferior = NULL; - st2000_ops.to_post_follow_inferior_by_clone = NULL; - st2000_run_ops.to_insert_fork_catchpoint = NULL; - st2000_run_ops.to_remove_fork_catchpoint = NULL; - st2000_run_ops.to_insert_vfork_catchpoint = NULL; - st2000_run_ops.to_remove_vfork_catchpoint = NULL; - st2000_ops.to_has_forked = NULL; - st2000_ops.to_has_vforked = NULL; - st2000_run_ops.to_can_follow_vfork_prior_to_exec = NULL; - st2000_ops.to_post_follow_vfork = NULL; - st2000_run_ops.to_insert_exec_catchpoint = NULL; - st2000_run_ops.to_remove_exec_catchpoint = NULL; - st2000_run_ops.to_has_execd = NULL; - st2000_run_ops.to_reported_exec_events_per_exec_call = NULL; - st2000_run_ops.to_has_exited = NULL; st2000_ops.to_mourn_inferior = st2000_mourn_inferior; - st2000_ops.to_can_run = 0; /* can_run */ - st2000_ops.to_notice_signals = 0; /* notice_signals */ - st2000_ops.to_thread_alive = 0; /* thread alive */ - st2000_ops.to_stop = 0; /* to_stop */ - st2000_ops.to_pid_to_exec_file = NULL; st2000_ops.to_stratum = process_stratum; - st2000_ops.DONT_USE = 0; /* next */ st2000_ops.to_has_all_memory = 1; st2000_ops.to_has_memory = 1; st2000_ops.to_has_stack = 1; st2000_ops.to_has_registers = 1; st2000_ops.to_has_execution = 1; /* all mem, mem, stack, regs, exec */ - st2000_ops.to_sections = 0; - st2000_ops.to_sections_end = 0; /* Section pointers */ st2000_ops.to_magic = OPS_MAGIC; /* Always the last thing */ }; diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 35cb578..ccef315 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -1540,7 +1540,6 @@ init_sol_thread_ops (void) sol_thread_ops.to_longname = "Solaris threads and pthread."; sol_thread_ops.to_doc = "Solaris threads and pthread support."; sol_thread_ops.to_open = sol_thread_open; - sol_thread_ops.to_close = 0; sol_thread_ops.to_attach = sol_thread_attach; sol_thread_ops.to_detach = sol_thread_detach; sol_thread_ops.to_resume = sol_thread_resume; @@ -1559,8 +1558,6 @@ init_sol_thread_ops (void) sol_thread_ops.to_terminal_save_ours = terminal_save_ours; sol_thread_ops.to_terminal_info = child_terminal_info; sol_thread_ops.to_kill = sol_thread_kill_inferior; - sol_thread_ops.to_load = 0; - sol_thread_ops.to_lookup_symbol = 0; sol_thread_ops.to_create_inferior = sol_thread_create_inferior; sol_thread_ops.to_mourn_inferior = sol_thread_mourn_inferior; sol_thread_ops.to_can_run = sol_thread_can_run; @@ -1576,8 +1573,6 @@ init_sol_thread_ops (void) sol_thread_ops.to_has_registers = 1; sol_thread_ops.to_has_execution = 1; sol_thread_ops.to_has_thread_control = tc_none; - sol_thread_ops.to_sections = 0; - sol_thread_ops.to_sections_end = 0; sol_thread_ops.to_find_memory_regions = sol_find_memory_regions; sol_thread_ops.to_make_corefile_notes = sol_make_note_section; sol_thread_ops.to_magic = OPS_MAGIC; @@ -1594,30 +1589,16 @@ init_sol_core_ops (void) sol_core_ops.to_close = sol_core_close; sol_core_ops.to_attach = sol_thread_attach; sol_core_ops.to_detach = sol_core_detach; - /* sol_core_ops.to_resume = 0; */ - /* sol_core_ops.to_wait = 0; */ sol_core_ops.to_fetch_registers = sol_thread_fetch_registers; - /* sol_core_ops.to_store_registers = 0; */ - /* sol_core_ops.to_prepare_to_store = 0; */ sol_core_ops.to_xfer_memory = sol_thread_xfer_memory; sol_core_ops.to_files_info = sol_core_files_info; sol_core_ops.to_insert_breakpoint = ignore; sol_core_ops.to_remove_breakpoint = ignore; - /* sol_core_ops.to_terminal_init = 0; */ - /* sol_core_ops.to_terminal_inferior = 0; */ - /* sol_core_ops.to_terminal_ours_for_output = 0; */ - /* sol_core_ops.to_terminal_ours = 0; */ - /* sol_core_ops.to_terminal_info = 0; */ - /* sol_core_ops.to_kill = 0; */ - /* sol_core_ops.to_load = 0; */ - /* sol_core_ops.to_lookup_symbol = 0; */ sol_core_ops.to_create_inferior = sol_thread_create_inferior; sol_core_ops.to_stratum = core_stratum; - sol_core_ops.to_has_all_memory = 0; sol_core_ops.to_has_memory = 1; sol_core_ops.to_has_stack = 1; sol_core_ops.to_has_registers = 1; - sol_core_ops.to_has_execution = 0; sol_core_ops.to_has_thread_control = tc_none; sol_core_ops.to_thread_alive = sol_thread_alive; sol_core_ops.to_pid_to_str = solaris_pid_to_str; @@ -1626,8 +1607,6 @@ init_sol_core_ops (void) <n> in procinfo list" where <n> is the pid of the process that produced the core file. Disable it for now. */ /* sol_core_ops.to_find_new_threads = sol_find_new_threads; */ - sol_core_ops.to_sections = 0; - sol_core_ops.to_sections_end = 0; sol_core_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/v850ice.c b/gdb/v850ice.c index 958eac3..d1f696b 100644 --- a/gdb/v850ice.c +++ b/gdb/v850ice.c @@ -897,14 +897,9 @@ init_850ice_ops (void) v850ice_ops.to_doc = "Debug a system controlled by a NEC 850 ICE."; v850ice_ops.to_open = v850ice_open; v850ice_ops.to_close = v850ice_close; - v850ice_ops.to_attach = NULL; - v850ice_ops.to_post_attach = NULL; - v850ice_ops.to_require_attach = NULL; v850ice_ops.to_detach = v850ice_detach; - v850ice_ops.to_require_detach = NULL; v850ice_ops.to_resume = v850ice_resume; v850ice_ops.to_wait = v850ice_wait; - v850ice_ops.to_post_wait = NULL; v850ice_ops.to_fetch_registers = v850ice_fetch_registers; v850ice_ops.to_store_registers = v850ice_store_registers; v850ice_ops.to_prepare_to_store = v850ice_prepare_to_store; @@ -912,30 +907,16 @@ init_850ice_ops (void) v850ice_ops.to_files_info = v850ice_files_info; v850ice_ops.to_insert_breakpoint = v850ice_insert_breakpoint; v850ice_ops.to_remove_breakpoint = v850ice_remove_breakpoint; - v850ice_ops.to_terminal_init = NULL; - v850ice_ops.to_terminal_inferior = NULL; - v850ice_ops.to_terminal_ours_for_output = NULL; - v850ice_ops.to_terminal_ours = NULL; - v850ice_ops.to_terminal_info = NULL; v850ice_ops.to_kill = v850ice_kill; v850ice_ops.to_load = v850ice_load; - v850ice_ops.to_lookup_symbol = NULL; - v850ice_ops.to_create_inferior = NULL; v850ice_ops.to_mourn_inferior = v850ice_mourn; - v850ice_ops.to_can_run = 0; - v850ice_ops.to_notice_signals = 0; - v850ice_ops.to_thread_alive = NULL; v850ice_ops.to_stop = v850ice_stop; - v850ice_ops.to_pid_to_exec_file = NULL; v850ice_ops.to_stratum = process_stratum; - v850ice_ops.DONT_USE = NULL; v850ice_ops.to_has_all_memory = 1; v850ice_ops.to_has_memory = 1; v850ice_ops.to_has_stack = 1; v850ice_ops.to_has_registers = 1; v850ice_ops.to_has_execution = 1; - v850ice_ops.to_sections = NULL; - v850ice_ops.to_sections_end = NULL; v850ice_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 73bc083..93bd108 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -1828,24 +1828,18 @@ init_child_ops (void) child_ops.to_terminal_save_ours = terminal_save_ours; child_ops.to_terminal_info = child_terminal_info; child_ops.to_kill = child_kill_inferior; - child_ops.to_load = 0; - child_ops.to_lookup_symbol = 0; child_ops.to_create_inferior = child_create_inferior; child_ops.to_mourn_inferior = child_mourn_inferior; child_ops.to_can_run = child_can_run; - child_ops.to_notice_signals = 0; child_ops.to_thread_alive = win32_child_thread_alive; child_ops.to_pid_to_str = cygwin_pid_to_str; child_ops.to_stop = child_stop; child_ops.to_stratum = process_stratum; - child_ops.DONT_USE = 0; child_ops.to_has_all_memory = 1; child_ops.to_has_memory = 1; child_ops.to_has_stack = 1; child_ops.to_has_registers = 1; child_ops.to_has_execution = 1; - child_ops.to_sections = 0; - child_ops.to_sections_end = 0; child_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/wince.c b/gdb/wince.c index 15138b8..322564e 100644 --- a/gdb/wince.c +++ b/gdb/wince.c @@ -1924,8 +1924,6 @@ init_child_ops (void) child_ops.to_has_stack = 1; child_ops.to_has_registers = 1; child_ops.to_has_execution = 1; - child_ops.to_sections = 0; - child_ops.to_sections_end = 0; child_ops.to_magic = OPS_MAGIC; } diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 73bc083..93bd108 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1828,24 +1828,18 @@ init_child_ops (void) child_ops.to_terminal_save_ours = terminal_save_ours; child_ops.to_terminal_info = child_terminal_info; child_ops.to_kill = child_kill_inferior; - child_ops.to_load = 0; - child_ops.to_lookup_symbol = 0; child_ops.to_create_inferior = child_create_inferior; child_ops.to_mourn_inferior = child_mourn_inferior; child_ops.to_can_run = child_can_run; - child_ops.to_notice_signals = 0; child_ops.to_thread_alive = win32_child_thread_alive; child_ops.to_pid_to_str = cygwin_pid_to_str; child_ops.to_stop = child_stop; child_ops.to_stratum = process_stratum; - child_ops.DONT_USE = 0; child_ops.to_has_all_memory = 1; child_ops.to_has_memory = 1; child_ops.to_has_stack = 1; child_ops.to_has_registers = 1; child_ops.to_has_execution = 1; - child_ops.to_sections = 0; - child_ops.to_sections_end = 0; child_ops.to_magic = OPS_MAGIC; } |