sim: move bfd.h include out of sim-main.h

Not all arches include this in sim-main.h, and the ones that do don't
actually use bfd defines in the sim-main.h header.  Prune it to make
sim-main.h simpler so we can kill it off entirely in the future.

We add the include to the files that utilize e.g. bfd_vma though.

sim/arm/sim-main.h

@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #undef BIT
 #include "armdefs.h"

sim/common/cgen-trace.h

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CGEN_TRACE_H
 
 #include "ansidecl.h"
+#include "bfd.h"
 
 void cgen_trace_insn_init (SIM_CPU *, int);
 void cgen_trace_insn_fini (SIM_CPU *, const struct argbuf *, int);

sim/common/sim-base.h

@@ -73,6 +73,8 @@ typedef address_word sim_cia;
 typedef struct _sim_cpu SIM_CPU;
 typedef struct _sim_cpu sim_cpu;
 
+#include "bfd.h"
+
 #include "sim-module.h"
 
 #include "sim-arange.h"

sim/common/sim-trace.h

@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdarg.h>
 
 #include "ansidecl.h"
+#include "bfd.h"
 #include "dis-asm.h"
 
 /* Standard traceable entities.  */

sim/cr16/sim-main.h

@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "cr16_sim.h"
 

sim/cr16/simops.c

@@ -31,6 +31,8 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "simops.h"

sim/d10v/sim-main.h

@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "d10v_sim.h"
 

sim/d10v/simops.c

@@ -10,6 +10,8 @@
 #endif
 #include <string.h>
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "simops.h"

sim/frv/sim-main.h

@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-basics.h"
 #include "cgen-types.h"
 #include "frv-desc.h"
+#include <stdbool.h>
 #include "frv-opc.h"
 #include "arch.h"
 

sim/ft32/sim-main.h

@@ -23,7 +23,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "ft32-sim.h"
 

sim/h8300/sim-main.h

@@ -1,7 +1,5 @@
 /* Main header for the Hitachi h8/300 architecture.  */
 
-#include "bfd.h"
-
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 

sim/m68hc11/interp.c

@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-assert.h"
 #include "sim-hw.h"

sim/m68hc11/interrupts.c

@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-options.h"
 #include "sim-signal.h"

sim/m68hc11/sim-main.h

@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-basics.h"
 #include "sim-base.h"
 
-#include "bfd.h"
-
 #include "opcode/m68hc11.h"
 
 #include "sim/sim.h"

sim/mcore/sim-main.h

@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 /* The machine state.
    This state is maintained in host byte order.  The

sim/mips/sim-main.h

@@ -25,7 +25,6 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 #include "elf-bfd.h"
 #include "elf/mips.h"
 

sim/moxie/sim-main.h

@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #define PCIDX 17
 

sim/riscv/interp.c

@@ -21,6 +21,8 @@
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim/callback.h"
 #include "sim-main.h"
 #include "sim-options.h"

sim/rx/gdb-if.c

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 
 #include "ansidecl.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "sim/callback.h"
 #include "sim/sim.h"

sim/v850/sim-main.h

@@ -11,8 +11,6 @@
 #include "sim-base.h"
 
 #include "simops.h"
-#include "bfd.h"
-
 
 typedef uint32_t reg_t;
 typedef uint64_t reg64_t;