christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Adapt l4-sys experiment to importer fix

Browse Source 
no need to decrement instruction offset before setting bp anymore

Change-Id: I7f9c02349663899fa8f496a46bcb357bd567ac5c
This commit is contained in:
Bjoern Doebel
2013-10-21 18:00:58 +02:00
parent 63610d0652
commit 71170145e0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/experiments/l4-sys/experiment.cc
View File

@ -541,6 +541,7 @@ void L4SysExperiment::setupFilteredBreakpoint(fail::BPSingleListener* bp, int in
terminate(21); terminate(21);
} }
log << "inst offset " << dec << instOffset << " sizeof(TraceInstr) " << sizeof(TraceInstr) << endl;
TraceInstr curr_instr; TraceInstr curr_instr;
instr_list_file.seekg(instOffset * sizeof(TraceInstr)); instr_list_file.seekg(instOffset * sizeof(TraceInstr));
log << instr_list_file.eof() << " " << instr_list_file.bad() << " " log << instr_list_file.eof() << " " << instr_list_file.bad() << " "
@ -567,7 +568,7 @@ L4SysExperiment::prepareMemoryExperiment(int ip, int offset, int dataAddress)
<< ", ip " << ip << ", address " << dataAddress << std::endl; << ", ip " << ip << ", address " << dataAddress << std::endl;
#if L4SYS_FILTER_INSTRUCTIONS #if L4SYS_FILTER_INSTRUCTIONS
setupFilteredBreakpoint(bp, offset-1); setupFilteredBreakpoint(bp, offset);
assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF)); assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF));
#else #else
bp->setWatchInstructionPointer(ANY_ADDR); bp->setWatchInstructionPointer(ANY_ADDR);
@ -591,7 +592,7 @@ L4SysExperiment::prepareRegisterExperiment(int ip, int offset, int dataAddress)
<< regOffset << ")" << std::endl; << regOffset << ")" << std::endl;
#if L4SYS_FILTER_INSTRUCTIONS #if L4SYS_FILTER_INSTRUCTIONS
setupFilteredBreakpoint(bp, offset-1); setupFilteredBreakpoint(bp, offset);
log << bp->getWatchInstructionPointer() << std::endl; log << bp->getWatchInstructionPointer() << std::endl;
log << ip << std::endl; log << ip << std::endl;
assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF)); assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF));