diff options
author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
commit | 141f61d83a23096dcff20df704bdd734c520f535 (patch) | |
tree | ee2383d721a039bb056bd6442a7241aa305d187e /src/mem/ruby/system/System.cc | |
parent | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (diff) | |
download | gem5-141f61d83a23096dcff20df704bdd734c520f535.tar.xz |
ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base
Diffstat (limited to 'src/mem/ruby/system/System.cc')
-rw-r--r-- | src/mem/ruby/system/System.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index 418b31bf0..d28d74a89 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/intmath.hh" #include "base/output.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/common/Address.hh" @@ -63,14 +64,14 @@ RubySystem::RubySystem(const Params *p) m_clock = p->clock; m_block_size_bytes = p->block_size_bytes; - assert(is_power_of_2(m_block_size_bytes)); - m_block_size_bits = log_int(m_block_size_bytes); + assert(isPowerOf2(m_block_size_bytes)); + m_block_size_bits = floorLog2(m_block_size_bytes); m_memory_size_bytes = p->mem_size; if (m_memory_size_bytes == 0) { m_memory_size_bits = 0; } else { - m_memory_size_bits = log_int(m_memory_size_bytes); + m_memory_size_bits = floorLog2(m_memory_size_bytes); } m_network_ptr = p->network; |