Merge GDB 7.5.1

sim/rx/gdb-if.c

 /* gdb-if.c -- sim interface to GDB.
 
 Copyright (C) 2008-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
@@ skipping 183 matching lines @@
 SIM_RC
 sim_load (SIM_DESC sd, char *prog, struct bfd *abfd, int from_tty)
 {
   check_desc (sd);
 
   if (!abfd)
     abfd = open_objfile (prog);
   if (!abfd)
     return SIM_RC_FAIL;
 
-  rx_load (abfd);
+  rx_load (abfd, get_callbacks ());
   build_swap_list (abfd);
 
   return SIM_RC_OK;
 }
 
 SIM_RC
 sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
 {
   check_desc (sd);
 
   if (abfd)
     {
-      rx_load (abfd);
+      rx_load (abfd, NULL);
       build_swap_list (abfd);
     }
 
   return SIM_RC_OK;
 }
 
 int
 sim_read (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
 {
   int i;
@@ skipping 475 matching lines @@
 
 
 /* Take a step return code RC and set up the variables consulted by
    sim_stop_reason appropriately.  */
 void
 handle_step (int rc)
 {
   if (execution_error_get_last_error () != SIM_ERR_NONE)
     {
       reason = sim_stopped;
-      siggnal = TARGET_SIGNAL_SEGV;
+      siggnal = GDB_SIGNAL_SEGV;
     }
   if (RX_STEPPED (rc) || RX_HIT_BREAK (rc))
     {
       reason = sim_stopped;
-      siggnal = TARGET_SIGNAL_TRAP;
+      siggnal = GDB_SIGNAL_TRAP;
     }
   else if (RX_STOPPED (rc))
     {
       reason = sim_stopped;
       siggnal = rx_signal_to_host (RX_STOP_SIG (rc));
     }
   else
     {
       assert (RX_EXITED (rc));
       reason = sim_exited;
@@ skipping 30 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;
             }
 
           rc = setjmp (decode_jmp_buf);
           if (rc == 0)
             rc = decode_opcode ();
 
           if (execution_error_get_last_error () != SIM_ERR_NONE)
             {
               reason = sim_stopped;
-              siggnal = TARGET_SIGNAL_SEGV;
+              siggnal = GDB_SIGNAL_SEGV;
               break;
             }
 
           if (!RX_STEPPED (rc))
             {
               handle_step (rc);
               break;
             }
         }
     }
@@ skipping 70 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;
 }