christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

ecos_kernel_test: for step 0, just wait until 'ECOS_FUNC_FINISH' ; don't use a timer

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1474 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
chb
2012-08-08 14:20:44 +00:00
parent 67254191c8
commit ad42c5b04a
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/experiments/ecos_kernel_test/experiment.cc
View File

@ -22,7 +22,7 @@
#define LOCAL 0 #define LOCAL 0
#define PREREQUISITES 0 // 1: do step 0-2 ; 0: do step 3 #define PREREQUISITES 1 // 1: do step 0-2 ; 0: do step 3
using namespace std; using namespace std;
using namespace fail; using namespace fail;
@ -42,16 +42,16 @@ bool EcosKernelTestExperiment::retrieveGuestAddresses() {
log << "STEP 0: record memory map with addresses of 'interesting' objects" << endl; log << "STEP 0: record memory map with addresses of 'interesting' objects" << endl;
// workaround for 00002808875p[BIOS ] >>PANIC<< Keyboard error:21 // workaround for 00002808875p[BIOS ] >>PANIC<< Keyboard error:21
// *** If the first listener is a TimerListener, FailBochs panics. ***
// *** Therefore, just wait one instruction before using a timer. ***
// BPSingleListener bp;
// bp.setWatchInstructionPointer(ANY_ADDR);
// simulator.addListenerAndResume(&bp);
// run until 'ECOS_FUNC_FINISH' is reached
BPSingleListener bp; BPSingleListener bp;
bp.setWatchInstructionPointer(ANY_ADDR); bp.setWatchInstructionPointer(ECOS_FUNC_FINISH);
simulator.addListenerAndResume(&bp); simulator.addListener(&bp);
GuestListener g;
simulator.addListener(&g);
// 10000us = 500000 instructions
TimerListener record_timeout(50000000); //TODO: how long to wait?
simulator.addListener(&record_timeout);
// memory map serialization // memory map serialization
ofstream mm(mm_filename, ios::out | ios::app); ofstream mm(mm_filename, ios::out | ios::app);
@ -60,12 +60,11 @@ bool EcosKernelTestExperiment::retrieveGuestAddresses() {
return false; return false;
} }
string *str = new string; // buffer for guest listeners GuestListener g;
string *str = new string; // buffer for guest listeners' data
unsigned number_of_guest_events = 0; unsigned number_of_guest_events = 0;
while (simulator.resume() != &record_timeout) { while (simulator.addListenerAndResume(&g) == &g) {
simulator.addListener(&g);
str->push_back(g.getData());
if (g.getData() == '\t') { if (g.getData() == '\t') {
// addr complete? // addr complete?
//cout << "full: " << *str << "sub: " << str->substr(str->find_last_of('x') - 1) << endl; //cout << "full: " << *str << "sub: " << str->substr(str->find_last_of('x') - 1) << endl;
@ -84,16 +83,25 @@ bool EcosKernelTestExperiment::retrieveGuestAddresses() {
mm << guest_len << '\n'; mm << guest_len << '\n';
str->clear(); str->clear();
number_of_guest_events++; number_of_guest_events++;
} else if (g.getData() == 'Q') {
// ignore, see STEP 1
} else {
str->push_back(g.getData());
} }
} }
assert(number_of_guest_events > 0); assert(number_of_guest_events > 0);
log << "Record timeout reached: created memory map (" << number_of_guest_events << " entries)" << endl; log << "Breakpoint at 'ECOS_FUNC_FINISH' reached: created memory map (" << number_of_guest_events << " entries)" << endl;
delete str; delete str;
// close serialized mm // close serialized mm
mm.flush(); mm.flush();
mm.close(); mm.close();
// workaround for 00291674339e[CPU0 ] prefetch: EIP [00010000] > CS.limit [0000ffff]
// *** just wait some time here *** //FIXME
TimerListener record_timeout(1);
simulator.addListenerAndResume(&record_timeout);
// clean up simulator // clean up simulator
simulator.clearListeners(); simulator.clearListeners();
return true; return true;