2000-02-19 Philippe De Muyter <phdm@macqel.be>

[deliverable/binutils-gdb.git] / gdb / m3-nat.c

diff --git a/gdb/m3-nat.c b/gdb/m3-nat.c
index 61274bd98afbf8e36cc7f044b94e5c6a947c794b..c6b96795cfc3218f5470d839199ced19fd735154 100644 (file)
--- a/gdb/m3-nat.c
+++ b/gdb/m3-nat.c
@@ -1,7 +1,7 @@
 /* Interface GDB to Mach 3.0 operating systems.
    (Most) Mach 3.0 related routines live in this file.
 
-   Copyright (C) 1992, 1996, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 1999-2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -53,7 +53,7 @@
 #include "value.h"
 #include "language.h"
 #include "target.h"
-#include "wait.h"
+#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 
@@ -1683,9 +1683,9 @@ catch_exception_raise (port, thread, task, exception, code, subcode)
     }
 
   if (exception < 0 || exception > MAX_EXCEPTION)
-    fatal ("catch_exception_raise: unknown exception code %d thread %d",
-          exception,
-          mid);
+    internal_error ("catch_exception_raise: unknown exception code %d thread %d",
+                   exception,
+                   mid);
 
   if (!MACH_PORT_VALID (inferior_task))
     error ("got an exception, but inferior_task is null or dead");
@@ -2472,7 +2472,7 @@ map_cprocs_to_kernel_threads (cprocs, mthreads, thread_count)
 
 void
 print_tl_address (stream, pc)
-     GDB_FILE *stream;
+     struct ui_file *stream;
      CORE_ADDR pc;
 {
   if (!lookup_minimal_symbol_by_pc (pc))
@@ -3598,7 +3598,7 @@ mach3_exception_actions (w, force_print_only, who)
                           stop_code);
          break;
        default:
-         fatal ("Unknown exception");
+         internal_error ("Unknown exception");
        }
     }
 }
@@ -3624,13 +3624,13 @@ setup_notify_port (create_new)
                                MACH_PORT_RIGHT_RECEIVE,
                                &our_notify_port);
       if (ret != KERN_SUCCESS)
-       fatal ("Creating notify port %s", mach_error_string (ret));
+       internal_error ("Creating notify port %s", mach_error_string (ret));
 
       ret = mach_port_move_member (mach_task_self (),
                                   our_notify_port,
                                   inferior_wait_port_set);
       if (ret != KERN_SUCCESS)
-       fatal ("initial move member %s", mach_error_string (ret));
+       internal_error ("initial move member %s", mach_error_string (ret));
     }
 }
 
@@ -3980,7 +3980,7 @@ m3_create_inferior (exec_file, allargs, env)
   fork_inferior (exec_file, allargs, env, m3_trace_me, m3_trace_him, NULL, NULL);
   /* We are at the first instruction we care about.  */
   /* Pedal to the metal... */
-  proceed ((CORE_ADDR) - 1, 0, 0);
+  proceed ((CORE_ADDR) -1, 0, 0);
 }
 
 /* Mark our target-struct as eligible for stray "run" and "attach"
@@ -4650,7 +4650,7 @@ _initialize_m3_nat ()
                            MACH_PORT_RIGHT_PORT_SET,
                            &inferior_wait_port_set);
   if (ret != KERN_SUCCESS)
-    fatal ("initial port set %s", mach_error_string (ret));
+    internal_error ("initial port set %s", mach_error_string (ret));
 
   /* mach_really_wait now waits for this */
   currently_waiting_for = inferior_wait_port_set;