gdb/rs6000: Use default gdbarch methods where possible

[deliverable/binutils-gdb.git] / gdb / cp-support.c

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 9970f0ca8643fa09631d1989fe13a60257363da4..d02a01df930954fc27a2847cf99ffd99f991b6c4 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -19,28 +19,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <signal.h>
-
-/* Local non-gdb includes.  */
-#include "block.h"
-#include "common/gdb_setjmp.h"
-#include "common/selftest.h"
-#include "complaints.h"
-#include "cp-abi.h"
 #include "cp-support.h"
 #include "demangle.h"
+#include "gdbcmd.h"
 #include "dictionary.h"
-#include "expression.h"
+#include "objfiles.h"
 #include "frame.h"
-#include "gdbcmd.h"
+#include "symtab.h"
+#include "block.h"
+#include "complaints.h"
 #include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "cp-abi.h"
 #include "namespace.h"
-#include "objfiles.h"
+#include <signal.h>
+#include "common/gdb_setjmp.h"
 #include "safe-ctype.h"
-#include "symtab.h"
-#include "value.h"
+#include "common/selftest.h"
 
 #define d_left(dc) (dc)->u.s_binary.left
 #define d_right(dc) (dc)->u.s_binary.right
@@ -155,15 +151,14 @@ inspect_type (struct demangle_parse_info *info,
 
   sym = NULL;
 
-  TRY
+  try
     {
       sym = lookup_symbol (name, 0, VAR_DOMAIN, 0).symbol;
     }
-  CATCH (except, RETURN_MASK_ALL)
+  catch (const gdb_exception &except)
     {
       return 0;
     }
-  END_CATCH
 
   if (sym != NULL)
     {
@@ -227,17 +222,16 @@ inspect_type (struct demangle_parse_info *info,
            }
 
          string_file buf;
-         TRY
+         try
            {
              type_print (type, "", &buf, -1);
            }
          /* If type_print threw an exception, there is little point
             in continuing, so just bow out gracefully.  */
-         CATCH (except, RETURN_MASK_ERROR)
+         catch (const gdb_exception_error &except)
            {
              return 0;
            }
-         END_CATCH
 
          len = buf.size ();
          name = (char *) obstack_copy0 (&info->obstack, buf.c_str (), len);
@@ -428,15 +422,14 @@ replace_typedefs (struct demangle_parse_info *info,
              struct symbol *sym = NULL;
 
              sym = NULL;
-             TRY
+             try
                {
                  sym = lookup_symbol (local_name.get (), 0,
                                       VAR_DOMAIN, 0).symbol;
                }
-             CATCH (except, RETURN_MASK_ALL)
+             catch (const gdb_exception &except)
                {
                }
-             END_CATCH
 
              if (sym != NULL)
                {