diff options
Diffstat (limited to 'gdb/remote.c')
| -rw-r--r-- | gdb/remote.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 2b21aea..0424ea4 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1146,12 +1146,12 @@ remote_target::remote_get_noisy_reply () org_to = to; - TRY + try { gdbarch_relocate_instruction (target_gdbarch (), &to, from); relocated = 1; } - CATCH (ex, RETURN_MASK_ALL) + catch (const gdb_exception_RETURN_MASK_ALL &ex) { if (ex.error == MEMORY_ERROR) { @@ -1170,7 +1170,6 @@ remote_target::remote_get_noisy_reply () } putpkt ("E01"); } - END_CATCH if (relocated) { @@ -5602,11 +5601,11 @@ remote_target::open_1 (const char *name, int from_tty, int extended_p) function. See cli-dump.c. */ { - TRY + try { remote->start_remote (from_tty, extended_p); } - CATCH (ex, RETURN_MASK_ALL) + catch (const gdb_exception_RETURN_MASK_ALL &ex) { /* Pop the partially set up target - unless something else did already before throwing the exception. */ @@ -5614,7 +5613,6 @@ remote_target::open_1 (const char *name, int from_tty, int extended_p) remote_unpush_target (); throw_exception (ex); } - END_CATCH } remote_btrace_reset (rs); @@ -9766,11 +9764,11 @@ remote_target::remote_kill_k () { /* Catch errors so the user can quit from gdb even when we aren't on speaking terms with the remote system. */ - TRY + try { putpkt ("k"); } - CATCH (ex, RETURN_MASK_ERROR) + catch (const gdb_exception_RETURN_MASK_ERROR &ex) { if (ex.error == TARGET_CLOSE_ERROR) { @@ -9788,7 +9786,6 @@ remote_target::remote_kill_k () user or higher layers decide what to do. */ throw_exception (ex); } - END_CATCH } void @@ -13135,11 +13132,11 @@ remote_target::get_trace_status (struct trace_status *ts) putpkt ("qTStatus"); - TRY + try { p = remote_get_noisy_reply (); } - CATCH (ex, RETURN_MASK_ERROR) + catch (const gdb_exception_RETURN_MASK_ERROR &ex) { if (ex.error != TARGET_CLOSE_ERROR) { @@ -13148,7 +13145,6 @@ remote_target::get_trace_status (struct trace_status *ts) } throw_exception (ex); } - END_CATCH result = packet_ok (p, &remote_protocol_packets[PACKET_qTStatus]); @@ -13790,16 +13786,15 @@ remote_target::enable_btrace (ptid_t ptid, const struct btrace_config *conf) /* If we fail to read the configuration, we lose some information, but the tracing itself is not impacted. */ - TRY + try { btrace_read_config (&tinfo->conf); } - CATCH (err, RETURN_MASK_ERROR) + catch (const gdb_exception_RETURN_MASK_ERROR &err) { if (err.message != NULL) warning ("%s", err.what ()); } - END_CATCH return tinfo; } |