From 905a191e28fd9262d0fde97f3c2d100f74693c8d Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:18:21 +0100 Subject: Use upstream unicorn for Ryujinx.Tests.Unicorn (#3771) * unicorn: Add modified ver of unicorns const gen * unicorn: Use upstream consts These consts were generated from the dev branch of unicorn * unicorn: Split common consts into multiple enums * unicorn: Remove arch prefix from consts * unicorn: Add new windows dll Windows 10 - MSVC x64 shared build * unicorn: Use absolute path for const generation * unicorn: Remove fspcr patch * unicorn: Fix using the wrong file extension For some reason _NativeLibraryExtension evaluates to ".so" even on Windows. * unicorn: Add linux shared object again * unicron: Add DllImportResolver * unicorn: Try to import unicorn using an absolute path * unicorn: Add clean target * unicorn: Replace IsUnicornAvailable() methods * unicorn: Skip tests instead of silently passing them if unicorn is missing * unicorn: Write error message to stderr * unicorn: Make Interface static * unicron: Include prefixed unicorn libs (libunicorn.so) Co-authored-by: merry * unicorn: Add lib prefix to shared object for linux Co-authored-by: merry --- Ryujinx.Tests.Unicorn/libs/linux/libunicorn.so | Bin 0 -> 4500288 bytes .../libs/linux/unicorn_fspcr.patch | 24 --------------------- 2 files changed, 24 deletions(-) create mode 100644 Ryujinx.Tests.Unicorn/libs/linux/libunicorn.so delete mode 100644 Ryujinx.Tests.Unicorn/libs/linux/unicorn_fspcr.patch (limited to 'Ryujinx.Tests.Unicorn/libs/linux') diff --git a/Ryujinx.Tests.Unicorn/libs/linux/libunicorn.so b/Ryujinx.Tests.Unicorn/libs/linux/libunicorn.so new file mode 100644 index 00000000..8d0948af Binary files /dev/null and b/Ryujinx.Tests.Unicorn/libs/linux/libunicorn.so differ diff --git a/Ryujinx.Tests.Unicorn/libs/linux/unicorn_fspcr.patch b/Ryujinx.Tests.Unicorn/libs/linux/unicorn_fspcr.patch deleted file mode 100644 index 391c2fb6..00000000 --- a/Ryujinx.Tests.Unicorn/libs/linux/unicorn_fspcr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/qemu/target-arm/unicorn_arm.c b/qemu/target-arm/unicorn_arm.c -index 5ff9ebb..d4953f4 100644 ---- a/qemu/target-arm/unicorn_arm.c -+++ b/qemu/target-arm/unicorn_arm.c -@@ -101,6 +101,9 @@ int arm_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int coun - case UC_ARM_REG_FPEXC: - *(int32_t *)value = ARM_CPU(uc, mycpu)->env.vfp.xregs[ARM_VFP_FPEXC]; - break; -+ case UC_ARM_REG_FPSCR: -+ *(int32_t *)value = vfp_get_fpscr(&ARM_CPU(uc, mycpu)->env); -+ break; - case UC_ARM_REG_IPSR: - *(uint32_t *)value = xpsr_read(&ARM_CPU(uc, mycpu)->env) & 0x1ff; - break; -@@ -175,6 +178,9 @@ int arm_reg_write(struct uc_struct *uc, unsigned int *regs, void* const* vals, i - case UC_ARM_REG_FPEXC: - ARM_CPU(uc, mycpu)->env.vfp.xregs[ARM_VFP_FPEXC] = *(int32_t *)value; - break; -+ case UC_ARM_REG_FPSCR: -+ vfp_set_fpscr(&ARM_CPU(uc, mycpu)->env, *(uint32_t *)value); -+ break; - case UC_ARM_REG_IPSR: - xpsr_write(&ARM_CPU(uc, mycpu)->env, *(uint32_t *)value, 0x1ff); - break; -- cgit v1.2.3