From 7adb59e68e25898595a26aaa10d736d83eb7df6c Mon Sep 17 00:00:00 2001 From: chb Date: Wed, 4 Jul 2012 09:39:55 +0000 Subject: [PATCH] checksum-oostubs: update experiment target * make use of standAlone pointcut expression (seems to work properly) * updated test case, where bochs fails (once again) ;-) git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1421 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- .../checksum-oostubs/ecc_region.hpp | 112 +++++++++--------- .../checksum-oostubs/experiment.cc | 4 +- .../checksum-oostubs/experimentInfo.hpp | 12 +- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/experiments/checksum-oostubs/ecc_region.hpp b/src/experiments/checksum-oostubs/ecc_region.hpp index 1005d282..e6841727 100644 --- a/src/experiments/checksum-oostubs/ecc_region.hpp +++ b/src/experiments/checksum-oostubs/ecc_region.hpp @@ -1,60 +1,60 @@ // generated from STEP 0 output with region2array.sh static const unsigned memoryMap[][2] = { -{0x10ddac, 4}, -{0x10dda4, 4}, -{0x10dd80, 4}, -{0x10dd78, 4}, -{0x10dd54, 4}, -{0x10dd4c, 4}, -{0x10aeed, 1}, -{0x10aee8, 4}, -{0x10aed8, 4}, -{0x10aed4, 4}, -{0x10aecd, 1}, -{0x10aec8, 4}, -{0x10aeb8, 4}, -{0x10aeb4, 4}, -{0x10aead, 1}, -{0x10aea8, 4}, -{0x10ae98, 4}, -{0x10ae94, 4}, -{0x10ae88, 4}, -{0x10ae80, 4}, -{0x10ae7c, 4}, -{0x10ae58, 1}, -{0x10ae48, 4}, -{0x10ae3c, 4}, -{0x10ae20, 4}, -{0x10ae14, 4}, -{0x10ae08, 4}, -{0x10adfc, 4}, -{0x109c90, 256}, -{0x109c7c, 4}, -{0x109c78, 4}, -{0x109c6c, 4}, -{0x109c5c, 4}, -{0x109c50, 1}, -{0x109c3c, 4}, -{0x109c34, 4}, -{0x109c30, 4}, -{0x109c18, 4}, -{0x109c0c, 4}, -{0x109c05, 1}, -{0x109c01, 1}, -{0x109c00, 1}, -{0x109bf4, 1}, +{0x108a00, 13}, +{0x108a10, 13}, +{0x108a20, 89}, +{0x108a7c, 89}, +{0x108ad8, 89}, +{0x109aac, 4}, +{0x109ab4, 4}, +{0x109b18, 4}, +{0x109b4c, 1}, +{0x109b60, 4}, +{0x109b64, 4}, +{0x109b70, 4}, +{0x109b7c, 4}, +{0x109b80, 4}, +{0x109b88, 1}, +{0x109b94, 1}, +{0x109ba0, 1}, +{0x109ba1, 1}, +{0x109ba5, 1}, +{0x109ba8, 4}, +{0x109bb0, 4}, +{0x109bc8, 4}, +{0x109bcc, 4}, +{0x109bd4, 4}, {0x109be8, 1}, -{0x109be0, 4}, -{0x109bdc, 4}, -{0x109bd0, 4}, -{0x109bc4, 4}, -{0x109bc0, 4}, -{0x109b98, 4}, -{0x109b2c, 4}, -{0x109b20, 4}, -{0x108b50, 89}, -{0x108af4, 89}, -{0x108a98, 89}, -{0x108a88, 13}, -{0x108a78, 13}, +{0x109bf4, 4}, +{0x109c04, 4}, +{0x109c10, 4}, +{0x109c14, 4}, +{0x109c24, 256}, +{0x10ae00, 4}, +{0x10ae08, 4}, +{0x10ae10, 4}, +{0x10ae18, 4}, +{0x10ae20, 4}, +{0x10ae28, 4}, +{0x10ae44, 4}, +{0x10ae48, 4}, +{0x10ae50, 4}, +{0x10ae5c, 4}, +{0x10ae60, 4}, +{0x10ae70, 4}, +{0x10ae75, 1}, +{0x10ae7c, 4}, +{0x10ae80, 4}, +{0x10ae90, 4}, +{0x10ae95, 1}, +{0x10ae9c, 4}, +{0x10aea0, 4}, +{0x10aeb0, 4}, +{0x10aeb5, 1}, +{0x10dce0, 4}, +{0x10dce8, 4}, +{0x10dd0c, 4}, +{0x10dd14, 4}, +{0x10dd38, 4}, +{0x10dd40, 4}, }; diff --git a/src/experiments/checksum-oostubs/experiment.cc b/src/experiments/checksum-oostubs/experiment.cc index ccb0f69d..cfe90168 100644 --- a/src/experiments/checksum-oostubs/experiment.cc +++ b/src/experiments/checksum-oostubs/experiment.cc @@ -143,9 +143,9 @@ bool ChecksumOOStuBSExperiment::run() } #else // XXX debug - param.msg.set_instr_offset(305595); + param.msg.set_instr_offset(301324); //param.msg.set_instr_address(12345); - param.msg.set_mem_addr(1105228); + param.msg.set_mem_addr(1105120); #endif int id = param.getWorkloadID(); diff --git a/src/experiments/checksum-oostubs/experimentInfo.hpp b/src/experiments/checksum-oostubs/experimentInfo.hpp index 80a6e166..298fa45d 100644 --- a/src/experiments/checksum-oostubs/experimentInfo.hpp +++ b/src/experiments/checksum-oostubs/experimentInfo.hpp @@ -7,30 +7,30 @@ // the task function's entry address: // nm -C ecc.elf|fgrep main -#define OOSTUBS_FUNC_ENTRY 0x00101eaa +#define OOSTUBS_FUNC_ENTRY 0x0010326a // empty function that is called explicitly when the experiment finished // nm -C ecc.elf|fgrep "finished()" -#define OOSTUBS_FUNC_FINISH 0x00106da4 +#define OOSTUBS_FUNC_FINISH 0x0010675c // function executing HLT with no chance for further progress (after panic()) // nm -C ecc.elf|fgrep cpu_halt #define OOSTUBS_FUNC_CPU_HALT 0x001009f7 // nm -C ecc.elf | fgrep "_TEXT_" #define OOSTUBS_TEXT_START 0x00100000 -#define OOSTUBS_TEXT_END 0x00107cbf +#define OOSTUBS_TEXT_END 0x00107c87 // number of instructions the target executes under non-error conditions from ENTRY to DONE: // (result of experiment's step #2) -#define OOSTUBS_NUMINSTR 0x4B16E6 +#define OOSTUBS_NUMINSTR 0x4AE10D // number of instructions that are executed additionally for error corrections // (this is a rough guess ... TODO) #define OOSTUBS_RECOVERYINSTR 0x2000 // the variable that's increased if ECC corrects an error: // nm -C ecc.elf|fgrep errors_corrected -#define OOSTUBS_ERROR_CORRECTED 0x0010baf0 +#define OOSTUBS_ERROR_CORRECTED 0x0010adec // // nm -C ecc.elf|fgrep results -#define OOSTUBS_RESULTS_ADDR 0x0010ae6c +#define OOSTUBS_RESULTS_ADDR 0x0010ae34 #define OOSTUBS_RESULTS_BYTES 12 #define OOSTUBS_RESULT0 0xab3566a9 #define OOSTUBS_RESULT1 0x44889112