Skip to content

Commit

Permalink
Merge branch 'master' into new-parallel-parsing
Browse files Browse the repository at this point in the history 
Rmove setting function ret status during finalizing

Conflicts:
	cmake/packages.cmake
	examples/CMakeLists.txt
	instructionAPI/src/power_opcode_tables.C
  • Loading branch information
@mxz297
mxz297 committed Oct 25, 2018
2 parents 07bdc17 + 5c9770a commit 97a8c43
Show file tree
Hide file tree
Showing 14 changed files with 1,782 additions and 252 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -119,3 +119,5 @@ doxyfiles/*
*/Release/
cotire/
.idea/*
build*/
cmake-build-*/
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Expand Up @@ -112,6 +112,9 @@ if(BUILD_RTLIB)
if(TARGET dyninstAPI-static)
add_dependencies(dyninstAPI-static DyninstRT)
endif()
if(TARGET boost)
add_dependencies(DyninstRT boost)
endif()
endif()

install(SCRIPT "${RT_BINARY_DIR}/cmake_install.cmake")
Expand Down
4 changes: 2 additions & 2 deletions cmake/packages.cmake
View file
@@ -1,6 +1,6 @@
if (UNIX)
find_package (LibDwarf)
find_package (LibElf)
find_package (LibElf 0.173)
find_package(TBB)
if(NOT LIBELF_FOUND OR NOT LIBDWARF_FOUND)
message(STATUS "Attempting to build elfutils as external project")
Expand Down Expand Up @@ -63,7 +63,7 @@ if (UNIX)
include(ExternalProject)
ExternalProject_Add(LibIberty
PREFIX ${CMAKE_BINARY_DIR}/binutils
URL http://ftp.gnu.org/gnu/binutils/binutils-2.23.tar.gz
URL http://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.gz
CONFIGURE_COMMAND env CFLAGS=${CMAKE_C_FLAGS}\ -fPIC CPPFLAGS=-fPIC PICFLAG=-fPIC <SOURCE_DIR>/libiberty/configure --prefix=${CMAKE_BINARY_DIR}/libiberty --enable-shared
BUILD_COMMAND make all
INSTALL_DIR ${CMAKE_BINARY_DIR}/libiberty
Expand Down
4 changes: 4 additions & 0 deletions cmake/shared.cmake
View file
Expand Up @@ -35,6 +35,10 @@ set(ALL_DYNINST_TARGETS "" CACHE INTERNAL "")

function (dyninst_library target)
add_library (${target} ${SRC_LIST})
# add boost as a universal dependencies for all sub libraries
if(TARGET boost)
add_dependencies (${target} boost)
endif()
target_link_private_libraries (${target} ${ARGN})
FILE (GLOB headers "h/*.h" "${CMAKE_CURRENT_BINARY_DIR}/h/*.h")
set (ACTUAL_TARGETS ${target})
Expand Down
68 changes: 68 additions & 0 deletions common/h/dyn_regs.h
View file
Expand Up @@ -960,6 +960,7 @@ namespace Dyninst
const signed int FPR = 0x00020000;
const signed int FSR = 0x00040000;
const signed int SPR = 0x00080000;
const signed int VSR = 0x00000000;

DEF_REGISTER(r0, 0 | GPR | Arch_ppc64, "ppc64");
DEF_REGISTER(r1, 1 | GPR | Arch_ppc64, "ppc64");
Expand Down Expand Up @@ -1171,6 +1172,73 @@ namespace Dyninst
DEF_REGISTER(ppr, 896 | SPR | Arch_ppc64, "ppc64");
DEF_REGISTER(ppr32, 898 | SPR | Arch_ppc64, "ppc64");

DEF_REGISTER(vsr0, 0 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr1, 1 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr2, 2 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr3, 3 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr4, 4 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr5, 5 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr6, 6 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr7, 7 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr8, 8 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr9, 9 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr10, 10 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr11, 11 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr12, 12 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr13, 13 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr14, 14 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr15, 15 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr16, 16 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr17, 17 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr18, 18 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr19, 19 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr20, 20 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr21, 21 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr22, 22 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr23, 23 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr24, 24 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr25, 25 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr26, 26 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr27, 27 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr28, 28 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr29, 29 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr30, 30 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr31, 31 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr32, 32 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr33, 33 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr34, 34 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr35, 35 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr36, 36 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr37, 37 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr38, 38 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr39, 39 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr40, 40 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr41, 41 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr42, 42 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr43, 43 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr44, 44 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr45, 45 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr46, 46 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr47, 47 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr48, 48 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr49, 49 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr50, 50 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr51, 51 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr52, 52 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr53, 53 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr54, 54 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr55, 55 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr56, 56 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr57, 57 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr58, 58 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr59, 59 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr60, 60 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr61, 61 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr62, 62 | VSR | Arch_ppc64, "ppc64");
DEF_REGISTER(vsr63, 63 | VSR | Arch_ppc64, "ppc64");




}

Expand Down

0 comments on commit 97a8c43

Please sign in to comment.