Fixes so that it compiles properly. Still working on .py file issues.

SConscript:
    Add Back memory to be built
mem/physical.hh:
    Fix function declerations
python/m5/objects/BaseCPU.py:
    Remove IL1 and DL1 params from the cpu object

--HG--
extra : convert_revision : 2f285dc626bc8d84d095def68e986fe7e6f3d8e9
This commit is contained in:
Ron Dreslinski
2006-02-27 16:33:11 -05:00
parent b6247c9ea7
commit 31fc398f06
3 changed files with 3 additions and 4 deletions

View File

@@ -91,6 +91,7 @@ base_sources = Split('''
cpu/static_inst.cc
cpu/sampler/sampler.cc
mem/memory.cc
mem/page_table.cc
mem/physical.cc
mem/port.cc

View File

@@ -70,9 +70,9 @@ class PhysicalMemory : public Memory
std::map<std::string, MemoryPort*> memoryPortList;
Port * PhysicalMemory::getPort(const char *if_name);
virtual Port * getPort(const char *if_name);
Port * addPort(std::string portName);
virtual Port * addPort(std::string portName);
int numPorts;

View File

@@ -2,8 +2,6 @@ from m5 import *
class BaseCPU(SimObject):
type = 'BaseCPU'
abstract = True
icache = Param.BaseMem(NULL, "L1 instruction cache object")
dcache = Param.BaseMem(NULL, "L1 data cache object")
if build_env['FULL_SYSTEM']:
dtb = Param.AlphaDTB("Data TLB")