projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem: Make the XBar responsible for tracking response routing
[gem5.git]
/
src
/
cpu
/
legiontrace.cc
diff --git
a/src/cpu/legiontrace.cc
b/src/cpu/legiontrace.cc
index 75d30c89496014ac8bd0200126828948adbb4d93..b94b8f5fef7abfded6415696162cbb1df7b632f8 100644
(file)
--- a/
src/cpu/legiontrace.cc
+++ b/
src/cpu/legiontrace.cc
@@
-42,13
+42,12
@@
#include <cstdio>
#include <iomanip>
#include <cstdio>
#include <iomanip>
-#include "arch/sparc/
pre
decoder.hh"
+#include "arch/sparc/decoder.hh"
#include "arch/sparc/registers.hh"
#include "arch/sparc/utility.hh"
#include "arch/tlb.hh"
#include "base/socket.hh"
#include "cpu/base.hh"
#include "arch/sparc/registers.hh"
#include "arch/sparc/utility.hh"
#include "arch/tlb.hh"
#include "base/socket.hh"
#include "cpu/base.hh"
-#include "cpu/decode.hh"
#include "cpu/legiontrace.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
#include "cpu/legiontrace.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
@@
-146,7
+145,6
@@
Trace::LegionTraceRecord::dump()
{
ostream &outs = Trace::output();
{
ostream &outs = Trace::output();
- static TheISA::Predecoder predecoder(NULL);
// Compare
bool compared = false;
bool diffPC = false;
// Compare
bool compared = false;
bool diffPC = false;
@@
-423,15
+421,13
@@
Trace::LegionTraceRecord::dump()
<< staticInst->disassemble(m5Pc, debugSymbolTable)
<< endl;
<< staticInst->disassemble(m5Pc, debugSymbolTable)
<< endl;
-
predecoder.setTC(thread
);
-
predecoder.
moreBytes(m5Pc, m5Pc, shared_data->instruction);
+
TheISA::Decoder *decoder = thread->getDecoderPtr(
);
+
decoder->
moreBytes(m5Pc, m5Pc, shared_data->instruction);
- assert(
predecoder.extMachI
nstReady());
+ assert(
decoder->i
nstReady());
PCState tempPC = pc;
PCState tempPC = pc;
- StaticInstPtr legionInst =
- thread->getDecoderPtr()->decode(
- predecoder.getExtMachInst(tempPC), lgnPc);
+ StaticInstPtr legionInst = decoder->decode(tempPC);
outs << setfill(' ') << setw(15)
<< " Legion Inst: "
<< "0x" << setw(8) << setfill('0') << hex
outs << setfill(' ') << setw(15)
<< " Legion Inst: "
<< "0x" << setw(8) << setfill('0') << hex
@@
-539,7
+535,7
@@
Trace::LegionTraceRecord::dump()
}
if (diffTlb) {
printColumnLabels(outs);
}
if (diffTlb) {
printColumnLabels(outs);
- char label[
8
];
+ char label[
9
];
for (int x = 0; x < 64; x++) {
if (shared_data->itb[x] !=
ULL(0xFFFFFFFFFFFFFFFF) ||
for (int x = 0; x < 64; x++) {
if (shared_data->itb[x] !=
ULL(0xFFFFFFFFFFFFFFFF) ||