plugin/tracing: merge full-tracing plugin into generic version
The full-tracing plugin was used in the DSN paper. It additionally traces the data that was accessed/written on a memory access and the contents of some CPU registers. Change-Id: I61f5230699009ce523aba341985b98148160556d
This commit is contained in:
committed by
Gerrit Code Review
parent
cffafa411c
commit
4e8098a636
@ -1,7 +1,9 @@
|
||||
#include <iostream>
|
||||
#include <assert.h>
|
||||
|
||||
#include "sal/SALInst.hpp"
|
||||
#include "sal/Register.hpp"
|
||||
#include "sal/Memory.hpp"
|
||||
#include "sal/Listener.hpp"
|
||||
#include "TracingPlugin.hpp"
|
||||
|
||||
@ -10,6 +12,8 @@ using namespace fail;
|
||||
|
||||
bool TracingPlugin::run()
|
||||
{
|
||||
MemoryManager& mm = simulator.getMemoryManager();
|
||||
|
||||
MemAccessListener ev_mem(ANY_ADDR);
|
||||
BPSingleListener ev_step(ANY_ADDR);
|
||||
BaseListener *ev;
|
||||
@ -23,13 +27,24 @@ bool TracingPlugin::run()
|
||||
if(m_protoStreamFile) {
|
||||
ps = new ProtoOStream(m_protoStreamFile);
|
||||
}
|
||||
|
||||
|
||||
#ifdef BUILD_X86
|
||||
size_t ids[] = {RID_CSP, RID_CBP, RID_FLAGS};
|
||||
#else
|
||||
size_t ids[] = {};
|
||||
#endif
|
||||
|
||||
Register *regs[sizeof(ids)/sizeof(*ids)];
|
||||
for (unsigned i = 0; i < sizeof(ids)/sizeof(*ids); ++i)
|
||||
regs[i] = simulator.getCPU(0).getRegister(ids[i]);
|
||||
|
||||
|
||||
while (true) {
|
||||
ev = simulator.resume();
|
||||
|
||||
if (ev == &ev_step) {
|
||||
simulator.addListener(&ev_step);
|
||||
|
||||
|
||||
address_t ip = ev_step.getTriggerInstructionPointer();
|
||||
if (m_ipMap && !m_ipMap->isMatching(ip)) {
|
||||
continue;
|
||||
@ -49,15 +64,15 @@ bool TracingPlugin::run()
|
||||
address_t addr = ev_mem.getTriggerAddress();
|
||||
size_t width = ev_mem.getTriggerWidth();
|
||||
if ((m_ipMap && !m_ipMap->isMatching(ip)) ||
|
||||
(m_memMap && !m_memMap->isMatching(addr, width))) {
|
||||
(m_memMap && !m_memMap->isMatching(addr, width))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (m_os)
|
||||
*m_os << hex << "[Tracing] MEM "
|
||||
<< ((ev_mem.getTriggerAccessType() &
|
||||
MemAccessEvent::MEM_READ) ? "R " : "W ")
|
||||
<< addr << " width " << width << " IP " << ip << "\n";
|
||||
<< ((ev_mem.getTriggerAccessType() &
|
||||
MemAccessEvent::MEM_READ) ? "R " : "W ")
|
||||
<< addr << " width " << width << " IP " << ip << "\n";
|
||||
if (m_protoStreamFile) {
|
||||
Trace_Event e;
|
||||
e.set_ip(ip);
|
||||
@ -66,6 +81,29 @@ bool TracingPlugin::run()
|
||||
e.set_accesstype(
|
||||
(ev_mem.getTriggerAccessType() & MemAccessEvent::MEM_READ) ?
|
||||
e.READ : e.WRITE);
|
||||
|
||||
/* When we're doing a full trace, we log more data in
|
||||
the case of a memory event */
|
||||
if (m_full_trace) {
|
||||
Trace_Event_Extended &ext = *e.mutable_trace_ext();
|
||||
// Read the accessed data
|
||||
assert(width <= 8);
|
||||
uint64_t data = 0;
|
||||
mm.getBytes(addr, width, &data);
|
||||
ext.set_data(data);
|
||||
|
||||
for (unsigned i = 0; i < sizeof(ids)/sizeof(*ids); ++i) {
|
||||
Trace_Event_Extended_Registers *er = ext.add_registers();
|
||||
er->set_id(ids[i]);
|
||||
er->set_value(simulator.getCPU(0).getRegisterContent(regs[i]));
|
||||
if (er->value() <= mm.getPoolSize() - width) {
|
||||
uint32_t value_deref;
|
||||
mm.getBytes(er->value(), 4, &value_deref);
|
||||
er->set_value_deref(value_deref);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ps->writeMessage(&e);
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user