From 782fb42992076dfd88ffb7d0c4e689d1bb1220d8 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Fri, 2 Apr 2004 22:57:08 -0800
Subject: Basic cleanup pass to get rid of a few things that made the Python
 configuration unnecessarily awkward.  Biggest changes are:

- External and internal object names now match in all cases.  The
macros still allow them to be different; the only reason I didn't
get rid of that is that the macros themselves should be going away
soon.  In the few conflicting cases, I sometimes renamed the C++ object
and sometimes renamed the config object.  The latter sets of substitions
are:

s/BaseBus/Bus/;
s/MemoryObject/FunctionalMemory/;
s/MemoryControl/MemoryController/;
s/FUPool/FuncUnitPool/;

- SamplingCPU is temporarily broken... we need to change the model
of how this works in the .ini file.  Having it as a CPU proxy is
really awkward.

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/process.cc:
    Rename objects to match config name.
cpu/base_cpu.cc:
    Uncomment SimObject define since SamplingCPU no longer
    does this for us.
dev/ethertap.cc:
    Use unsigned instead of uint16_t for params.
kern/tru64/tru64_system.cc:
    Use unsigned instead of uint64_t for init_param param.
test/paramtest.cc:
    Fix old SimObjectParam.

--HG--
extra : convert_revision : 378ebbc6a71ad0694501d09979a44d111a59e8dc
---
 dev/ethertap.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/ethertap.cc b/dev/ethertap.cc
index 960d21d73..db1b3660f 100644
--- a/dev/ethertap.cc
+++ b/dev/ethertap.cc
@@ -313,8 +313,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
 
     SimObjectParam<EtherInt *> peer;
     SimObjectParam<EtherDump *> packet_dump;
-    Param<uint16_t> port;
-    Param<uint16_t> bufsz;
+    Param<unsigned> port;
+    Param<unsigned> bufsz;
 
 END_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
 
-- 
cgit v1.2.3


From d4069233eb8cc875aa443cb7c6a16b748e3acc42 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Tue, 6 Apr 2004 10:02:00 -0700
Subject: Beta version of Python configuration tool.  Generates .ini files from
 Python script description.

arch/alpha/alpha_memory.cc:
dev/io_device.cc:
    Add DEFINE_SIM_OBJECT_CLASS_NAME for intermediate SimObjects.
test/paramtest.cc:
    Fix stupid spelling.

--HG--
extra : convert_revision : dc020208cb6507c1afb1ed771a7218daba678e09
---
 dev/io_device.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'dev')

diff --git a/dev/io_device.cc b/dev/io_device.cc
index 4f53ba48d..910b889d8 100644
--- a/dev/io_device.cc
+++ b/dev/io_device.cc
@@ -29,6 +29,7 @@
 #include "dev/io_device.hh"
 #include "mem/bus/base_interface.hh"
 #include "mem/bus/dma_interface.hh"
+#include "sim/builder.hh"
 
 PioDevice::PioDevice(const std::string &name)
     : FunctionalMemory(name), pioInterface(NULL)
@@ -40,6 +41,8 @@ PioDevice::~PioDevice()
         delete pioInterface;
 }
 
+DEFINE_SIM_OBJECT_CLASS_NAME("PioDevice", PioDevice)
+
 DmaDevice::DmaDevice(const std::string &name)
     : PioDevice(name), dmaInterface(NULL)
 {}
@@ -50,3 +53,5 @@ DmaDevice::~DmaDevice()
         delete dmaInterface;
 }
 
+DEFINE_SIM_OBJECT_CLASS_NAME("DmaDevice", DmaDevice)
+
-- 
cgit v1.2.3