Merge pull request #127 from illera88/support_IDA7.7

Support ida7.7
illera88 · Apr 25, 2022 · a340f4f · a340f4f
2 parents 5bc02d1 + 457edf7
commit a340f4f
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 8 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -8,10 +8,8 @@ on:
 
 jobs:
     build:
-        #cmake -S . -B build_x64 -DCMAKE_INSTALL_PREFIX=install_dir -DPYTHON_BINDINGS=OFF -DSTATICLIB=ON -DZ3_INCLUDE_DIRS="$VCPKG_INSTALLATION_ROOT/installed/x64-linux/include" -DCAPSTONE_INCLUDE_DIRS="$VCPKG_INSTALLATION_ROOT/installed/x64-linux/include"              
-        #if: github.event_name == 'push' && contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false
         runs-on: ubuntu-latest
-        steps:           
+        steps:
             - uses: actions/checkout@v1
               with:
                   submodules: true
@@ -77,6 +75,12 @@ jobs:
                   cmake -S . -B build_x64_7.6 -DIDASDK_ROOT_DIR="../IDA_SDKs/idasdk76" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
                   cmake --build build_x64_7.6 --config Release --parallel 2
 
+            - name: Build Ponce IDA 7.7
+              run: |
+                  unzip ../IDA_SDKs/idasdk77.zip -d ../IDA_SDKs
+                  cmake -S . -B build_x64_7.7 -DIDASDK_ROOT_DIR="../IDA_SDKs/idasdk77" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
+                  cmake --build build_x64_7.7 --config Release --parallel 2
+
 
             - uses: actions/upload-artifact@master
               with:
@@ -147,6 +151,16 @@ jobs:
               with:
                   name: Ponce_ida76
                   path: build_x64_7.6/Ponce.so
+
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Ponce64.so
+
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Ponce.so
 
     release:
         runs-on: ubuntu-latest

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -3,12 +3,11 @@ on:
     push:
     pull_request:
     release:
-      types: # This configuration does not affect the page_build event above
+      types: # This configuration does not affect the page_build event above 
         - created
 
 jobs:
     build:
-        #if: github.event_name == 'push' && contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false
         runs-on: macos-latest
         steps:           
             - uses: actions/checkout@v1
@@ -76,6 +75,13 @@ jobs:
                   cmake -S . -B build_x64_7.6 -DUSE_CLANG=ON -DIDASDK_ROOT_DIR="../IDA_SDKs/idasdk76" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
                   cmake --build build_x64_7.6 --config Release --parallel 2
 
+            - name: Build Ponce IDA 7.7
+              run: |
+                  unzip ../IDA_SDKs/idasdk77.zip -d ../IDA_SDKs
+                  cmake -S . -B build_x64_7.7 -DUSE_CLANG=ON -DIDASDK_ROOT_DIR="../IDA_SDKs/idasdk77" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
+                  cmake --build build_x64_7.7 --config Release --parallel 2
+
+
             - uses: actions/upload-artifact@master
               with:
                   name: Ponce_ida70
@@ -144,8 +150,19 @@ jobs:
             - uses: actions/upload-artifact@master
               with:
                   name: Ponce_ida76
-                  path: build_x64_7.6/Ponce.dylib      
+                  path: build_x64_7.6/Ponce.dylib
+
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Ponce64.dylib
 
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Ponce.dylib
+
+
     release:
         runs-on: ubuntu-latest
         if: github.event_name == 'release'

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -8,7 +8,6 @@ on:
 
 jobs:
     build:
-        #if: github.event_name == 'push' && contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false
         runs-on: windows-2019
         steps:           
             - uses: actions/checkout@v1
@@ -76,6 +75,13 @@ jobs:
                   cmake -S . -B build_x64_7.6 -DIDASDK_ROOT_DIR="..\IDA_SDKs\idasdk76" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 16 2019" -A x64 -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake"          
                   cmake --build build_x64_7.6 --config Release --parallel 2
 
+            - name: Build Ponce IDA 7.7
+              run: |
+                  powershell Expand-Archive -Force ..\IDA_SDKs\idasdk77.zip ..\IDA_SDKs
+                  cmake -S . -B build_x64_7.7 -DIDASDK_ROOT_DIR="..\IDA_SDKs\idasdk77" -DSTATICLIB=ON -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 16 2019" -A x64 -DVCPKG_TARGET_TRIPLET="x64-windows-static" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake"          
+                  cmake --build build_x64_7.7 --config Release --parallel 2
+
+
             - uses: actions/upload-artifact@master
               with:
                   name: Ponce_ida70
@@ -146,6 +152,16 @@ jobs:
                   name: Ponce_ida76
                   path: build_x64_7.6/Release/Ponce.dll
 
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Release/Ponce64.dll
+
+            - uses: actions/upload-artifact@master
+              with:
+                  name: Ponce_ida77
+                  path: build_x64_7.7/Release/Ponce.dll
+
 
     release:
         runs-on: ubuntu-latest

diff --git a/src/main.cpp b/src/main.cpp
@@ -131,7 +131,9 @@ int idaapi init(void)
     char version[8];
     //We do some checks with the versions...
     if (get_kernel_version(version, sizeof(version))) {
-#if IDA_SDK_VERSION == 760
+#if IDA_SDK_VERSION == 770
+        if (strcmp(version, "7.7") != 0) {
+#elif IDA_SDK_VERSION == 760
         if (strcmp(version, "7.6") != 0) {
 #elif IDA_SDK_VERSION == 750
         if (strcmp(version, "7.5") != 0) {