christoph/fail
1
Fork 0
Code Releases Activity

generic-tracing: fix lossage of first event

Browse Source 
When using the generic-tracing experiment for generating a trace, the
first event, after the tracing is started (the start-symbol) is lost
in the trace. This patch handles this special case seperately.

Change-Id: Ia131a8559d67161532504160826fdb100247ed75
This commit is contained in:
Christian Dietrich
2013-09-19 15:57:11 +02:00
parent f2e76bfd70
commit 036e340bd9
3 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/tracing/TracingPlugin.cc
View File

@ -1,6 +1,7 @@
#include <iostream>
#include <assert.h>
#include "sal/SALConfig.hpp"
#include "sal/SALInst.hpp"
#include "sal/Register.hpp"
#include "sal/Memory.hpp"
@ -10,6 +11,34 @@
using namespace std;
using namespace fail;
void TracingPlugin::handleSingleIP(const BPListener &bp) {
address_t ip = bp.getTriggerInstructionPointer();
if (m_ipMap && !m_ipMap->isMatching(ip)) {
return;
}
m_curtime = simulator.getTimerTicks();
simtime_diff_t deltatime = m_curtime - m_prevtime;
if (m_os)
*m_os << "[Tracing] IP " << hex << ip << "\n";
if (m_protoStreamFile) {
Trace_Event e;
e.set_ip(ip);
// only store deltas != 0
if (deltatime != 0) {
e.set_time_delta(deltatime);
}
if (!ps) {
ps = new ProtoOStream (m_protoStreamFile);
}
ps->writeMessage(&e);
}
}
bool TracingPlugin::run()
{
MemoryManager& mm = simulator.getMemoryManager();
@ -33,14 +62,13 @@ bool TracingPlugin::run()
// the first event gets an absolute time stamp, all others a delta to their
// predecessor
simtime_t prevtime = 0, curtime;
simtime_diff_t deltatime;
while (true) {
ev = simulator.resume();
curtime = simulator.getTimerTicks();
deltatime = curtime - prevtime;
m_curtime = simulator.getTimerTicks();
deltatime = m_curtime - m_prevtime;
if (ev == &ev_step) {
simulator.addListener(&ev_step);
@ -122,7 +150,7 @@ bool TracingPlugin::run()
// do this only if the last delta was written
// (no, e.g., memory map mismatch)
prevtime = curtime;
m_prevtime = m_curtime;
}
return true;