gdb: change single_displaced_buffer_manager into multiple_displaced_buffer_manager

[deliverable/binutils-gdb.git] / gdb / inf-loop.c

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index bb6ad25bb75fd44144ca081a61570f65b0e69a06..c40ae2394269ee64e4b5474bbef7ffcfa19b133c 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -1,5 +1,5 @@
 /* Handling of inferior events for the event loop for GDB, the GNU debugger.
-   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "event-loop.h"
+#include "gdbsupport/event-loop.h"
 #include "event-top.h"
 #include "inf-loop.h"
 #include "remote.h"
@@ -55,7 +55,7 @@ inferior_event_handler (enum inferior_event_type event_type,
 
       /* Do all continuations associated with the whole inferior (not
         a particular thread).  */
-      if (!ptid_equal (inferior_ptid, null_ptid))
+      if (inferior_ptid != null_ptid)
        do_all_inferior_continuations (0);
 
       /* When running a command list (from a user command, say), these
@@ -67,11 +67,11 @@ inferior_event_handler (enum inferior_event_type event_type,
          /* Don't propagate breakpoint commands errors.  Either we're
             stopping or some command resumes the inferior.  The user will
             be informed.  */
-         TRY
+         try
            {
              bpstat_do_actions ();
            }
-         CATCH (e, RETURN_MASK_ALL)
+         catch (const gdb_exception &e)
            {
              /* If the user was running a foreground execution
                 command, then propagate the error so that the prompt
@@ -79,11 +79,10 @@ inferior_event_handler (enum inferior_event_type event_type,
                 the prompt and is typing some unrelated command, so
                 just inform the user and swallow the exception.  */
              if (current_ui->prompt_state == PROMPT_BLOCKED)
-               throw_exception (e);
+               throw;
              else
                exception_print (gdb_stderr, e);
            }
-         END_CATCH
        }
       break;