christoph/fail
1
Fork 0
Code Releases Activity

ElfReader: Support for Section and Symbol size.

Browse Source 
- getSection/getSymbol now returns an ElfSymbol reference.

Searching by address now searches if address is within
symbol address and symbol address + size.
So we can test, if we are *within* a function, object or
section and not only at the start address.
This commit is contained in:
Martin Hoffmann
2013-03-04 15:18:52 +01:00
parent 3501050548
commit 4686c27d3d
10 changed files with 185 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/experiments/ecos_kernel_test/experiment.cc
View File

@ -593,13 +593,13 @@ bool EcosKernelTestExperiment::readELFSymbols(
fail::guest_address_t& text_end)
{
ElfReader elfreader(EcosKernelTestCampaign::filename_elf(m_variant, m_benchmark).c_str());
entry = elfreader.getAddressByName("cyg_start");
finish = elfreader.getAddressByName("cyg_test_exit");
test_output = elfreader.getAddressByName("cyg_test_output");
errors_corrected = elfreader.getAddressByName("errors_corrected");
panic = elfreader.getAddressByName("_Z9ecc_panicv");
text_start = elfreader.getAddressByName("_stext");
text_end = elfreader.getAddressByName("_etext");
entry = elfreader.getSymbol("cyg_start").getAddress();
finish = elfreader.getSymbol("cyg_test_exit").getAddress();
test_output = elfreader.getSymbol("cyg_test_output").getAddress();
errors_corrected = elfreader.getSymbol("errors_corrected").getAddress();
panic = elfreader.getSymbol("_Z9ecc_panicv").getAddress();
text_start = elfreader.getSymbol("_stext").getAddress();
text_end = elfreader.getSymbol("_etext").getAddress();
// it's OK if errors_corrected or ecc_panic are missing
if (entry == ADDR_INV || finish == ADDR_INV || test_output == ADDR_INV ||

4
src/experiments/kesorefs/campaign.cc
View File

@ -35,9 +35,9 @@ bool KesoRefCampaign::run()
return false;
}
address_t injip = elf.getAddressByName("c23_PersistentDetectorScopeEntry_m5_run");
address_t injip = elf.getSymbol("c23_PersistentDetectorScopeEntry_m5_run").getAddress();
address_t rambase = elf.getAddressByName("__CIAO_APPDATA_cdx_det__heap");
address_t rambase = elf.getSymbol("__CIAO_APPDATA_cdx_det__heap").getAddress();
// address_t ramend = rambase + 0x80000;
address_t ramend = rambase + 4;
cout << "ramend: " << hex << ramend << endl;

37
src/experiments/kesorefs/experiment.cc
View File

@ -24,7 +24,7 @@
using namespace std;
using namespace fail;
#define SAFESTATE (0)
#define SAFESTATE (1)
// Check if configuration dependencies are satisfied:
#if !defined(CONFIG_EVENT_BREAKPOINTS) || !defined(CONFIG_SR_RESTORE) || \
@ -77,18 +77,20 @@ void handleMemoryAccessEvent(KesoRefExperimentData& param, const fail::MemAccess
handleEvent(param, param.msg.MEMACCESS, sstr.str());
}
bool KESOrefs::run()
{
//******* Boot, and store state *******//
m_log << "STARTING EXPERIMENT" << endl;
ElfReader m_elf;
#if SAFESTATE // define SS (SafeState) when building: make -DSS
#warning "Building safe state variant"
m_log << "Booting, and saving state at main";
m_log << "Booting, and saving state at main" << std::endl;
// m_elf.printSections();
// m_elf.printDemangled();
simulator.terminate();
BPSingleListener bp;
// STEP 1: run until interesting function starts, and save state
bp.setWatchInstructionPointer(m_elf.getAddressByName("main"));
bp.setWatchInstructionPointer(m_elf.getSymbol("main").getAddress());
if(simulator.addListenerAndResume(&bp) == &bp){
m_log << "main function entry reached, saving state" << endl;
}
@ -117,7 +119,7 @@ bool KESOrefs::run()
simulator.restore("keso.state");
// Goto injection point
BPSingleListener injBP;
m_log << "Trying to inject @ " << hex << m_elf.getNameByAddress(injectionPC) << endl;
m_log << "Trying to inject @ " << hex << m_elf.getSymbol(injectionPC).getAddress() << endl;
injBP.setWatchInstructionPointer(injectionPC);
@ -126,15 +128,22 @@ bool KESOrefs::run()
param.msg.set_original_value(injectBitFlip(data_address, bitpos));
// Setup exit points
BPSingleListener l_error(m_elf.getAddressByName("keso_throw_error"));
BPSingleListener l_nullp(m_elf.getAddressByName("keso_throw_nullpointer"));
BPSingleListener l_parity(m_elf.getAddressByName("keso_throw_parity"));
BPSingleListener l_oobounds(m_elf.getAddressByName("keso_throw_index_out_of_bounds"));
BPSingleListener l_dump(m_elf.getAddressByName("c17_Main_m4_dumpResults_console"));
MemAccessListener l_mem_text(m_elf.getSectionStart(".text"), MemAccessEvent::MEM_WRITE); l_mem_text.setWatchWidth(m_elf.getSectionSize(".text"));
MemAccessListener l_mem_textcdx_det( m_elf.getSectionStart(".text.cdx_det"), MemAccessEvent::MEM_WRITE ); l_mem_textcdx_det.setWatchWidth(m_elf.getSectionSize(".text.cdx_det"));
MemAccessListener l_mem_outerspace( m_elf.getSectionStart(".copy_sec") ); l_mem_outerspace.setWatchWidth(0xfffffff0);
BPSingleListener l_error(m_elf.getSymbol("keso_throw_error").getAddress());
BPSingleListener l_nullp(m_elf.getSymbol("keso_throw_nullpointer").getAddress());
BPSingleListener l_parity(m_elf.getSymbol("keso_throw_parity").getAddress());
BPSingleListener l_oobounds(m_elf.getSymbol("keso_throw_index_out_of_bounds").getAddress());
BPSingleListener l_dump(m_elf.getSymbol("c17_Main_m4_dumpResults_console").getAddress());
ElfSymbol sym = m_elf.getSection(".text");
MemAccessListener l_mem_text(sym.getStart(), , AccessEvent::MEM_WRITE); l_mem_text.setWatchWidth(sym.getSize());
sym = m_elf.getSection(".text.cdx_det");
MemAccessListener l_mem_textcdx_det(sym.getStart(), MemAccessEvent::MEM_WRITE ); l_mem_textcdx_det.setWatchWidth(sym.getSize());
sym = m_elf.getSection(".copy_sec");
MemAccessListener l_mem_outerspace( sym.getStart() ); l_mem_outerspace.setWatchWidth(0xfffffff0);
TrapListener l_trap(ANY_TRAP);
cout << " outerspace : " << l_mem_outerspace.getWatchWidth() << " --- @ :" << l_mem_outerspace.getWatchAddress() << endl;
simulator.addListener(&l_trap);
simulator.addListener(&l_error);

4
src/experiments/kesorefs/experiment.hpp
View File

@ -13,6 +13,7 @@ class KESOrefs : public fail::ExperimentFlow {
fail::JobClient m_jc;
fail::Logger m_log;
fail::MemoryManager& m_mm;
fail::ElfReader m_elf;
void printEIP();
void setupExitBPs(const std::string&);
@ -23,7 +24,8 @@ class KESOrefs : public fail::ExperimentFlow {
unsigned injectBitFlip(fail::address_t data_address, unsigned bitpos);
public:
KESOrefs() : m_log("KESOrefs", false), m_mm(fail::simulator.getMemoryManager()) {};
KESOrefs() : m_log("KESOrefs", false), m_mm(fail::simulator.getMemoryManager()) {
};
bool run();
};

12
src/experiments/nanojpeg/experiment.cc
View File

@ -80,17 +80,17 @@ bool NanoJPEGExperiment::run()
ElfReader elfreader(NANOJPEG_ELF);
guest_address_t addr_text_start =
elfreader.getAddressByName("___TEXT_START__");
elfreader.getSymbol("___TEXT_START__").getAddress();
guest_address_t addr_text_end =
elfreader.getAddressByName("___TEXT_END__");
elfreader.getSymbol("___TEXT_END__").getAddress();
guest_address_t addr_rodata_start =
elfreader.getAddressByName("___RODATA_START__");
elfreader.getSymbol("___RODATA_START__").getAddress();
guest_address_t addr_bss_end =
elfreader.getAddressByName("___BSS_END__");
elfreader.getSymbol("___BSS_END__").getAddress();
guest_address_t addr_output_image_ptr =
elfreader.getAddressByName("output_image");
elfreader.getSymbol("output_image").getAddress();
guest_address_t addr_output_image_size =
elfreader.getAddressByName("output_image_size");
elfreader.getSymbol("output_image_size").getAddress();
log << "ELF symbols: text " << hex << addr_text_start << "-" << addr_text_end
<< " rodata/data/bss " << addr_rodata_start << "-" << addr_bss_end
<< " output_image ptr @ " << addr_output_image_ptr << ", size @ " << addr_output_image_size << endl;