From 225db6865efbafeb6844ac61000f3c5f167e71b6 Mon Sep 17 00:00:00 2001
From: unzner <unzner@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Fri, 5 Oct 2012 13:22:00 +0000
Subject: [PATCH] Restore state before 2nd preparation step

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1725 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 src/experiments/l4-sys/experiment.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/experiments/l4-sys/experiment.cc b/src/experiments/l4-sys/experiment.cc
index 363da284..2583c538 100644
--- a/src/experiments/l4-sys/experiment.cc
+++ b/src/experiments/l4-sys/experiment.cc
@@ -189,10 +189,14 @@ bool L4SysExperiment::run() {
 	simulator.save(L4SYS_STATE_FOLDER);
 #elif PREPARATION_STEP == 2
 	// STEP 2: determine instructions executed
+	log << "restoring state" << endl;
+	simulator.restore(L4SYS_STATE_FOLDER);
+	log << "EIP = " << hex
+			<< simulator.getRegisterManager().getInstructionPointer()
+			<< endl;
 
-	// count the first instruction which has already been executed
-	int count = 1;
-	int ul = 1, kernel = 0;
+	int count = 0;
+	int ul = 0, kernel = 0;
 	bp.setWatchInstructionPointer(ANY_ADDR);
 	for (; bp.getTriggerInstructionPointer() != L4SYS_FUNC_EXIT; ++count) {
 		simulator.addListenerAndResume(&bp);