christoph/fail
1
Fork 0
Code Releases Activity

(capstone) add capstone

Browse Source
This commit is contained in:
Robin Thunig
2020-03-05 12:39:09 +01:00
parent f7f982fec5
commit 1cbd5acab0
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/efw/CMakeLists.txt
View File

@ -17,6 +17,9 @@ target_link_libraries(fail-efw fail-util) # WallclockTimer
if (BUILD_LLVM_DISASSEMBLER) if (BUILD_LLVM_DISASSEMBLER)
target_link_libraries(fail-efw fail-llvmdisassembler) target_link_libraries(fail-efw fail-llvmdisassembler)
endif() endif()
if (BUILD_CAPSTONE_DISASSEMBLER)
target_link_libraries(fail-efw fail-capstonedisassembler)
endif()
find_package(LibPCL REQUIRED) find_package(LibPCL REQUIRED)
include_directories(${LIBPCL_INCLUDE_DIRS}) include_directories(${LIBPCL_INCLUDE_DIRS})

21
src/core/efw/DatabaseExperiment.cc
View File

@ -15,7 +15,9 @@
#include "efw/DatabaseExperiment.hpp" #include "efw/DatabaseExperiment.hpp"
#include "comm/DatabaseCampaignMessage.pb.h" #include "comm/DatabaseCampaignMessage.pb.h"
#ifdef BUILD_LLVM_DISASSEMBLER #if defined(BUILD_CAPSTONE_DISASSEMBLER)
# include "util/capstonedisassembler/CapstoneToFailTranslator.hpp"
#elif defined(BUILD_LLVM_DISASSEMBLER)
# include "util/llvmdisassembler/LLVMtoFailTranslator.hpp" # include "util/llvmdisassembler/LLVMtoFailTranslator.hpp"
#endif #endif
@ -80,12 +82,17 @@ unsigned DatabaseExperiment::injectFault(
/* First 128 registers, TODO use LLVMtoFailTranslator::getMaxDataAddress() */ /* First 128 registers, TODO use LLVMtoFailTranslator::getMaxDataAddress() */
if (data_address < (128 << 4) && inject_registers) { if (data_address < (128 << 4) && inject_registers) {
#ifdef BUILD_LLVM_DISASSEMBLER #if defined(BUILD_LLVM_DISASSEMBLER) || defined(BUILD_CAPSTONE_DISASSEMBLER)
#if defined(BUILD_LLVM_DISASSEMBLER)
typedef LLVMtoFailTranslator XtoFailTranslator;
#elif defined(BUILD_CAPSTONE_DISASSEMBLER)
typedef CapstoneToFailTranslator XtoFailTranslator;
#endif
// register FI // register FI
LLVMtoFailTranslator::reginfo_t reginfo = XtoFailTranslator::reginfo_t reginfo =
LLVMtoFailTranslator::reginfo_t::fromDataAddress(data_address, 1); XtoFailTranslator::reginfo_t::fromDataAddress(data_address, 1);
value = LLVMtoFailTranslator::getRegisterContent(simulator.getCPU(0), reginfo); value = XtoFailTranslator::getRegisterContent(simulator.getCPU(0), reginfo);
if (inject_burst) { if (inject_burst) {
injected_value = value ^ 0xff; injected_value = value ^ 0xff;
m_log << "INJECTING BURST at: REGISTER " << dec << reginfo.id m_log << "INJECTING BURST at: REGISTER " << dec << reginfo.id
@ -95,14 +102,14 @@ unsigned DatabaseExperiment::injectFault(
m_log << "INJECTING BIT-FLIP at: REGISTER " << dec << reginfo.id m_log << "INJECTING BIT-FLIP at: REGISTER " << dec << reginfo.id
<< " bitpos " << (reginfo.offset + bitpos) << endl; << " bitpos " << (reginfo.offset + bitpos) << endl;
} }
LLVMtoFailTranslator::setRegisterContent(simulator.getCPU(0), reginfo, injected_value); XtoFailTranslator::setRegisterContent(simulator.getCPU(0), reginfo, injected_value);
if (reginfo.id == RID_PC) { if (reginfo.id == RID_PC) {
// FIXME move this into the Bochs backend // FIXME move this into the Bochs backend
m_log << "Redecode current instruction" << endl; m_log << "Redecode current instruction" << endl;
redecodeCurrentInstruction(); redecodeCurrentInstruction();
} }
#else #else
m_log << "ERROR: Not compiled with LLVM. Enable BUILD_LLVM_DISASSEMBLER at buildtime." << endl; m_log << "ERROR: Not compiled with LLVM or Capstone. Enable BUILD_LLVM_DISASSEMBLER OR BUILD_CAPSTONE_DISASSEMBLER at buildtime." << endl;
simulator.terminate(1); simulator.terminate(1);
#endif #endif
} else if (!force_registers) { } else if (!force_registers) {