wmoo: experimentInfo update for new wmoo images

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1335 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

src/experiments/weather-monitor/experimentInfo.hpp

@@ -12,11 +12,11 @@
 #define WEATHER_SUFFIX				".vanilla"
 // main() address:
 // nm -C vanilla.elf|fgrep main
-#define WEATHER_FUNC_MAIN			0x00100f70
+#define WEATHER_FUNC_MAIN			0x00100d70
 // wait_begin address
-#define WEATHER_FUNC_WAIT_BEGIN		0x00100f50
+#define WEATHER_FUNC_WAIT_BEGIN		0x00100d68
 // wait_end address
-#define WEATHER_FUNC_WAIT_END		0x00100f60
+#define WEATHER_FUNC_WAIT_END		0x00100d6c
 // vptr_panic address (only exists in guarded variant)
 #define WEATHER_FUNC_VPTR_PANIC		0x99999999
 // number of main loop iterations to trace
@@ -24,25 +24,25 @@
 #define WEATHER_NUMITER_TRACING		4
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_TRACING	20549
+#define WEATHER_NUMINSTR_TRACING	20599
 // number of additional loop iterations for FI experiments (to see whether
 // everything continues working fine)
 #define WEATHER_NUMITER_AFTER		2
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_AFTER		10232
+#define WEATHER_NUMINSTR_AFTER		10272
 // data/BSS begin:
 // nm -C vanilla.elf|fgrep ___DATA_START__
-#define WEATHER_DATA_START			0x00101814
+#define WEATHER_DATA_START			0x00101558
 // data/BSS end:
 // nm -C vanilla.elf|fgrep ___BSS_END__
-#define WEATHER_DATA_END			0x00103108
+#define WEATHER_DATA_END			0x00102e48
 // text begin:
 // nm -C vanilla.elf|fgrep ___TEXT_START__
 #define WEATHER_TEXT_START			0x00100000
 // text end:
 // nm -C vanilla.elf|fgrep ___TEXT_END__
-#define WEATHER_TEXT_END			0x0010165b
+#define WEATHER_TEXT_END			0x0010139f
 
 #elif WEATHERMONITOR_VARIANT == 1 // with guards
 
@@ -50,37 +50,37 @@
 #define WEATHER_SUFFIX				".guarded"
 // main() address:
 // nm -C guarded.elf|fgrep main
-#define WEATHER_FUNC_MAIN			0x00100fc0
+#define WEATHER_FUNC_MAIN			0x00100dac
 // wait_begin address
-#define WEATHER_FUNC_WAIT_BEGIN		0x00100fa0
+#define WEATHER_FUNC_WAIT_BEGIN		0x00100da4
 // wait_end address
-#define WEATHER_FUNC_WAIT_END		0x00100fb0
+#define WEATHER_FUNC_WAIT_END		0x00100da8
 // vptr_panic address (only exists in guarded variant)
-#define WEATHER_FUNC_VPTR_PANIC		0x00101460
+#define WEATHER_FUNC_VPTR_PANIC		0x0010104c
 // number of main loop iterations to trace
 // (determines trace length and therefore fault-space width)
 #define WEATHER_NUMITER_TRACING		4
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_TRACING	20549
+#define WEATHER_NUMINSTR_TRACING	20599
 // number of additional loop iterations for FI experiments (to see whether
 // everything continues working fine)
 #define WEATHER_NUMITER_AFTER		2
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_AFTER		10232
+#define WEATHER_NUMINSTR_AFTER		10272
 // data/BSS begin:
 // nm -C guarded.elf|fgrep ___DATA_START__
-#define WEATHER_DATA_START			0x00101b94
+#define WEATHER_DATA_START			0x00101878
 // data/BSS end:
 // nm -C guarded.elf|fgrep ___BSS_END__
-#define WEATHER_DATA_END			0x001034b8
+#define WEATHER_DATA_END			0x00103198
 // text begin:
 // nm -C guarded.elf|fgrep ___TEXT_START__
 #define WEATHER_TEXT_START			0x00100000
 // text end:
 // nm -C guarded.elf|fgrep ___TEXT_END__
-#define WEATHER_TEXT_END			0x001019db
+#define WEATHER_TEXT_END			0x001016af
 
 #elif WEATHERMONITOR_VARIANT == 2 // with guards + plausibility check
 
@@ -88,37 +88,37 @@
 #define WEATHER_SUFFIX				".plausibility"
 // main() address:
 // nm -C plausibility.elf|fgrep main
-#define WEATHER_FUNC_MAIN			0x00100fd0
+#define WEATHER_FUNC_MAIN			0x00100dbc
 // wait_begin address
-#define WEATHER_FUNC_WAIT_BEGIN		0x00100fb0
+#define WEATHER_FUNC_WAIT_BEGIN		0x00100db4
 // wait_end address
-#define WEATHER_FUNC_WAIT_END		0x00100fc0
+#define WEATHER_FUNC_WAIT_END		0x00100db8
 // vptr_panic address (only exists in guarded variant)
-#define WEATHER_FUNC_VPTR_PANIC		0x00101500
+#define WEATHER_FUNC_VPTR_PANIC		0x001010f0
 // number of main loop iterations to trace
 // (determines trace length and therefore fault-space width)
 #define WEATHER_NUMITER_TRACING		4
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_TRACING	20549
+#define WEATHER_NUMINSTR_TRACING	20599
 // number of additional loop iterations for FI experiments (to see whether
 // everything continues working fine)
 #define WEATHER_NUMITER_AFTER		2
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_AFTER		10232
+#define WEATHER_NUMINSTR_AFTER		10272
 // data/BSS begin:
 // nm -C plausibility.elf|fgrep ___DATA_START__
-#define WEATHER_DATA_START			0x00101c94
+#define WEATHER_DATA_START			0x00101998
 // data/BSS end:
 // nm -C plausibility.elf|fgrep ___BSS_END__
-#define WEATHER_DATA_END			0x001035b8
+#define WEATHER_DATA_END			0x001032b8
 // text begin:
 // nm -C plausibility.elf|fgrep ___TEXT_START__
 #define WEATHER_TEXT_START			0x00100000
 // text end:
 // nm -C plausibility.elf|fgrep ___TEXT_END__
-#define WEATHER_TEXT_END			0x00101adb
+#define WEATHER_TEXT_END			0x001017cb
 
 #else
 #error Unknown WEATHERMONITOR_VARIANT

src/experiments/weather-monitor/experimentInfo.hpp.sh

@@ -37,13 +37,13 @@ cat <<EOF
 #define WEATHER_NUMITER_TRACING		4
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_TRACING	20549
+#define WEATHER_NUMINSTR_TRACING	20599
 // number of additional loop iterations for FI experiments (to see whether
 // everything continues working fine)
 #define WEATHER_NUMITER_AFTER		2
 // number of instructions needed for these iterations in golden run (taken from
 // experiment step #2)
-#define WEATHER_NUMINSTR_AFTER		10232
+#define WEATHER_NUMINSTR_AFTER		10272
 // data/BSS begin:
 // nm -C $(basename $1)|fgrep ___DATA_START__
 #define WEATHER_DATA_START			0x`addrof $1 ___DATA_START__`