Separate the stuff for SimObject from SimObject builder.

This makes testing a bit easier.

arch/alpha/alpha_memory.cc:
cpu/intr_control.cc:
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
dev/alpha_console.cc:
dev/console.cc:
dev/disk_image.cc:
dev/etherbus.cc:
dev/etherdump.cc:
dev/etherlink.cc:
dev/ethertap.cc:
dev/simple_disk.cc:
kern/tru64/tru64_system.cc:
sim/main.cc:
sim/prog.cc:
    Need to include builder.hh
    sort #includes
sim/sim_object.cc:
sim/sim_object.hh:
    Separate the SimObjectBuilder stuff into its own file

--HG--
extra : convert_revision : e8395e0cc6ae1f180f9cd6f100795a1ac44aeed5

1 files changed, 4 insertions, 3 deletions

diff --git a/dev/disk_image.cc b/dev/disk_image.cc
index 0a3955ed1..78599f8d7 100644
--- a/dev/disk_image.cc
+++ b/dev/disk_image.cc
@@ -33,18 +33,19 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <cstdio>
+#include <cstring>
 #include <fstream>
 #include <string>
 
-#include "dev/disk_image.hh"
+#include "base/callback.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
+#include "dev/disk_image.hh"
+#include "sim/builder.hh"
 #include "sim/sim_exit.hh"
-#include "base/callback.hh"
 
 using namespace std;