diff options
author | Erik Hallnor <ehallnor@umich.edu> | 2004-09-02 11:27:38 -0400 |
---|---|---|
committer | Erik Hallnor <ehallnor@umich.edu> | 2004-09-02 11:27:38 -0400 |
commit | 1401a06691539e494a8d9cc59e5f682844d9d5ee (patch) | |
tree | baae4b852946e40bee885f05e6450448f35b2e33 /cpu/trace/reader | |
parent | 0b0a6778c96c3ac3e3f979d655de0ae595232507 (diff) | |
download | gem5-1401a06691539e494a8d9cc59e5f682844d9d5ee.tar.xz |
Update tracing functionality and add an ITX trace writer.
SConscript:
Add build support for ITX trace writer
cpu/trace/reader/itx_reader.cc:
Handle full 36 bit physical addressses.
cpu/trace/reader/itx_reader.hh:
Need a string header file here
cpu/trace/trace_cpu.cc:
cpu/trace/trace_cpu.hh:
Modify trace CPU to take a single trace and drive an instruction and data interfaces.
--HG--
extra : convert_revision : 4c81f2f9d9341df41f0ae45e4bda49800a43977c
Diffstat (limited to 'cpu/trace/reader')
-rw-r--r-- | cpu/trace/reader/itx_reader.cc | 2 | ||||
-rw-r--r-- | cpu/trace/reader/itx_reader.hh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cpu/trace/reader/itx_reader.cc b/cpu/trace/reader/itx_reader.cc index 593d383ec..615eb414e 100644 --- a/cpu/trace/reader/itx_reader.cc +++ b/cpu/trace/reader/itx_reader.cc @@ -130,6 +130,7 @@ ITXReader::getNextReq(MemReqPtr &req) // Get the page offset from the virtual address. tmp_req->paddr = tmp_req->vaddr & 0xfff; tmp_req->paddr |= (c & 0xf0) << 8; + tmp_req->paddr |= (Addr)(c & 0xf0) << 32; for (int i = 2; i < 4; ++i) { c = getc(trace); if (c == EOF) { @@ -160,6 +161,7 @@ ITXReader::getNextReq(MemReqPtr &req) break; case ITXCode: tmp_req->cmd = Read; + tmp_req->flags |= INST_READ; break; default: fatal("Unknown ITX type"); diff --git a/cpu/trace/reader/itx_reader.hh b/cpu/trace/reader/itx_reader.hh index 0e08d5db5..d45a16a69 100644 --- a/cpu/trace/reader/itx_reader.hh +++ b/cpu/trace/reader/itx_reader.hh @@ -35,6 +35,7 @@ #define __ITX_READER_HH__ #include <stdio.h> +#include <string> #include "cpu/trace/reader/mem_trace_reader.hh" #include "mem/mem_req.hh" |