ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base

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;