cpu: Factor the page size out of the decode cache.

[gem5.git] / src / cpu / inteltrace.cc

diff --git a/src/cpu/inteltrace.cc b/src/cpu/inteltrace.cc
index 145075dc1669a61a6f9a33b3ab686d81e4e844df..4a410e1b74816918a253d23ea75a4aff27b907f3 100644 (file)
--- a/src/cpu/inteltrace.cc
+++ b/src/cpu/inteltrace.cc
@@ -24,17 +24,14 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Steve Reinhardt
- *          Lisa Hsu
- *          Nathan Binkert
- *          Steve Raasch
  */
 
+#include "cpu/inteltrace.hh"
+
 #include <iomanip>
 
+#include "config/the_isa.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/inteltrace.hh"
 #include "cpu/static_inst.hh"
 
 using namespace std;
@@ -47,7 +44,7 @@ Trace::IntelTraceRecord::dump()
 {
     ostream &outs = Trace::output();
     ccprintf(outs, "%7d ) ", when);
-    outs << "0x" << hex << PC << ":\t";
+    outs << "0x" << hex << pc.instAddr() << ":\t";
     if (staticInst->isLoad()) {
         ccprintf(outs, "<RD %#x>", addr);
     } else if (staticInst->isStore()) {
@@ -56,7 +53,7 @@ Trace::IntelTraceRecord::dump()
     outs << endl;
 }
 
-/* namespace Trace */ }
+} // namespace Trace
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -66,4 +63,4 @@ Trace::IntelTrace *
 IntelTraceParams::create()
 {
     return new Trace::IntelTrace(this);
-};
+}