L4Sys: fix use of L4SYS_NUMINSTR

* L4SYS_NUMINSTR counts the instructions that were selected for
  injection and is used by the campaign server to generate experiments
* L4SYS_TOTINSTR counts the total number of instructions executed.
  It is used by the experiment to determine the timeout value.

Change-Id: Ibf37aea2a1f5ad5afad2b1232ce22fe070b08490
This commit is contained in:
Bjoern Doebel
2013-08-09 14:59:45 +02:00
parent 2c35ac6235
commit ed772429f9
3 changed files with 44 additions and 15 deletions

View File

@ -5,11 +5,20 @@
#define MAX_INSTR_BYTES 15
// the bounds of the program (space, instructions and time)
#define L4SYS_ADDRESS_SPACE 0x1fe0000
#define L4SYS_FUNC_ENTRY 0x10025ca
#define L4SYS_FUNC_EXIT 0x1002810
#define L4SYS_ADDRESS_SPACE 0x1fd6e000
#define L4SYS_FUNC_ENTRY 0x01000200
#define L4SYS_FUNC_EXIT 0x01000245
// Instruction filtering: Allows to specify a range within
// which to perform injection experiments. If in doubt, set
// to the whole user-addressable area (0, 0xC0000000)
#define L4SYS_FILTER_INSTRUCTIONS 1
#define L4SYS_ADDRESS_LBOUND 0
#define L4SYS_ADDRESS_UBOUND 0xC0000000
// kernel: 2377547, userland: 79405472
#define L4SYS_NUMINSTR 81783019
#define L4SYS_NUMINSTR 3281
#define L4SYS_TOTINSTR 228218
#define L4SYS_BOCHS_IPS 5000000
// several file names used
@ -21,6 +30,6 @@
// flags
// 0 - preparation complete
// >0 - next step to execute
#define PREPARATION_STEP 0
#define PREPARATION_STEP 0
#endif // __L4SYS_EXPERIMENT_INFO_HPP__