diff --git a/devel/zydis/Makefile b/devel/zydis/Makefile index 4c2a38b94245..b9b1d4443f2c 100644 --- a/devel/zydis/Makefile +++ b/devel/zydis/Makefile @@ -1,23 +1,28 @@ PORTNAME= zydis DISTVERSIONPREFIX= v -DISTVERSION= 3.2.1 +DISTVERSION= 4.0.0 CATEGORIES= devel MAINTAINER= freebsd@sysctl.cz COMMENT= Fast and lightweight x86/x86-64 disassembler library WWW= https://zydis.re LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le riscv64 ONLY_FOR_ARCHS_REASON= see definitions in include/Zycore/Defines.h +LIB_DEPENDS= libZycore.so:devel/zycore-c + USES= cmake cpe dos2unix localbase:ldflags USE_GITHUB= yes DOS2UNIX_FILES= src/String.c GH_ACCOUNT= zyantific -GH_TUPLE= zyantific:zycore-c:7c33e13:zydis/dependencies/zycore +GH_TUPLE= zyantific:zycore-c:1401fb8:zydis/dependencies/zycore CPE_VENDOR= zyantific +CMAKE_ON= ZYDIS_BUILD_SHARED_LIB ZYAN_SYSTEM_ZYCORE +CMAKE_OFF= ZYDIS_BUILD_EXAMPLES + .include diff --git a/devel/zydis/distinfo b/devel/zydis/distinfo index eb78e767e63e..b8074f4adb4b 100644 --- a/devel/zydis/distinfo +++ b/devel/zydis/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664819353 -SHA256 (zyantific-zydis-v3.2.1_GH0.tar.gz) = 349a2d27270e54499b427051dd45f7b6064811b615588414b096cdeeaeb730ad -SIZE (zyantific-zydis-v3.2.1_GH0.tar.gz) = 658154 -SHA256 (zyantific-zycore-c-7c33e13_GH0.tar.gz) = 629a442a6fc97d12d811e3abe9b253240d9e0fe6af221a240d2154b25ff263cc -SIZE (zyantific-zycore-c-7c33e13_GH0.tar.gz) = 61704 +TIMESTAMP = 1677396889 +SHA256 (zyantific-zydis-v4.0.0_GH0.tar.gz) = 14e991fd97b021e15c77a4726a0ae8a4196d6521ab505acb5c51fc2f9be9530a +SIZE (zyantific-zydis-v4.0.0_GH0.tar.gz) = 596317 +SHA256 (zyantific-zycore-c-1401fb8_GH0.tar.gz) = 9669557862b546443e99c62568d2078548fc3d8d8e8b8d36e618237ccf0fcd3e +SIZE (zyantific-zycore-c-1401fb8_GH0.tar.gz) = 61010 diff --git a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h deleted file mode 100644 index bb8a35746507..000000000000 --- a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h +++ /dev/null @@ -1,15 +0,0 @@ ---- dependencies/zycore/include/Zycore/Defines.h.orig 2022-10-03 17:54:40 UTC -+++ dependencies/zycore/include/Zycore/Defines.h -@@ -134,6 +134,12 @@ - # define ZYAN_AARCH64 - #elif defined(_M_ARM) || defined(_M_ARMT) || defined(__arm__) || defined(__thumb__) - # define ZYAN_ARM -+#elif defined(__powerpc64__) -+# define ZYAN_PPC64 -+#elif defined(__powerpc__) -+# define ZYAN_PPC -+#elif defined(__riscv) && __riscv_xlen == 64 -+# define ZYAN_RISCV64 - #elif defined(__EMSCRIPTEN__) || defined(__wasm__) || defined(__WASM__) - # define ZYAN_WASM - #else diff --git a/devel/zydis/files/patch-dependencies_zycore_src_Format.c b/devel/zydis/files/patch-dependencies_zycore_src_Format.c deleted file mode 100644 index 40d82f8e14cc..000000000000 --- a/devel/zydis/files/patch-dependencies_zycore_src_Format.c +++ /dev/null @@ -1,38 +0,0 @@ ---- dependencies/zycore/src/Format.c.orig 2022-10-03 17:57:52 UTC -+++ dependencies/zycore/src/Format.c -@@ -83,7 +83,7 @@ static const ZyanStringView STR_SUB = ZYAN_DEFINE_STRI - /* Decimal */ - /* ---------------------------------------------------------------------------------------------- */ - --#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) -+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) - ZyanStatus ZyanStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length) - { - if (!string) -@@ -179,7 +179,7 @@ ZyanStatus ZyanStringAppendDecU64(ZyanString* string, - /* Hexadecimal */ - /* ---------------------------------------------------------------------------------------------- */ - --#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) -+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) - ZyanStatus ZyanStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length, - ZyanBool uppercase) - { -@@ -423,7 +423,7 @@ ZyanStatus ZyanStringAppendFormat(ZyanString* string, - - ZyanStatus ZyanStringAppendDecU(ZyanString* string, ZyanU64 value, ZyanU8 padding_length) - { --#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) - return ZyanStringAppendDecU64(string, value, padding_length); - #else - // Working with 64-bit values is slow on non 64-bit systems -@@ -464,7 +464,7 @@ ZyanStatus ZyanStringAppendDecS(ZyanString* string, Zy - ZyanStatus ZyanStringAppendHexU(ZyanString* string, ZyanU64 value, ZyanU8 padding_length, - ZyanBool uppercase) - { --#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) - return ZyanStringAppendHexU64(string, value, padding_length, uppercase); - #else - // Working with 64-bit values is slow on non 64-bit systems diff --git a/devel/zydis/files/patch-src_String.c b/devel/zydis/files/patch-src_String.c deleted file mode 100644 index ec8eb9e43828..000000000000 --- a/devel/zydis/files/patch-src_String.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/String.c.orig 2022-09-29 22:19:15 UTC -+++ src/String.c -@@ -65,7 +65,7 @@ static const char* const DECIMAL_LOOKUP = - /* Decimal */ - /* ---------------------------------------------------------------------------------------------- */ - --#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) -+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) - ZyanStatus ZydisStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length) - { - ZYAN_ASSERT(string); -@@ -157,7 +157,7 @@ ZyanStatus ZydisStringAppendDecU64(ZyanString* string, - /* Hexadecimal */ - /* ---------------------------------------------------------------------------------------------- */ - --#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) -+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) - ZyanStatus ZydisStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length, - ZyanBool uppercase) - { -@@ -312,7 +312,7 @@ ZyanStatus ZydisStringAppendDecU(ZyanString* string, Z - ZYAN_CHECK(ZydisStringAppend(string, prefix)); - } - --#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) - ZYAN_CHECK(ZydisStringAppendDecU64(string, value, padding_length)); - #else - if (value & 0xFFFFFFFF00000000) -@@ -337,7 +337,7 @@ ZyanStatus ZydisStringAppendHexU(ZyanString* string, Z - ZYAN_CHECK(ZydisStringAppend(string, prefix)); - } - --#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) - ZYAN_CHECK(ZydisStringAppendHexU64(string, value, padding_length, uppercase)); - #else - if (value & 0xFFFFFFFF00000000) diff --git a/devel/zydis/pkg-plist b/devel/zydis/pkg-plist index cb319a092c6a..5b527816b6d9 100644 --- a/devel/zydis/pkg-plist +++ b/devel/zydis/pkg-plist @@ -1,32 +1,37 @@ bin/ZydisDisasm bin/ZydisInfo include/Zydis/Decoder.h include/Zydis/DecoderTypes.h +include/Zydis/Defines.h +include/Zydis/Disassembler.h +include/Zydis/Encoder.h include/Zydis/Formatter.h include/Zydis/FormatterBuffer.h include/Zydis/Generated/EnumISAExt.h include/Zydis/Generated/EnumISASet.h include/Zydis/Generated/EnumInstructionCategory.h include/Zydis/Generated/EnumMnemonic.h include/Zydis/Generated/EnumRegister.h include/Zydis/Internal/DecoderData.h +include/Zydis/Internal/EncoderData.h include/Zydis/Internal/FormatterATT.h include/Zydis/Internal/FormatterBase.h include/Zydis/Internal/FormatterIntel.h include/Zydis/Internal/SharedData.h include/Zydis/Internal/String.h include/Zydis/MetaInfo.h include/Zydis/Mnemonic.h include/Zydis/Register.h +include/Zydis/Segment.h include/Zydis/SharedTypes.h include/Zydis/ShortString.h include/Zydis/Status.h include/Zydis/Utils.h include/Zydis/Zydis.h -include/ZydisExportConfig.h lib/cmake/zydis/zydis-config-version.cmake lib/cmake/zydis/zydis-config.cmake lib/cmake/zydis/zydis-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/zydis/zydis-targets.cmake -lib/libZydis.a - +lib/libZydis.so +lib/libZydis.so.4.0 +lib/libZydis.so.4.0.0.0