From c27c122afc6b778e67a9c77915fac71730a5a4ef Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sun, 26 Mar 2006 21:44:22 -0500 Subject: Add the bus and connector objects to scons change getPort parameter from char* to string Add an extra phase between construction and init called connect SConscript: Add the bus and connector objects to scons cpu/simple/cpu.cc: cpu/simple/cpu.hh: the connection to memory shouldn't be made until we know the memory object exists (e.g. after construction) dev/io_device.hh: change to const string mem/bus.hh: change getPort parameter from char* to string initialize num_interfaces mem/mem_object.hh: change getPort parameter from char* to string mem/physical.cc: mem/physical.hh: change getPort parameter from char* to string get rid of the bus object I created last time python/m5/objects/PhysicalMemory.py: get rid of the bus object I created last time sim/main.cc: sim/sim_object.cc: sim/sim_object.hh: Add an extra phase between construction and init called connect --HG-- extra : convert_revision : 0e994f93374fa72a06d291655c440ff1b8e155a9 --- dev/io_device.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev') diff --git a/dev/io_device.hh b/dev/io_device.hh index b25048e3d..ba16372cc 100644 --- a/dev/io_device.hh +++ b/dev/io_device.hh @@ -203,7 +203,7 @@ class PioDevice : public SimObject virtual ~PioDevice(); - virtual Port *getPort(std::string if_name) + virtual Port *getPort(const std::string &if_name) { if (if_name == "pio") return pioPort; @@ -223,7 +223,7 @@ class DmaDevice : public PioDevice DmaDevice(const std::string &name, Platform *p); virtual ~DmaDevice(); - virtual Port *getPort(std::string if_name) + virtual Port *getPort(const std::string &if_name) { if (if_name == "pio") return pioPort; -- cgit v1.2.3