gdb.mi/list-thread-groups-available.exp: read entries one by one instead of increasin...

[deliverable/binutils-gdb.git] / gdb / guile / scm-disasm.c

diff --git a/gdb/guile/scm-disasm.c b/gdb/guile/scm-disasm.c
index e4a9c92a56b54d00261019f178305f8024ec5d1a..6b34a229942d8a63f35142b48fbd9392b476db74 100644 (file)
--- a/gdb/guile/scm-disasm.c
+++ b/gdb/guile/scm-disasm.c
@@ -247,7 +247,8 @@ gdbscm_arch_disassemble (SCM self, SCM start_scm, SCM rest)
       int insn_len = 0;
       string_file buf;
 
-      TRY
+      gdbscm_gdb_exception exc {};
+      try
        {
          if (using_port)
            {
@@ -257,12 +258,12 @@ gdbscm_arch_disassemble (SCM self, SCM start_scm, SCM rest)
          else
            insn_len = gdb_print_insn (gdbarch, pc, &buf, NULL);
        }
-      CATCH (except, RETURN_MASK_ALL)
+      catch (const gdb_exception &except)
        {
-         GDBSCM_HANDLE_GDB_EXCEPTION (except);
+         exc = unpack (except);
        }
-      END_CATCH
 
+      GDBSCM_HANDLE_GDB_EXCEPTION (exc);
       result = scm_cons (dascm_make_insn (pc, buf.c_str (), insn_len),
                         result);