X86: Make nop a regular, non-microcoded instruction.

[gem5.git] / src / dev / simple_disk.cc

diff --git a/src/dev/simple_disk.cc b/src/dev/simple_disk.cc
index e29bfa72687485ac21ea7b12b451208b4c8cacc8..b8096d2138c1fd9fc23b43eedd7bef3a89acae04 100644 (file)
--- a/src/dev/simple_disk.cc
+++ b/src/dev/simple_disk.cc
@@ -45,13 +45,12 @@
 #include "dev/disk_image.hh"
 #include "dev/simple_disk.hh"
 #include "mem/port.hh"
-#include "sim/builder.hh"
 #include "sim/system.hh"
 
 using namespace std;
 
-SimpleDisk::SimpleDisk(const string &name, System *sys, DiskImage *img)
-    : SimObject(name), system(sys), image(img)
+SimpleDisk::SimpleDisk(const Params *p)
+    : SimObject(p), system(p->system), image(p->disk)
 {}
 
 SimpleDisk::~SimpleDisk()
@@ -91,23 +90,8 @@ SimpleDisk::write(Addr addr, baddr_t block, int count)
 #endif
 }
 
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleDisk)
-
-    SimObjectParam<System *> system;
-    SimObjectParam<DiskImage *> disk;
-
-END_DECLARE_SIM_OBJECT_PARAMS(SimpleDisk)
-
-BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleDisk)
-
-    INIT_PARAM(system, "System pointer"),
-    INIT_PARAM(disk, "Disk Image")
-
-END_INIT_SIM_OBJECT_PARAMS(SimpleDisk)
-
-CREATE_SIM_OBJECT(SimpleDisk)
+SimpleDisk *
+SimpleDiskParams::create()
 {
-    return new SimpleDisk(getInstanceName(), system, disk);
+    return new SimpleDisk(this);
 }
-
-REGISTER_SIM_OBJECT("SimpleDisk", SimpleDisk)