wmoo: trace and sim-state suffix

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1333 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-06-12 15:13:21 +00:00
parent 2562df92e2
commit ff29f900ec
4 changed files with 12 additions and 4 deletions

View File

@ -19,8 +19,8 @@
using namespace std; using namespace std;
using namespace fail; using namespace fail;
char const * const trace_filename = "trace.pb"; char const * const trace_filename = "trace.tc" WEATHER_SUFFIX;
char const * const results_filename = "weathermonitor.csv"; char const * const results_filename = "weathermonitor" WEATHER_SUFFIX ".csv";
// equivalence class type: addr, [i1, i2] // equivalence class type: addr, [i1, i2]
// addr: byte to inject a bit-flip into // addr: byte to inject a bit-flip into

View File

@ -34,7 +34,7 @@ using namespace fail;
bool WeatherMonitorExperiment::run() bool WeatherMonitorExperiment::run()
{ {
char const *statename = "bochs.state"; char const *statename = "bochs.state" WEATHER_SUFFIX;
Logger log("Weathermonitor", false); Logger log("Weathermonitor", false);
BPSingleEvent bp; BPSingleEvent bp;
@ -75,7 +75,7 @@ bool WeatherMonitorExperiment::run()
//tp.setLogIPOnly(true); //tp.setLogIPOnly(true);
// record trace // record trace
char const *tracefile = "trace.pb"; char const *tracefile = "trace.tc" WEATHER_SUFFIX;
ofstream of(tracefile); ofstream of(tracefile);
tp.setTraceFile(&of); tp.setTraceFile(&of);

View File

@ -8,6 +8,8 @@
#if WEATHERMONITOR_VARIANT == 0 // without vptr guards #if WEATHERMONITOR_VARIANT == 0 // without vptr guards
// suffix for simulator state, trace file
#define WEATHER_SUFFIX ".vanilla"
// main() address: // main() address:
// nm -C vanilla.elf|fgrep main // nm -C vanilla.elf|fgrep main
#define WEATHER_FUNC_MAIN 0x00100f70 #define WEATHER_FUNC_MAIN 0x00100f70
@ -44,6 +46,8 @@
#elif WEATHERMONITOR_VARIANT == 1 // with guards #elif WEATHERMONITOR_VARIANT == 1 // with guards
// suffix for simulator state, trace file
#define WEATHER_SUFFIX ".guarded"
// main() address: // main() address:
// nm -C guarded.elf|fgrep main // nm -C guarded.elf|fgrep main
#define WEATHER_FUNC_MAIN 0x00100fc0 #define WEATHER_FUNC_MAIN 0x00100fc0
@ -80,6 +84,8 @@
#elif WEATHERMONITOR_VARIANT == 2 // with guards + plausibility check #elif WEATHERMONITOR_VARIANT == 2 // with guards + plausibility check
// suffix for simulator state, trace file
#define WEATHER_SUFFIX ".plausibility"
// main() address: // main() address:
// nm -C plausibility.elf|fgrep main // nm -C plausibility.elf|fgrep main
#define WEATHER_FUNC_MAIN 0x00100fd0 #define WEATHER_FUNC_MAIN 0x00100fd0

View File

@ -21,6 +21,8 @@ EOF
function alldefs() { function alldefs() {
cat <<EOF cat <<EOF
// suffix for simulator state, trace file
#define WEATHER_SUFFIX ".`basename $1|sed s/\\\\..*$//`"
// main() address: // main() address:
// nm -C $(basename $1)|fgrep main // nm -C $(basename $1)|fgrep main
#define WEATHER_FUNC_MAIN 0x`addrof $1 main` #define WEATHER_FUNC_MAIN 0x`addrof $1 main`