x64dbg
/
zydis
mirror of https://github.com/x64dbg/zydis
1
0
Fork 0
Code Releases Activity

updated CMakeLists.txt, fixed warnings

This commit is contained in:
athre0z 2015-05-16 05:25:11 +02:00
parent 4676a8b2d7
commit 8837a61d82
3 changed files with 47 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
CMakeLists.txt
View File

@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
include(GenerateExportHeader) include(GenerateExportHeader)
project(ZyanDisassemblerEngine) project(Zydis)
option(BUILD_SHARED_LIBS "Build shared libraries rather than static ones" FALSE) option(BUILD_SHARED_LIBS "Build shared libraries rather than static ones" FALSE)
option(FORCE_SHARED_CRT option(FORCE_SHARED_CRT
"Forces shared linkage against the CRT even when building a static library" "Forces shared linkage against the CRT even when building a static library"
FALSE) FALSE)
option(BUILD_EXAMPLES "Build examples" TRUE) option(BUILD_EXAMPLES "Build examples" TRUE)
option(BUILD_CPP_BINDINGS "Build C++ bindings" TRUE) option(BUILD_C_BINDINGS "Build C bindings" TRUE)
if (NOT CONFIGURED_ONCE) if (NOT CONFIGURED_ONCE)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
@ -43,72 +43,55 @@ if (MSVC AND NOT BUILD_SHARED_LIBS AND NOT FORCE_SHARED_CRT)
endif () endif ()
# Library # Library
set(vde_headers set(headers
"VerteronDisassemblerEngine/ZyDisDisassembler.h" "ZyDis/ZydisSymbolResolver.hpp"
"VerteronDisassemblerEngine/ZyDisDisassemblerTypes.h" "ZyDis/ZydisOpcodeTable.hpp"
"VerteronDisassemblerEngine/ZyDisDisassemblerUtils.h" "ZyDis/ZydisInstructionDecoder.hpp"
"VerteronDisassemblerEngine/ZyDisInstructionDecoder.h" "ZyDis/ZydisInstructionFormatter.hpp"
"VerteronDisassemblerEngine/ZyDisInstructionFormatter.h" "ZyDis/ZydisTypes.hpp"
"VerteronDisassemblerEngine/ZyDisOpcodeTable.h" "ZyDis/ZydisUtils.hpp"
"VerteronDisassemblerEngine/ZyDisOpcodeTableInternal.h" "ZyDis/Zydis.hpp")
"VerteronDisassemblerEngine/ZyDisInternalHelpers.h" set(sources
"VerteronDisassemblerEngine/ZyDisInternalConfig.h") "ZyDis/ZydisInstructionDecoder.cpp"
set(vde_sources "ZyDis/ZydisInstructionFormatter.cpp"
"VerteronDisassemblerEngine/ZyDisDisassemblerUtils.c" "ZyDis/ZydisOpcodeTable.cpp"
"VerteronDisassemblerEngine/ZyDisInstructionFormatter.c" "ZyDis/ZydisSymbolResolver.cpp"
"VerteronDisassemblerEngine/ZyDisOpcodeTable.c" "ZyDis/ZydisUtils.cpp")
"VerteronDisassemblerEngine/ZyDisInstructionDecoder.c")
add_library("VerteronDisassemblerEngine" ${vde_headers} ${vde_sources}) add_library("Zydis" ${headers} ${sources})
generate_export_header( generate_export_header(
"VerteronDisassemblerEngine" "Zydis"
BASE_NAME "ZyDis" BASE_NAME "Zydis"
EXPORT_FILE_NAME "ZyDisExportConfig.h") EXPORT_FILE_NAME "ZydisExportConfig.h")
include_directories(${PROJECT_BINARY_DIR}) include_directories(${PROJECT_BINARY_DIR})
# C++ bindings # C bindings
if (BUILD_CPP_BINDINGS) if (BUILD_C_BINDINGS)
set(vdecpp_headers set(c_headers
"Bindings/Cpp/ZyDisDisassembler.hpp" "Bindings/C/Zydis.h"
"Bindings/Cpp/ZyDisDisassemblerTypes.hpp" "Bindings/C/ZydisInstructionDecoder.h"
"Bindings/Cpp/ZyDisDisassemblerUtils.hpp" "Bindings/C/ZydisTypes.h"
"Bindings/Cpp/ZyDisInstructionDecoder.hpp" "Bindings/C/ZydisInstructionFormatter.h"
"Bindings/Cpp/ZyDisInstructionFormatter.hpp" "Bindings/C/ZydisUtils.h"
"Bindings/Cpp/ZyDisOpcodeTable.hpp") "Bindings/C/ZydisSymbolResolver.h"
set(vdecpp_sources "Bindings/C/ZydisOpcodeTable.h")
"Bindings/Cpp/ZyDisDisassemblerUtils.cpp" set(c_sources
"Bindings/Cpp/ZyDisInstructionFormatter.cpp" "Bindings/C/ZydisSymbolResolver.cpp"
"Bindings/Cpp/ZyDisOpcodeTable.cpp" "Bindings/C/ZydisOpcodeTable.cpp"
"Bindings/Cpp/ZyDisInstructionDecoder.cpp") "Bindings/C/ZydisInstructionFormatter.cpp"
add_library("VerteronDisassemblerEngineCpp" ${vdecpp_headers} ${vdecpp_sources}) "Bindings/C/ZydisInstructionDecoder.cpp"
target_link_libraries("VerteronDisassemblerEngineCpp" "VerteronDisassemblerEngine") "Bindings/C/ZydisUtils.cpp")
add_library("ZydisC" ${c_headers} ${c_sources})
include_directories("Zydis")
target_link_libraries("ZydisC" "Zydis")
endif () endif ()
# Examples # Examples
if (BUILD_EXAMPLES) if (BUILD_EXAMPLES)
include_directories("VerteronDisassemblerEngine") include_directories("Bindings/C")
add_executable("CustomDataSource" "Examples/CustomDataSource/Main.c") add_executable("C_SimpleDemo" "Examples/C/SimpleDemo/SimpleDemo.c")
target_link_libraries("CustomDataSource" "VerteronDisassemblerEngine") target_link_libraries("C_SimpleDemo" "ZydisC")
add_executable("PerformanceTest" "Examples/PerformanceTest/Main.c")
target_link_libraries("PerformanceTest" "VerteronDisassemblerEngine")
add_executable("SimpleDemo" "Examples/SimpleDemo/Main.c")
target_link_libraries("SimpleDemo" "VerteronDisassemblerEngine")
if (BUILD_CPP_BINDINGS)
add_executable("CppBindingsTest" "Examples/CppBindings/Main.cpp")
include_directories("Bindings/Cpp")
target_link_libraries("CppBindingsTest" "VerteronDisassemblerEngineCpp")
endif ()
if (WIN32)
add_executable("SymbolResolver" "Examples/SymbolResolver/Main.c")
target_link_libraries("SymbolResolver" "VerteronDisassemblerEngine")
else ()
message(STATUS "Example 'SymbolResolver' not compatible with platform, ignoring.")
endif ()
endif () endif ()
set(CONFIGURED_ONCE TRUE CACHE INTERNAL "CMake has configured at least once.") set(CONFIGURED_ONCE TRUE CACHE INTERNAL "CMake has configured at least once.")

