From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 23 Mar 2012 10:54:25 +0000 (-0400)
Subject: Ruby: Fix Set::print for 32-bit hosts
X-Git-Tag: stable_2012_06_28~157
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca9790a2db94e9fad36aa121e934f105348bdead;p=gem5.git

Ruby: Fix Set::print for 32-bit hosts

This patch fixes a compilation error caused by a length mismatch on
32-bit hosts. The ifdef and sprintf is replaced by a csprintf.
---

diff --git a/src/mem/ruby/common/Set.cc b/src/mem/ruby/common/Set.cc
index 12d0b2a21..afa606c56 100644
--- a/src/mem/ruby/common/Set.cc
+++ b/src/mem/ruby/common/Set.cc
@@ -352,13 +352,9 @@ Set::print(std::ostream& out) const
     }
 
     char buff[24];
-    out << "[Set (" << m_nSize << ") 0x ";
+    out << "[Set (" << m_nSize << ")";
     for (int i = m_nArrayLen - 1; i >= 0; i--) {
-#ifdef _LP64
-        sprintf(buff,"0x %016llX ", (long long)m_p_nArray[i]);
-#else
-        sprintf(buff,"%08X ", m_p_nArray[i]);
-#endif // __32BITS__
+        csprintf(buff," 0x%08X", m_p_nArray[i]);
         out << buff;
     }
     out << " ]";