Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop python2 usage #158

Merged
merged 3 commits into from
Mar 11, 2024
Merged

Drop python2 usage #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7337fa9
Update CMakeLists
Feb 25, 2024
cc70c1f
Remove python2 references from SymCC
Feb 25, 2024
351da4b
Merge branch 'master' into lekcyjna/qsym-refactor-codegen
aurelf Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/run_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
sudo apt-get install -y \
llvm-${{ matrix.llvm_version }}-dev \
libz3-dev \
python2
- name: Build SymCC with the QSYM backend
run: |
mkdir build
Expand Down Expand Up @@ -64,7 +63,6 @@ jobs:
sudo apt-get install -y \
llvm-${{ matrix.llvm_version }}-dev \
libz3-dev \
python2
- name: Build SymCC with the QSYM backend
run: |
mkdir build
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ RUN apt-get update \
llvm-15-dev \
llvm-15-tools \
ninja-build \
python2 \
python3-pip \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Under Ubuntu Groovy the following one liner should install all required
packages:

```
sudo apt install -y git cargo clang-14 cmake g++ git libz3-dev llvm-14-dev llvm-14-tools ninja-build python2 python3-pip zlib1g-dev && sudo pip3 install lit
sudo apt install -y git cargo clang-14 cmake g++ git libz3-dev llvm-14-dev llvm-14-tools ninja-build python3-pip zlib1g-dev && sudo pip3 install lit
```

Alternatively, see below for using the provided Dockerfile, or the file
Expand Down
22 changes: 2 additions & 20 deletions runtime/qsym_backend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@

set(QSYM_SOURCE_DIR "qsym/qsym/pintool")

add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/expr__gen.cpp
COMMAND python2 gen_expr.py ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${QSYM_SOURCE_DIR}/codegen
COMMENT "Generating Qsym's expr__gen.cpp"
VERBATIM
DEPENDS
${QSYM_SOURCE_DIR}/codegen/expr.cpp
${QSYM_SOURCE_DIR}/codegen/gen_expr.py)

add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/expr_builder__gen.cpp
COMMAND python2 gen_expr_builder.py ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${QSYM_SOURCE_DIR}/codegen
COMMENT "Generating Qsym's expr__gen.cpp"
VERBATIM
DEPENDS
${QSYM_SOURCE_DIR}/codegen/expr_builder.cpp
${QSYM_SOURCE_DIR}/codegen/gen_expr_builder.py)

find_package(LLVM REQUIRED CONFIG)
add_definitions(${LLVM_DEFINITIONS})
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
Expand All @@ -57,8 +39,8 @@ configure CMake with -DZ3_TRUST_SYSTEM_VERSION=on (see also docs/Configuration.t
endif()

add_library(SymRuntime SHARED
${CMAKE_CURRENT_BINARY_DIR}/expr__gen.cpp
${CMAKE_CURRENT_BINARY_DIR}/expr_builder__gen.cpp
${QSYM_SOURCE_DIR}/expr.cpp
${QSYM_SOURCE_DIR}/expr_builder.cpp
${QSYM_SOURCE_DIR}/expr_cache.cpp
${QSYM_SOURCE_DIR}/expr_evaluate.cpp
${QSYM_SOURCE_DIR}/solver.cpp
Expand Down
2 changes: 1 addition & 1 deletion runtime/qsym_backend/qsym
Open in desktop
Submodule qsym updated 6 files
+0 −29 qsym/pintool/codegen/gen_expr.py
+0 −219 qsym/pintool/codegen/gen_expr_builder.py
+13 −1 qsym/pintool/expr.cpp
+300 −1 qsym/pintool/expr_builder.cpp
+0 −8 qsym/pintool/expr_builder.h
+1 −5 qsym/pintool/makefile.rules
2 changes: 1 addition & 1 deletion util/quicktest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sudo apt-get update
sudo apt-get upgrade -y

# install requirements
sudo apt-get install -y git cargo clang-10 cmake g++ git libz3-dev llvm-10-dev llvm-10-tools ninja-build python2 python3-pip zlib1g-dev
sudo apt-get install -y git cargo clang-10 cmake g++ git libz3-dev llvm-10-dev llvm-10-tools ninja-build python3-pip zlib1g-dev
sudo pip3 install lit

# Clone project
Expand Down
Loading