diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-01 18:45:50 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-01 18:45:50 -0500 |
commit | 22504f8b48978be286d98be0df72d015ab6ff559 (patch) | |
tree | 40b1c96f1c36865abf1171913f1efcd168e63251 /base | |
parent | 31fc398f0641a9dcc9757520e9dc7fd2cce102fb (diff) | |
download | gem5-22504f8b48978be286d98be0df72d015ab6ff559.tar.xz |
More progress toward actually running a program.
See configs/test.py for test config (using simple
binary in my home directory on zizzer).
base/chunk_generator.hh:
Fix assertion for chunkSize == 0 (not a power of 2)
base/intmath.hh:
Fix roundDown to take integer alignments.
cpu/base.cc:
Register exec contexts regardless of state (not sure why
this check was in here in the first place).
mem/physical.cc:
Add breaks to switch.
python/m5/objects/BaseCPU.py:
Default mem to Parent.any (e.g. get from System).
python/m5/objects/Ethernet.py:
python/m5/objects/Root.py:
HierParams is gone.
python/m5/objects/PhysicalMemory.py:
mmu param is full-system only.
sim/process.cc:
Stack mapping request must be page-aligned and page-sized.
Don't delete objFile object in create since we are counting
on it being around for startup().
--HG--
extra : convert_revision : 90c43ee927e7d82a045d6e10302d965797d006f7
Diffstat (limited to 'base')
-rw-r--r-- | base/chunk_generator.hh | 2 | ||||
-rw-r--r-- | base/intmath.hh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/chunk_generator.hh b/base/chunk_generator.hh index afd577814..a584679d0 100644 --- a/base/chunk_generator.hh +++ b/base/chunk_generator.hh @@ -77,7 +77,7 @@ class ChunkGenerator : chunkSize(_chunkSize) { // chunkSize must be a power of two - assert(isPowerOf2(chunkSize)); + assert(chunkSize == 0 || isPowerOf2(chunkSize)); // set up initial chunk. curAddr = startAddr; diff --git a/base/intmath.hh b/base/intmath.hh index c8b9c5ec5..198278d6f 100644 --- a/base/intmath.hh +++ b/base/intmath.hh @@ -202,9 +202,9 @@ roundUp(T val, int align) template <class T> inline T -roundDown(T val, T align) +roundDown(T val, int align) { - T mask = align - 1; + T mask = (T)align - 1; return val & ~mask; } |