Change decode_compound_collector to use std::vector

[deliverable/binutils-gdb.git] / sim / ppc / hw_htab.c

diff --git a/sim/ppc/hw_htab.c b/sim/ppc/hw_htab.c
index 5234f0f2c637c9faf4be55b443cc44d8b3e8fa0a..cf275ff7025616185401cf89451a5967f280b3b6 100644 (file)
--- a/sim/ppc/hw_htab.c
+++ b/sim/ppc/hw_htab.c
@@ -4,7 +4,7 @@
 
     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 2 of the License, or
+    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,
@@ -13,8 +13,7 @@
     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, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
  
     */
 
@@ -23,6 +22,7 @@
 #define _HW_HTAB_C_
 
 #include "device_table.h"
+#include "device.h"
 
 #include "bfd.h"
 
@@ -549,7 +549,7 @@ htab_map_binary(device *me,
   if ((sizes.text_base <= sizes.data_base
        && sizes.text_bound >= sizes.data_bound)
       || (sizes.data_base <= sizes.text_base
-         && sizes.data_bound >= sizes.data_bound)
+         && sizes.data_bound >= sizes.text_bound)
       || (sizes.text_bound > sizes.data_base
          && sizes.text_bound <= sizes.data_bound)
       || (sizes.text_base >= sizes.data_base