diff options
5 files changed, 0 insertions, 470 deletions
diff --git a/dev-util/unicorn/files/unicorn-2.0.1-configure.patch b/dev-util/unicorn/files/unicorn-2.0.1-configure.patch deleted file mode 100644 index 57f945e08d37..000000000000 --- a/dev-util/unicorn/files/unicorn-2.0.1-configure.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a78d690da54f3afbd3213502c997ba68b29aa404 Mon Sep 17 00:00:00 2001 -From: "Z. Liu" <zhixu.liu@gmail.com> -Date: Tue, 14 Jan 2025 08:47:54 +0800 -Subject: [PATCH] configure: add <sys/timex.h> for clock_adjtime on musl - (#2085) - -for glibc, if _GNU_SOURCE is defined, <time.h> will include <sys/timex.h> -but not for musl, so add "#include <sys/timex.h>" - -although `man clock_adjtime` said "#include <sys/timex.h>", but it won't -work for glibc w/o "#include <time.h>", I don't known why yet. - -PS it seems clock_adjtime is used nowhere? - -Signed-off-by: Z. Liu <zhixu.liu@gmail.com> ---- - qemu/configure | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qemu/configure b/qemu/configure -index db820ca1..47d4a4c6 100755 ---- a/qemu/configure -+++ b/qemu/configure -@@ -1455,6 +1455,7 @@ fi - clock_adjtime=no - cat > $TMPC <<EOF - #include <time.h> -+#include <sys/timex.h> - - int main(void) - { --- -2.45.2 - diff --git a/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch b/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch deleted file mode 100644 index b63ffee0c096..000000000000 --- a/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 9a2583e96710ba49a8fd2a4ab87db7212c1e887c -Upstream: https://github.com/unicorn-engine/unicorn/pull/1886 -Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> -Date: Sun Oct 8 13:40:23 2023 +0200 - - fix deprecated storage-class declarations - ---- a/qemu/accel/tcg/cputlb.c -+++ b/qemu/accel/tcg/cputlb.c -@@ -1415,7 +1415,7 @@ load_memop(const void *haddr, MemOp op) - } - } - --static uint64_t inline -+static inline uint64_t - load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, - uintptr_t retaddr, MemOp op, bool code_read, - FullLoadHelper *full_load) -@@ -1983,7 +1983,7 @@ uint64_t cpu_ldq_data(CPUArchState *env, target_ulong ptr) - * Store Helpers - */ - --static void inline -+static inline void - store_memop(void *haddr, uint64_t val, MemOp op) - { - switch (op) { -@@ -2014,7 +2014,7 @@ store_memop(void *haddr, uint64_t val, MemOp op) - } - } - --static void inline -+static inline void - store_helper(CPUArchState *env, target_ulong addr, uint64_t val, - TCGMemOpIdx oi, uintptr_t retaddr, MemOp op) - { -@@ -2343,7 +2343,7 @@ void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, - * Store Helpers for cpu_ldst.h - */ - --static void inline -+static inline void - cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, - int mmu_idx, uintptr_t retaddr, MemOp op) // qq - { diff --git a/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch b/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch deleted file mode 100644 index d8ae8677d837..000000000000 --- a/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch +++ /dev/null @@ -1,299 +0,0 @@ -commit 5983b399d84c534ad2f19461dd38f69e70ea9cfb -Upstream: https://github.com/unicorn-engine/unicorn/pull/1886 -Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> -Date: Sun Oct 8 13:39:13 2023 +0200 - - use full prototypes for functions without parameters - ---- a/bindings/ruby/unicorn_gem/ext/unicorn.c -+++ b/bindings/ruby/unicorn_gem/ext/unicorn.c -@@ -31,7 +31,7 @@ VALUE SavedContext = Qnil; - VALUE Hook = Qnil; - - --void Init_unicorn_engine() { -+void Init_unicorn_engine(void) { - rb_require("unicorn_engine/unicorn_const"); - UnicornModule = rb_define_module("UnicornEngine"); - UcError = rb_define_class_under(UnicornModule, "UcError", rb_eStandardError); ---- a/samples/mem_apis.c -+++ b/samples/mem_apis.c -@@ -193,7 +193,7 @@ static void do_nx_demo(bool cause_fault) - uc_close(uc); - } - --static void nx_test() -+static void nx_test(void) - { - printf("NX demo - step 1: show that code runs to completion\n"); - do_nx_demo(false); -@@ -276,7 +276,7 @@ static void do_perms_demo(bool change_perms) - uc_close(uc); - } - --static void perms_test() -+static void perms_test(void) - { - printf("Permissions demo - step 1: show that area is writeable\n"); - do_perms_demo(false); -@@ -355,7 +355,7 @@ static void do_unmap_demo(bool do_unmap) - uc_close(uc); - } - --static void unmap_test() -+static void unmap_test(void) - { - printf("Unmap demo - step 1: show that area is writeable\n"); - do_unmap_demo(false); ---- a/samples/sample_arm.c -+++ b/samples/sample_arm.c -@@ -366,7 +366,7 @@ static void test_thumb_ite_internal(bool step, uint32_t *r2_out, - *r3_out = r3; - } - --static void test_thumb_ite() -+static void test_thumb_ite(void) - { - uint32_t r2, r3; - uint32_t step_r2, step_r3; -@@ -390,7 +390,7 @@ static void test_thumb_ite() - } - } - --static void test_read_sctlr() -+static void test_read_sctlr(void) - { - uc_engine *uc; - uc_err err; ---- a/samples/sample_arm64.c -+++ b/samples/sample_arm64.c -@@ -197,7 +197,7 @@ static void test_arm64eb(void) - uc_close(uc); - } - --static void test_arm64_sctlr() -+static void test_arm64_sctlr(void) - { - uc_engine *uc; - uc_err err; -@@ -248,7 +248,7 @@ static uint32_t hook_mrs(uc_engine *uc, uc_arm64_reg reg, - return 1; - } - --static void test_arm64_hook_mrs() -+static void test_arm64_hook_mrs(void) - { - uc_engine *uc; - uc_err err; ---- a/samples/sample_batch_reg.c -+++ b/samples/sample_batch_reg.c -@@ -49,7 +49,7 @@ void hook_code(uc_engine *uc, uint64_t addr, uint32_t size, void *user_data) - printf("HOOK_CODE: 0x%" PRIx64 ", 0x%x\n", addr, size); - } - --int main() -+int main(void) - { - int i; - uc_hook sys_hook; ---- a/samples/sample_ctl.c -+++ b/samples/sample_ctl.c -@@ -79,7 +79,7 @@ static void trace_new_edge(uc_engine *uc, uc_tb *cur, uc_tb *prev, void *data) - prev->pc + prev->size - 1, cur->pc); - } - --void test_uc_ctl_exits() -+void test_uc_ctl_exits(void) - { - uc_engine *uc; - uc_err err; -@@ -193,7 +193,7 @@ double time_emulation(uc_engine *uc, uint64_t start, uint64_t end) - return (t2 - t1) * 1000.0 / CLOCKS_PER_SEC; - } - --static void test_uc_ctl_tb_cache() -+static void test_uc_ctl_tb_cache(void) - { - uc_engine *uc; - uc_err err; ---- a/samples/sample_x86.c -+++ b/samples/sample_x86.c -@@ -1240,7 +1240,7 @@ static void test_i386_invalid_mem_read_in_tb(void) - uc_close(uc); - } - --static void test_i386_smc_xor() -+static void test_i386_smc_xor(void) - { - uc_engine *uc; - uc_err err; -@@ -1319,7 +1319,7 @@ static void mmio_write_callback(uc_engine *uc, uint64_t offset, unsigned size, - return; - } - --static void test_i386_mmio() -+static void test_i386_mmio(void) - { - uc_engine *uc; - int r_ecx = 0xdeadbeef; -@@ -1392,7 +1392,7 @@ static bool test_i386_hook_mem_invalid_cb(uc_engine *uc, uc_mem_type type, - return true; - } - --static void test_i386_hook_mem_invalid() -+static void test_i386_hook_mem_invalid(void) - { - uc_engine *uc; - uc_hook hook; ---- a/samples/sample_x86_32_gdt_and_seg_regs.c -+++ b/samples/sample_x86_32_gdt_and_seg_regs.c -@@ -163,7 +163,7 @@ static void hex_dump(unsigned char *ptr, unsigned int len) - } - */ - --static void gdt_demo() -+static void gdt_demo(void) - { - uc_engine *uc; - uc_hook hook1, hook2; ---- a/tests/regress/00opcode_uc_crash.c -+++ b/tests/regress/00opcode_uc_crash.c -@@ -7,7 +7,7 @@ - #define X86_CODE32 "\x00" // add byte ptr ds:[eax],al - #define ADDRESS 0x1000000 - --static void VM_exec() -+static void VM_exec(void) - { - uc_engine *uc; - uc_err err; ---- a/tests/regress/arm_enable_vfp.c -+++ b/tests/regress/arm_enable_vfp.c -@@ -6,7 +6,7 @@ - #define ADDRESS 0x1000 - #define ARM_VMOV "\xC0\xEF\x10\x00" // VMOV.I32 D16, #0 ; Vector Move - --int main() -+int main(void) - { - uc_engine *uc; - uc_err err; ---- a/tests/regress/block_test.c -+++ b/tests/regress/block_test.c -@@ -24,7 +24,7 @@ void cb_hookblock(uc_engine *uc, uint64_t address, uint32_t size, void *user_dat - fprintf(stderr, "ok %d - basic block size is correct\n", count++); - } - --int main() { -+int main(void) { - uc_engine *uc; - - fprintf(stderr, "# basic block callback test\n"); ---- a/tests/regress/eflags_noset.c -+++ b/tests/regress/eflags_noset.c -@@ -20,7 +20,7 @@ typedef uint64_t puint; - #define PRIX3264 PRIX64 - #endif - --uint32_t realEflags() -+uint32_t realEflags(void) - { - puint val = 0; - -@@ -55,7 +55,7 @@ uint32_t realEflags() - return (uint32_t)val & 0xFFFFFFFF; - } - --static void VM_exec() -+static void VM_exec(void) - { - #if defined(__i386__) || defined(__x86_64__) - uc_engine *uc; ---- a/tests/regress/eflags_nosync.c -+++ b/tests/regress/eflags_nosync.c -@@ -64,7 +64,7 @@ static bool hook_invalid_mem(uc_engine *uc, uc_mem_type type, uint64_t address, - } - } - --static void VM_exec() -+static void VM_exec(void) - { - uc_engine *uc; - uc_err err; ---- a/tests/regress/emu_clear_errors.c -+++ b/tests/regress/emu_clear_errors.c -@@ -38,7 +38,7 @@ bool cb_hookunmapped(uc_engine *uc, uc_mem_type type, uint64_t address, uint32_t - "\x56" \ - "\xFF\x15\x20\x20\x00\x10" - --int main() { -+int main(void) { - uc_engine *uc; - - uc_err err = uc_open(UC_ARCH_X86, UC_MODE_32, &uc); ---- a/tests/regress/hook_extrainvoke.c -+++ b/tests/regress/hook_extrainvoke.c -@@ -14,7 +14,7 @@ void hook_ins(uc_engine *uc, uint64_t address, uint32_t size, void *user_data) - printf("hook called\n"); - } - --static void VM_exec() -+static void VM_exec(void) - { - uc_engine *uc; - uc_err err; ---- a/tests/regress/map_crash.c -+++ b/tests/regress/map_crash.c -@@ -6,7 +6,7 @@ - #define UC_BUG_WRITE_SIZE 13000 - #define UC_BUG_WRITE_ADDR 0x1000 - --int main() -+int main(void) - { - int size; - uint8_t *buf; ---- a/tests/regress/map_write.c -+++ b/tests/regress/map_write.c -@@ -6,7 +6,7 @@ - #define SIZE 1024*64 - #define OVERFLOW 1 - --int main() -+int main(void) - { - uc_engine *uc = NULL; - uint8_t *buf = NULL, *buf2 = NULL; ---- a/tests/regress/mips_kseg0_1.c -+++ b/tests/regress/mips_kseg0_1.c -@@ -20,7 +20,7 @@ - - #define MIPS_CODE_EL "\x56\x34\x21\x34" // ori $at, $at, 0x3456; - --int main() -+int main(void) - { - - uc_engine *uc; ---- a/tests/regress/sigill.c -+++ b/tests/regress/sigill.c -@@ -16,7 +16,7 @@ void _interrupt(uc_engine *uc, uint32_t intno, void *user_data) - } - } - --int main() -+int main(void) - { - int size; - uint8_t *buf; ---- a/tests/regress/sigill2.c -+++ b/tests/regress/sigill2.c -@@ -6,7 +6,7 @@ - #define UC_BUG_WRITE_SIZE 128 - #define UC_BUG_WRITE_ADDR 0x2000 - --int main() -+int main(void) - { - int size; - uc_engine *uc; diff --git a/dev-util/unicorn/files/unicorn-2.1.2-return.patch b/dev-util/unicorn/files/unicorn-2.1.2-return.patch deleted file mode 100644 index 79e5f2f57197..000000000000 --- a/dev-util/unicorn/files/unicorn-2.1.2-return.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d03c0922e6c86741001ff8f40140be37c99eb83a Mon Sep 17 00:00:00 2001 -From: Disconnect3d <dominik.b.czarnota@gmail.com> -Date: Fri, 14 Feb 2025 18:04:30 +0100 -Subject: [PATCH] Fix #2103: qemu/target/ppc/mem_helper.c remove redundant - return statements (#2104) -Upstream: https://github.com/unicorn-engine/unicorn/pull/2104 - ---- a/qemu/target/ppc/mem_helper.c -+++ b/qemu/target/ppc/mem_helper.c -@@ -387,7 +387,6 @@ uint64_t helper_lq_le_parallel(CPUPPCState *env, target_ulong addr, - return int128_getlo(ret); - #else - g_assert_not_reached(); -- return 0; - #endif - } - -@@ -404,7 +403,6 @@ uint64_t helper_lq_be_parallel(CPUPPCState *env, target_ulong addr, - return int128_getlo(ret); - #else - g_assert_not_reached(); -- return 0; - #endif - } - -@@ -420,7 +418,6 @@ void helper_stq_le_parallel(CPUPPCState *env, target_ulong addr, - helper_atomic_sto_le_mmu(env, addr, val, opidx, GETPC()); - #else - g_assert_not_reached(); -- return 0; - #endif - } - -@@ -436,7 +433,6 @@ void helper_stq_be_parallel(CPUPPCState *env, target_ulong addr, - helper_atomic_sto_be_mmu(env, addr, val, opidx, GETPC()); - #else - g_assert_not_reached(); -- return 0; - #endif - } - #endif -@@ -465,7 +461,6 @@ uint32_t helper_stqcx_le_parallel(CPUPPCState *env, target_ulong addr, - return env->so + success * CRF_EQ_BIT; - #else - g_assert_not_reached(); -- return 0; - #endif - } - -@@ -492,7 +487,6 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr, - return env->so + success * CRF_EQ_BIT; - #else - g_assert_not_reached(); -- return 0; - #endif - } - diff --git a/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch deleted file mode 100644 index 9be0f31e8478..000000000000 --- a/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0f45f15e303b4a7b15eb4ca61860452f0a071a3e Mon Sep 17 00:00:00 2001 -From: "@Antelox" <anteloxrce@gmail.com> -Date: Tue, 18 Feb 2025 09:28:06 +0100 -Subject: [PATCH] Python bindings: (#2112) -Upstream: https://github.com/unicorn-engine/unicorn/pull/2112 - -- Switch from versioningit to setuptools-scm -- Disable building of tests via DUNICORN_BUILD_TESTS var ---- a/bindings/python/pyproject.toml -+++ b/bindings/python/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools", "build", "wheel", "versioningit"] -+requires = ["setuptools>=64", "build", "wheel", "setuptools-scm>=8"] - build-backend = "setuptools.build_meta" - - [project] -@@ -40,4 +40,5 @@ test = [ - [tool.setuptools.packages.find] - include = ["unicorn*"] - --[tool.versioningit] -+[tool.setuptools_scm] -+root = '../../' ---- a/bindings/python/setup.py -+++ b/bindings/python/setup.py -@@ -102,7 +102,7 @@ def build_libraries(): - - has_msbuild = shutil.which('msbuild') is not None - conf = 'Debug' if int(os.getenv('DEBUG', 0)) else 'Release' -- cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf] -+ cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf, "-DUNICORN_BUILD_TESTS=off"] - if os.getenv("UNICORN_TRACER"): - cmake_args += ["-DUNICORN_TRACER=on"] - if conf == 'Debug': |