christoph/fail
1
Fork 0
Code Releases Activity

Experiment updates due to last commit.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1449 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-07-12 10:45:39 +00:00
parent a78911702a
commit 2076d21e61
13 changed files with 177 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,25 +9,25 @@ using namespace fail;
bool TracingPlugin::run()
{
MemAccessEvent ev_mem(ANY_ADDR);
BPSingleEvent ev_step(ANY_ADDR);
BaseEvent *ev;
MemAccessListener ev_mem(ANY_ADDR);
BPSingleListener ev_step(ANY_ADDR);
BaseListener *ev;
if (m_iponly || !m_memonly) {
simulator.addEvent(&ev_step);
simulator.addListener(&ev_step);
}
if (m_memonly || !m_iponly) {
simulator.addEvent(&ev_mem);
simulator.addListener(&ev_mem);
}
if(m_protoStreamFile) {
ps = new ProtoOStream(m_protoStreamFile);
}
while (true) {
ev = simulator.waitAny();
ev = simulator.resume();
if (ev == &ev_step) {
simulator.addEvent(&ev_step);
simulator.addListener(&ev_step);
address_t ip = ev_step.getTriggerInstructionPointer();
if (m_ipMap && !m_ipMap->isMatching(ip)) {
@ -42,7 +42,7 @@ bool TracingPlugin::run()
ps->writeMessage(&e);
}
} else if (ev == &ev_mem) {
simulator.addEvent(&ev_mem);
simulator.addListener(&ev_mem);
address_t ip = ev_mem.getTriggerInstructionPointer();
address_t addr = ev_mem.getTriggerAddress();
@ -55,7 +55,7 @@ bool TracingPlugin::run()
if (m_os)
*m_os << hex << "[Tracing] MEM "
<< ((ev_mem.getTriggerAccessType() &
MemAccessEvent::MEM_READ) ? "R " : "W ")
MemAccessListener::MEM_READ) ? "R " : "W ")
<< addr << " width " << width << " IP " << ip << "\n";
if (m_protoStreamFile) {
Trace_Event e;
@ -63,7 +63,7 @@ bool TracingPlugin::run()
e.set_memaddr(addr);
e.set_width(width);
e.set_accesstype(
(ev_mem.getTriggerAccessType() & MemAccessEvent::MEM_READ) ?
(ev_mem.getTriggerAccessType() & MemAccessListener::MEM_READ) ?
e.READ : e.WRITE);
ps->writeMessage(&e);
}