From cf65f2e59355a566f6d6509bbff459812b582830 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Tue, 7 Jan 2025 21:14:21 +0800 Subject: [PATCH 1/3] Bump version number to 5.0.0 Since we already introduced breaking API changes, so there should be a way to detect those changes for users. --- CMakeLists.txt | 2 +- Doxyfile | 2 +- include/Zydis/Zydis.h | 2 +- meson.build | 2 +- resources/VersionInfo.rc | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a6846e0..56dbf825 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15") cmake_policy(SET CMP0091 NEW) endif () -project(Zydis VERSION 4.0.0.0 LANGUAGES C) +project(Zydis VERSION 5.0.0.0 LANGUAGES C) include(GNUInstallDirs) include(CMakePackageConfigHelpers) diff --git a/Doxyfile b/Doxyfile index da6c56f7..abede349 100644 --- a/Doxyfile +++ b/Doxyfile @@ -2,7 +2,7 @@ # per line (i.e. do not split long lines with '\'), and only use '=' to set values PROJECT_NAME = Zydis -PROJECT_NUMBER = v4.0.0 +PROJECT_NUMBER = v5.0.0 OUTPUT_DIRECTORY = ./doc INPUT = ./include ./README.md ./files.dox JAVADOC_AUTOBRIEF = YES diff --git a/include/Zydis/Zydis.h b/include/Zydis/Zydis.h index 46f49f4d..41745dad 100644 --- a/include/Zydis/Zydis.h +++ b/include/Zydis/Zydis.h @@ -86,7 +86,7 @@ extern "C" { /** * A macro that defines the zydis version. */ -#define ZYDIS_VERSION (ZyanU64)0x0004000000000000 +#define ZYDIS_VERSION (ZyanU64)0x0005000000000000 /* ---------------------------------------------------------------------------------------------- */ /* Helper macros */ diff --git a/meson.build b/meson.build index 3a78f629..aa478bc6 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'Zydis', 'c', - version: '4.0.0', + version: '5.0.0', license: 'MIT', license_files: 'LICENSE', meson_version: '>=1.3', diff --git a/resources/VersionInfo.rc b/resources/VersionInfo.rc index 3894ccf7..4af55045 100644 --- a/resources/VersionInfo.rc +++ b/resources/VersionInfo.rc @@ -27,8 +27,8 @@ #include "winres.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,0,0,0 - PRODUCTVERSION 4,0,0,0 + FILEVERSION 5,0,0,0 + PRODUCTVERSION 5,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BEGIN VALUE "CompanyName", "zyantific" VALUE "FileDescription", "Zyan Disassembler Library" - VALUE "FileVersion", "4.0.0.0" + VALUE "FileVersion", "5.0.0.0" VALUE "InternalName", "Zydis" VALUE "LegalCopyright", "Copyright \xA9 2014-2024 by zyantific.com" VALUE "OriginalFilename", "Zydis.dll" VALUE "ProductName", "Zyan Disassembler Library" - VALUE "ProductVersion", "4.0.0.0" + VALUE "ProductVersion", "5.0.0.0" END END BLOCK "VarFileInfo" From 15f26dbec2471f5682e9bcffeddaa7e9339475d6 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Tue, 7 Jan 2025 21:16:02 +0800 Subject: [PATCH 2/3] Remove type cast in VERSION macros Allows preprocesser #if statements to use version macros. --- include/Zydis/Zydis.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Zydis/Zydis.h b/include/Zydis/Zydis.h index 41745dad..0d747032 100644 --- a/include/Zydis/Zydis.h +++ b/include/Zydis/Zydis.h @@ -86,7 +86,7 @@ extern "C" { /** * A macro that defines the zydis version. */ -#define ZYDIS_VERSION (ZyanU64)0x0005000000000000 +#define ZYDIS_VERSION 0x0005000000000000ULL /* ---------------------------------------------------------------------------------------------- */ /* Helper macros */ @@ -97,28 +97,28 @@ extern "C" { * * @param version The zydis version value */ -#define ZYDIS_VERSION_MAJOR(version) (ZyanU16)(((version) & 0xFFFF000000000000) >> 48) +#define ZYDIS_VERSION_MAJOR(version) (((version) & 0xFFFF000000000000) >> 48) /** * Extracts the minor-part of the zydis version. * * @param version The zydis version value */ -#define ZYDIS_VERSION_MINOR(version) (ZyanU16)(((version) & 0x0000FFFF00000000) >> 32) +#define ZYDIS_VERSION_MINOR(version) (((version) & 0x0000FFFF00000000) >> 32) /** * Extracts the patch-part of the zydis version. * * @param version The zydis version value */ -#define ZYDIS_VERSION_PATCH(version) (ZyanU16)(((version) & 0x00000000FFFF0000) >> 16) +#define ZYDIS_VERSION_PATCH(version) (((version) & 0x00000000FFFF0000) >> 16) /** * Extracts the build-part of the zydis version. * * @param version The zydis version value */ -#define ZYDIS_VERSION_BUILD(version) (ZyanU16)((version) & 0x000000000000FFFF) +#define ZYDIS_VERSION_BUILD(version) ((version) & 0x000000000000FFFF) /* ---------------------------------------------------------------------------------------------- */ From ec0342072c219ea5febb466a6ab50cc728756038 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Tue, 7 Jan 2025 21:20:46 +0800 Subject: [PATCH 3/3] ci: fix meson minimal build --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 60d20328..1a65cd12 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,8 +75,8 @@ jobs: # Do a few more specialized configurations. - platform: ubuntu-22.04 mode: - - name: minimal - args: -Dminimal=enabled -Ddecoder=enabled -Davx512=enabled -Dknc=enabled -Dsegment=enabled -Dtests=enabled + name: minimal + args: -Dminimal=enabled -Ddecoder=enabled -Davx512=enabled -Dknc=enabled -Dsegment=enabled -Dtests=enabled extra_envs: {} flavor: minsize exclude: