christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

cored-tester: add color_assert listener only if existsing

Browse Source 
The color_assert_port symbol does not exist in all dOSEK variant,
therefore we add the listener only if the symbol exists. Otherwise the
invalid handler will trigger on INV_ADDR

Change-Id: I7b81940a8413850527efb9e4bae86248794c622c
This commit is contained in:
Christian Dietrich
2015-04-17 09:21:03 +02:00
parent d38218f0eb
commit f24f9f2107
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/experiments/cored-tester/config.cmake Normal file
View File

@ -0,0 +1,5 @@
SET(bochs_configure_params "--enable-a20-pin;--enable-x86-64;--enable-cpu-level=6;--enable-ne2000;--enable-acpi;--enable-pci;--enable-usb;--enable-trace-cache;--enable-fast-function-calls;--enable-host-specific-asms;--enable-readline;--enable-clgd54xx;--enable-fpu;--enable-vmx=2;--enable-monitor-mwait;--enable-cdrom;--enable-sb16=linux;--enable-gdb-stub;--with-nogui" CACHE STRING "")
SET(BUILD_LLVM_DISASSEMBLER ON CACHE BOOL "" FORCE)
SET(PLUGINS_ACTIVATED "checkpoint;randomgenerator" CACHE STRING "")

10
src/experiments/cored-tester/experiment.cc
View File

@ -103,8 +103,10 @@ unsigned CoredTester::injectBitFlip(address_t data_address, unsigned data_width,
<< ") bitpos: " << bitpos << ") bitpos: " << bitpos
<< " value: 0x" << hex << setw(2) << setfill('0') << value << " -> 0x" << setw(2) << setfill('0') << injectedval << " value: 0x" << hex << setw(2) << setfill('0') << value << " -> 0x" << setw(2) << setfill('0') << injectedval
<< dec << endl; << dec << endl;
if (reginfo.id == RID_PC) if (reginfo.id == RID_PC) {
m_log << "Redecode current instruction" << endl;
redecodeCurrentInstruction(); redecodeCurrentInstruction();
}
return value; return value;
} else { } else {
@ -415,7 +417,11 @@ bool CoredTester::run() {
simulator.addListener(&l_panic); simulator.addListener(&l_panic);
simulator.addListener(&l_timeout); simulator.addListener(&l_timeout);
simulator.addListener(&l_fail_trace); simulator.addListener(&l_fail_trace);
simulator.addListener(&l_color_assert_port); if (s_color_assert_port.isValid()) {
simulator.addListener(&l_color_assert_port);
} else {
m_log << "No color assert port" << endl;
}
simulator.addListener(&l_trace_end_marker); simulator.addListener(&l_trace_end_marker);
// BPSingleListener single_step; // BPSingleListener single_step;