Merge GDB 7.5.1

sim/bfin/dv-bfin_sic.c

 /* Blackfin System Interrupt Controller (SIC) model.
 
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of 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 908 matching lines @@
     case 540 ... 549:
       set_hw_io_read_buffer (me, bfin_sic_54x_io_read_buffer);
       set_hw_io_write_buffer (me, bfin_sic_54x_io_write_buffer);
       set_hw_ports (me, bfin_sic3_ports);
       set_hw_port_event (me, bfin_sic_54x_port_event);
       mmr_names = bf54x_mmr_names;
 
       /* Initialize the SIC.  */
       sic->bf54x.imask0 = sic->bf54x.imask1 = sic->bf54x.imask2 = 0;
       sic->bf54x.isr0 = sic->bf54x.isr1 = sic->bf54x.isr2 = 0;
-      sic->bf54x.iwr0 = sic->bf54x.iwr1 = sic->bf54x.iwr1 = 0xFFFFFFFF;
+      sic->bf54x.iwr0 = sic->bf54x.iwr1 = sic->bf54x.iwr2 = 0xFFFFFFFF;
       sic->bf54x.iar0 = 0x10000000;
       sic->bf54x.iar1 = 0x33322221;
       sic->bf54x.iar2 = 0x66655444;
       sic->bf54x.iar3 = 0x00000000;
       sic->bf54x.iar4 = 0x32222220;
       sic->bf54x.iar5 = 0x44433333;
       sic->bf54x.iar6 = 0x00444664;
       sic->bf54x.iar7 = 0x00000000;
       sic->bf54x.iar8 = 0x44111111;
       sic->bf54x.iar9 = 0x44444444;
@@ skipping 39 matching lines @@
     default:
       hw_abort (me, "no support for SIC on this Blackfin model yet");
     }
 }
 
 const struct hw_descriptor dv_bfin_sic_descriptor[] =
 {
   {"bfin_sic", bfin_sic_finish,},
   {NULL, NULL},
 };