Merge GDB 7.5.1

sim/m32c/gdb-if.c

 /* gdb.c --- sim interface to GDB.
 
 Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
+#include "config.h"
 #include <stdio.h>
 #include <assert.h>
 #include <signal.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "ansidecl.h"
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 #include "gdb/signals.h"
@@ skipping 491 matching lines @@
 
 
 /* Given a signal number used by the M32C bsp (that is, newlib),
    return a target signal number used by GDB.  */
 int
 m32c_signal_to_target (int m32c)
 {
   switch (m32c)
     {
     case 4:
-      return TARGET_SIGNAL_ILL;
+      return GDB_SIGNAL_ILL;
 
     case 5:
-      return TARGET_SIGNAL_TRAP;
+      return GDB_SIGNAL_TRAP;
 
     case 10:
-      return TARGET_SIGNAL_BUS;
+      return GDB_SIGNAL_BUS;
 
     case 11:
-      return TARGET_SIGNAL_SEGV;
+      return GDB_SIGNAL_SEGV;
 
     case 24:
-      return TARGET_SIGNAL_XCPU;
+      return GDB_SIGNAL_XCPU;
 
     case 2:
-      return TARGET_SIGNAL_INT;
+      return GDB_SIGNAL_INT;
 
     case 8:
-      return TARGET_SIGNAL_FPE;
+      return GDB_SIGNAL_FPE;
 
     case 6:
-      return TARGET_SIGNAL_ABRT;
+      return GDB_SIGNAL_ABRT;
     }
 
   return 0;
 }
 
 
 /* Take a step return code RC and set up the variables consulted by
    sim_stop_reason appropriately.  */
 void
 handle_step (int rc)
 {
   if (M32C_STEPPED (rc) || M32C_HIT_BREAK (rc))
     {
       reason = sim_stopped;
-      siggnal = TARGET_SIGNAL_TRAP;
+      siggnal = GDB_SIGNAL_TRAP;
     }
   else if (M32C_STOPPED (rc))
     {
       reason = sim_stopped;
       siggnal = m32c_signal_to_target (M32C_STOP_SIG (rc));
     }
   else
     {
       assert (M32C_EXITED (rc));
       reason = sim_exited;
@@ skipping 26 matching lines @@
       /* We don't clear 'stop' here, because then we would miss
          interrupts that arrived on the way here.  Instead, we clear
          the flag in sim_stop_reason, after GDB has disabled the
          interrupt signal handler.  */
       for (;;)
         {
           if (stop)
             {
               stop = 0;
               reason = sim_stopped;
-              siggnal = TARGET_SIGNAL_INT;
+              siggnal = GDB_SIGNAL_INT;
               break;
             }
 
           int rc = decode_opcode ();
 #ifdef TIMER_A
           update_timer_a ();
 #endif
 
           if (!M32C_STEPPED (rc))
             {
@@ skipping 74 matching lines @@
   else
     printf ("The 'sim' command expects either 'trace' or 'verbose'"
             " as a subcommand.\n");
 }
 
 char **
 sim_complete_command (SIM_DESC sd, char *text, char *word)
 {
   return NULL;
 }