Skip to content

Commit

Permalink
Merge branch 'official-capstone-5' into 'main'
Browse files Browse the repository at this point in the history
Update to official capstone 5

See merge request rewriting/ddisasm!1125
  • Loading branch information
adamjseitz committed May 20, 2024
2 parents b5b9538 + 1816d81 commit 0417a25
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* Fix bug where a relative jump table starting with consecutive zero offsets was truncated at the first non-zero value.
* Add alignment for x86-64 instructions that require explicitly aligned memory
(e.g., some SIMD instructions)
* Update capstone version from 4.0.1 to 5.0.1

# 1.8.0

Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,15 @@ if(CAPSTONE)
set(CSTOOL_VERSION "${CMAKE_MATCH_1}")
endif()

if(NOT CAPSTONE OR "${CSTOOL_VERSION}" VERSION_LESS "4.0.1")
if(NOT CAPSTONE OR "${CSTOOL_VERSION}" VERSION_LESS "5.0.1")
message(
FATAL_ERROR
" No Capstone installation found.\n"
" - If Capstone is not installed, install it from souce.\n"
" You can get the latest version of Capstone at:\n"
" http://www.capstone-engine.org/\n"
" - If Capstone is installed, make sure the installation location is in your PATH,\n"
" and it is at least version 4.0.1.\n")
" and it is at least version 5.0.1.\n")
endif()

if(NOT CAPSTONE_INCLUDE_DIR)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ RUN apt-get -y update \
git \
wget

RUN wget https://download.grammatech.com/gtirb/files/apt-repo/pool/unstable/libc/libcapstone-dev/libcapstone-dev_5.0.0-gtdev_amd64.deb \
RUN wget https://download.grammatech.com/gtirb/files/apt-repo/pool/unstable/libc/libcapstone-dev/libcapstone-dev_5.0.1_gtdev_amd64.deb \
&& dpkg -i libcapstone-dev_*_amd64.deb \
&& rm libcapstone-dev_*_amd64.deb

Expand Down Expand Up @@ -145,7 +145,7 @@ RUN apt-get -y update \
python3 \
wget

RUN wget https://download.grammatech.com/gtirb/files/apt-repo/pool/unstable/libc/libcapstone-dev/libcapstone-dev_5.0.0-gtdev_amd64.deb \
RUN wget https://download.grammatech.com/gtirb/files/apt-repo/pool/unstable/libc/libcapstone-dev/libcapstone-dev_5.0.1_gtdev_amd64.deb \
&& dpkg -i libcapstone-dev_*_amd64.deb \
&& rm libcapstone-dev_*_amd64.deb

Expand Down

0 comments on commit 0417a25

Please sign in to comment.