X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fsim%2Fbuilder.hh;h=2997fe5c339d9e6bdd7a64968dee2766be66aa46;hb=306043f62e06e8368733c2ee2a273c1ba5ea80b9;hp=b32e00e76405ec43d84141d0b0e29da3c15b5250;hpb=ba2eae5d528487900d1510fc0a160e660f2c394c;p=gem5.git

diff --git a/src/sim/builder.hh b/src/sim/builder.hh
index b32e00e76..2997fe5c3 100644
--- a/src/sim/builder.hh
+++ b/src/sim/builder.hh
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
  */
 
 #ifndef __BUILDER_HH__
@@ -53,14 +55,8 @@ class SimObject;
 //
 class SimObjectBuilder : public ParamContext
 {
-  private:
-    // The corresponding node in the configuration hierarchy.
-    // (optional: may be null if the created object is not in the
-    // hierarchy)
-    ConfigNode *configNode;
-
   public:
-    SimObjectBuilder(ConfigNode *_configNode);
+    SimObjectBuilder(const std::string &_iniSection);
 
     virtual ~SimObjectBuilder();
 
@@ -75,9 +71,6 @@ class SimObjectBuilder : public ParamContext
     // configuration hierarchy node label and position)
     virtual const std::string &getInstanceName() { return iniSection; }
 
-    // return the configuration hierarchy node for this context.
-    virtual ConfigNode *getConfigNode() { return configNode; }
-
     // Create the actual SimObject corresponding to the parameter
     // values in this context.  This function is overridden in derived
     // classes to call a specific constructor for a particular
@@ -123,7 +116,7 @@ class SimObjectClass
     // for the object (specified by the second string argument), and
     // an optional config hierarchy node (specified by the third
     // argument).  A pointer to the new SimObjectBuilder is returned.
-    typedef SimObjectBuilder *(*CreateFunc)(ConfigNode *configNode);
+    typedef SimObjectBuilder *(*CreateFunc)(const std::string &iniSection);
 
     static std::map<std::string,CreateFunc> *classMap;
 
@@ -135,7 +128,8 @@ class SimObjectClass
 
     // create SimObject given name of class and pointer to
     // configuration hierarchy node
-    static SimObject *createObject(IniFile &configDB, ConfigNode *configNode);
+    static SimObject *createObject(IniFile &configDB,
+                                   const std::string &iniSection);
 
     // print descriptions of all parameters registered with all
     // SimObject classes
@@ -154,15 +148,15 @@ class OBJ_CLASS##Builder : public SimObjectBuilder		\
 
 #define END_DECLARE_SIM_OBJECT_PARAMS(OBJ_CLASS)		\
                                                                 \
-    OBJ_CLASS##Builder(ConfigNode *configNode);			\
+    OBJ_CLASS##Builder(const std::string &iniSection);          \
     virtual ~OBJ_CLASS##Builder() {}				\
                                                                 \
     OBJ_CLASS *create();					\
 };
 
 #define BEGIN_INIT_SIM_OBJECT_PARAMS(OBJ_CLASS)			\
-OBJ_CLASS##Builder::OBJ_CLASS##Builder(ConfigNode *configNode)	\
-    : SimObjectBuilder(configNode),
+    OBJ_CLASS##Builder::OBJ_CLASS##Builder(const std::string &iSec) \
+    : SimObjectBuilder(iSec),
 
 
 #define END_INIT_SIM_OBJECT_PARAMS(OBJ_CLASS)			\
@@ -174,9 +168,9 @@ OBJ_CLASS *OBJ_CLASS##Builder::create()
 
 #define REGISTER_SIM_OBJECT(CLASS_NAME, OBJ_CLASS)		\
 SimObjectBuilder *						\
-new##OBJ_CLASS##Builder(ConfigNode *configNode)			\
+new##OBJ_CLASS##Builder(const std::string &iniSection)          \
 {								\
-    return new OBJ_CLASS##Builder(configNode);			\
+    return new OBJ_CLASS##Builder(iniSection);			\
 }								\
                                                                 \
 SimObjectClass the##OBJ_CLASS##Class(CLASS_NAME,		\