From 71170145e0276603b97267632c87df501390aade Mon Sep 17 00:00:00 2001 From: Bjoern Doebel Date: Mon, 21 Oct 2013 18:00:58 +0200 Subject: [PATCH] Adapt l4-sys experiment to importer fix no need to decrement instruction offset before setting bp anymore Change-Id: I7f9c02349663899fa8f496a46bcb357bd567ac5c --- src/experiments/l4-sys/experiment.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/experiments/l4-sys/experiment.cc b/src/experiments/l4-sys/experiment.cc index a095952a..b567da2f 100644 --- a/src/experiments/l4-sys/experiment.cc +++ b/src/experiments/l4-sys/experiment.cc @@ -541,6 +541,7 @@ void L4SysExperiment::setupFilteredBreakpoint(fail::BPSingleListener* bp, int in terminate(21); } + log << "inst offset " << dec << instOffset << " sizeof(TraceInstr) " << sizeof(TraceInstr) << endl; TraceInstr curr_instr; instr_list_file.seekg(instOffset * sizeof(TraceInstr)); 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; #if L4SYS_FILTER_INSTRUCTIONS - setupFilteredBreakpoint(bp, offset-1); + setupFilteredBreakpoint(bp, offset); assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF)); #else bp->setWatchInstructionPointer(ANY_ADDR); @@ -591,7 +592,7 @@ L4SysExperiment::prepareRegisterExperiment(int ip, int offset, int dataAddress) << regOffset << ")" << std::endl; #if L4SYS_FILTER_INSTRUCTIONS - setupFilteredBreakpoint(bp, offset-1); + setupFilteredBreakpoint(bp, offset); log << bp->getWatchInstructionPointer() << std::endl; log << ip << std::endl; assert(bp->getWatchInstructionPointer() == (address_t)(ip & 0xFFFFFFFF));