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, 7 insertions, 6 deletions

diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc
index d26cf44ea..aa6ff5b38 100644
--- a/dev/simple_disk.cc
+++ b/dev/simple_disk.cc
@@ -30,19 +30,20 @@
  * Simple disk interface for the system console
  */
 
-#include <string>
-
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
-#include "dev/disk_image.hh"
+#include <cstring>
+#include <string>
+
 #include "base/misc.hh"
-#include "mem/functional_mem/physical_memory.hh"
-#include "dev/simple_disk.hh"
 #include "base/trace.hh"
+#include "dev/disk_image.hh"
+#include "dev/simple_disk.hh"
+#include "mem/functional_mem/physical_memory.hh"
+#include "sim/builder.hh"
 
 using namespace std;