diff --git a/.github/workflows/vcpkg_ci_linux.yml b/.github/workflows/vcpkg_ci_linux.yml index 2f389746..dffaa687 100644 --- a/.github/workflows/vcpkg_ci_linux.yml +++ b/.github/workflows/vcpkg_ci_linux.yml @@ -274,51 +274,6 @@ jobs: cmake --build . --target install ./install/bin/anvill-decompile-json-* -spec ../tools/decompile-json/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - - name: 'Anvill-McSema build - custom remill' - shell: 'bash' - if: ${{ matrix.llvm != 'llvm-12' && matrix.llvm != 'llvm-13' }} - run: | - cd anvill-mcsema - rm -rf build - mkdir -p build && cd build - cmake -G Ninja \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX="$(pwd)/install" \ - -DVCPKG_ROOT="${VCPKG_ROOT}" \ - -DANVILL_ENABLE_INSTALL_TARGET=ON \ - -Dremill_DIR="$(pwd)/../../remill/build/install/lib/cmake/remill" \ - .. - cmake --build . - cmake --build . --target install - ./install/bin/anvill-decompile-json-* -spec ../tools/decompile-json/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - - - name: 'Test mcsema build' - shell: 'bash' - if: ${{ matrix.llvm != 'llvm-12' && matrix.llvm != 'llvm-13' }} - run: | - cd mcsema - rm -rf build - mkdir -p build && cd build - cmake -G Ninja \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX="$(pwd)/install" \ - -DVCPKG_ROOT="${VCPKG_ROOT}" \ - -Dremill_DIR="$(pwd)/../../remill/build/install/lib/cmake/remill" \ - -Danvill_DIR="$(pwd)/../../anvill-mcsema/build/install/lib/cmake/anvill" \ - .. - cmake --build . - cmake --build . --target install - - ./install/bin/mcsema-lift-* --version - ./install/bin/mcsema-lift-* --arch amd64 --os linux --cfg ../tests/test_suite_generator/generated/prebuilt_cfg/amd64/linux/cfg/hello_world --output hello_world.bc - - # See https://github.com/lifting-bits/mcsema/issues/753 - if [ ${{ matrix.host.arch }} == "arm64" ] ; then - ./install/bin/mcsema-lift-* --arch x86 --os linux --cfg ../tests/test_suite_generator/generated/prebuilt_cfg/x86/linux/cfg/hello_world --output hello_world.bc || true - else - ./install/bin/mcsema-lift-* --arch x86 --os linux --cfg ../tests/test_suite_generator/generated/prebuilt_cfg/x86/linux/cfg/hello_world --output hello_world.bc - fi - - name: Publish Release Assets if: | github.event.release diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml index 9dc530c6..f75787dd 100644 --- a/.github/workflows/vcpkg_ci_mac.yml +++ b/.github/workflows/vcpkg_ci_mac.yml @@ -232,43 +232,6 @@ jobs: cmake --build . --target install ./install/bin/anvill-decompile-json-* -spec ../tools/decompile-json/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - - name: 'Anvill-McSema build - custom remill' - shell: 'bash' - if: ${{ matrix.llvm != 'llvm-12' && matrix.llvm != 'llvm-13' }} - run: | - cd anvill-mcsema - mkdir -p build && cd build - cmake -G Ninja \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX="$(pwd)/install" \ - -DVCPKG_ROOT="${VCPKG_ROOT}" \ - -DANVILL_ENABLE_INSTALL_TARGET=ON \ - -Dremill_DIR="$(pwd)/../../remill/build/install/lib/cmake/remill" \ - .. - cmake --build . - cmake --build . --target install - ./install/bin/anvill-decompile-json-* -spec ../tools/decompile-json/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir - - - name: 'Test mcsema build' - shell: 'bash' - if: ${{ matrix.llvm != 'llvm-12' && matrix.llvm != 'llvm-13' }} - run: | - cd mcsema - mkdir -p build && cd build - cmake -G Ninja \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX="$(pwd)/install" \ - -DVCPKG_ROOT="${VCPKG_ROOT}" \ - -Dremill_DIR="$(pwd)/../../remill/build/install/lib/cmake/remill" \ - -Danvill_DIR="$(pwd)/../../anvill-mcsema/build/install/lib/cmake/anvill" \ - .. - cmake --build . - cmake --build . --target install - - ./install/bin/mcsema-lift-* --version - ./install/bin/mcsema-lift-* --arch amd64 --os linux --cfg ../tests/test_suite_generator/generated/prebuilt_cfg/amd64/linux/cfg/hello_world --output hello_world.bc - ./install/bin/mcsema-lift-* --arch x86 --os linux --cfg ../tests/test_suite_generator/generated/prebuilt_cfg/x86/linux/cfg/hello_world --output hello_world.bc - - name: Publish Release Assets if: | github.event.release diff --git a/.github/workflows/vcpkg_ci_windows.yml b/.github/workflows/vcpkg_ci_windows.yml index 552245bb..5576a49d 100644 --- a/.github/workflows/vcpkg_ci_windows.yml +++ b/.github/workflows/vcpkg_ci_windows.yml @@ -232,48 +232,6 @@ jobs: & ( Get-ChildItem install\bin | Where-Object {$_.name -match "anvill-decompile-json-.*.exe"} ) -spec ..\tools\decompile-json\tests\specs\ret0.json -bc_out ret0.bc -ir_out ret0.ir - - name: 'Anvill-McSema build - custom remill' - if: ${{ matrix.llvm == 'llvm-11' }} - run: | - cd anvill-mcsema - Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build - New-Item -Path .\build -ItemType Directory - cd build - cmake -T ClangCl ` - -DCMAKE_VERBOSE_MAKEFILE=ON ` - -DCMAKE_INSTALL_PREFIX="$(pwd)\install" ` - -DVCPKG_ROOT="${env:VCPKG_ROOT}" ` - -DANVILL_ENABLE_INSTALL_TARGET=ON ` - -Dremill_DIR="$(pwd)\..\..\remill\build\install\lib\cmake\remill" ` - .. - cmake --build . --config Release -j - cmake --build . --config Release --target install - - & ( Get-ChildItem install\bin | Where-Object {$_.name -match "anvill-decompile-json-.*.exe"} ) -spec ..\tools\decompile-json\tests\specs\ret0.json -bc_out ret0.bc -ir_out ret0.ir - - - name: 'Test mcsema build' - if: ${{ matrix.llvm == 'llvm-11' }} - run: | - cd mcsema - Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build - New-Item -Path .\build -ItemType Directory - cd build - cmake -T ClangCl ` - -DCMAKE_VERBOSE_MAKEFILE=ON ` - -DCMAKE_INSTALL_PREFIX="$(pwd)\install" ` - -DVCPKG_ROOT="${env:VCPKG_ROOT}" ` - -DMCSEMA_INSTALL_PYTHON2_LIBS=OFF ` - -DMCSEMA_INSTALL_PYTHON3_LIBS=OFF ` - -Dremill_DIR="$(pwd)\..\..\remill\build\install\lib\cmake\remill" ` - -Danvill_DIR="$(pwd)\..\..\anvill-mcsema\build\install\lib\cmake\anvill" ` - .. - cmake --build . --config Release -j - cmake --build . --config Release --target install - - & ( Get-ChildItem install\mcsema\bin | Where-Object {$_.name -match "mcsema-lift-.*.exe"} ) --version - & ( Get-ChildItem install\mcsema\bin | Where-Object {$_.name -match "mcsema-lift-.*.exe"} ) --arch amd64 --os linux --cfg ..\tests\test_suite_generator\generated\prebuilt_cfg\amd64\linux\cfg\hello_world --output hello_world.bc - & ( Get-ChildItem install\mcsema\bin | Where-Object {$_.name -match "mcsema-lift-.*.exe"} ) --arch x86 --os linux --cfg ..\tests\test_suite_generator\generated\prebuilt_cfg\x86\linux\cfg\hello_world --output hello_world.bc - - name: Publish Release Assets if: | github.event.release diff --git a/.gitmodules b/.gitmodules index 4878be08..72843a78 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "mcsema"] - path = mcsema - url = https://github.com/lifting-bits/mcsema.git - branch = master [submodule "remill"] path = remill url = https://github.com/lifting-bits/remill.git @@ -14,6 +10,3 @@ path = rellic url = https://github.com/lifting-bits/rellic.git branch = master -[submodule "anvill-mcsema"] - path = anvill-mcsema - url = https://github.com/lifting-bits/anvill.git diff --git a/anvill-mcsema b/anvill-mcsema deleted file mode 160000 index bc3183b8..00000000 --- a/anvill-mcsema +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bc3183b8a08f12b9c2f9b97af2bcc0f0138dbb7a diff --git a/mcsema b/mcsema deleted file mode 160000 index d538ca4a..00000000 --- a/mcsema +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d538ca4acc0918894924ab28ce889d14157beb83