4
Zydis/ZydisInstructionFormatter.cpp
View File

@ -171,7 +171,7 @@ char const *BaseInstructionFormatter::outputString()
{ {
for (size_t i = offset; i < m_outputStringLen - 1; ++i) for (size_t i = offset; i < m_outputStringLen - 1; ++i)
{ {
m_outputBuffer[i] = toupper(m_outputBuffer[i]); m_outputBuffer[i] = static_cast<char>(toupper(m_outputBuffer[i]));
} }
} }
} }
@ -212,7 +212,7 @@ char const *BaseInstructionFormatter::outputString()
{ {
for (size_t i = offset; i < m_outputStringLen - 1; ++i) for (size_t i = offset; i < m_outputStringLen - 1; ++i)
{ {
m_outputBuffer[i] = toupper(m_outputBuffer[i]); m_outputBuffer[i] = static_cast<char>(toupper(m_outputBuffer[i]));
} }
} }
va_end(arguments); va_end(arguments);

6
Zydis/ZydisSymbolResolver.cpp
View File

@ -40,8 +40,8 @@ BaseSymbolResolver::~BaseSymbolResolver()
} }
const char *BaseSymbolResolver::resolveSymbol(const InstructionInfo& info, const char *BaseSymbolResolver::resolveSymbol(const InstructionInfo& /*info*/,
uint64_t address, uint64_t& offset) uint64_t /*address*/, uint64_t& /*offset*/)
{ {
return nullptr; return nullptr;
} }
@ -53,7 +53,7 @@ ExactSymbolResolver::~ExactSymbolResolver()
} }
const char *ExactSymbolResolver::resolveSymbol(const InstructionInfo& info, const char *ExactSymbolResolver::resolveSymbol(const InstructionInfo& /*info*/,
uint64_t address, uint64_t& offset) uint64_t address, uint64_t& offset)
{ {
std::unordered_map<uint64_t, std::string>::const_iterator iterator = m_symbolMap.find(address); std::unordered_map<uint64_t, std::string>::const_iterator iterator = m_symbolMap.find(address);