Merge GDB 7.5.1

sim/avr/interp.c

 /* Simulator for Atmel's AVR core.
    Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Written by Tristan Gingold, AdaCore.
 
    This file is part of GDB, the GNU debugger.
 
    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.
@@ skipping 852 matching lines @@
 }
 
 void
 sim_resume (SIM_DESC sd, int step, int signal)
 {
   unsigned int ipc;
 
   if (step)
     {
       cpu_exception = sim_stopped;
-      cpu_signal = TARGET_SIGNAL_TRAP;
+      cpu_signal = GDB_SIGNAL_TRAP;
     }
   else
     cpu_exception = sim_running;
 
   do
     {
       int code;
       word op;
       byte res;
       byte r, d, vd;
@@ skipping 109 matching lines @@
             pc |= sram[++sp] << 8;
             pc |= sram[++sp];
             write_word (REG_SP, sp);
           }
           cycles += 3;
           break;
           
         case OP_break:
           /* Stop on this address.  */
           cpu_exception = sim_stopped;
-          cpu_signal = TARGET_SIGNAL_TRAP;
+          cpu_signal = GDB_SIGNAL_TRAP;
           pc = ipc;
           break;
 
         case OP_bld:
           d = get_d (op);
           r = flash[ipc].r;
           if (sram[SREG] & SREG_T)
             sram[d] |= r;
           else
             sram[d] &= ~r;
@@ skipping 742 matching lines @@
 sim_stop_reason (SIM_DESC sd, enum sim_stop * reason,  int *sigrc)
 {
   *reason = cpu_exception;
   *sigrc = cpu_signal;
 }
 
 int
 sim_stop (SIM_DESC sd)
 {
   cpu_exception = sim_stopped;
-  cpu_signal = TARGET_SIGNAL_INT;
+  cpu_signal = GDB_SIGNAL_INT;
   return 1;
 }
 
 void
 sim_info (SIM_DESC sd, int verbose)
 {
   callback->printf_filtered
     (callback, "\n\n# cycles  %10u\n", cycles);
 }
 
@@ skipping 75 matching lines @@
 sim_set_callbacks (host_callback *ptr)
 {
   callback = ptr; 
 }
 
 char **
 sim_complete_command (SIM_DESC sd, char *text, char *word)
 {
   return NULL;
 }