Compare commits

..

428 Commits

Author SHA1 Message Date
walon 7e74e59637 chore: release v9.1.0 2026-11-10 14:59:15 +08:00
cuinc e48a7beb95 fix(MonoHook): arm64 下 target 与 replacement/proxy 相距超过 ±128MB 时 hook 失败或跳错地址 (#71)
- 实现 CodePatcher_arm64_far(LDR Xn, #8; BR Xn; .quad dst),超出 B 指令 ±128MB 范围时使用
- CodePatcher_arm64_near 的范围由约 256MB 改为 ±128MB,并检查 proxy 的距离
- MethodHook.CreateCodePatcher 计算距离时误用了 _proxyPtr,改为 _replacementPtr
2026-10-18 13:38:14 +08:00
walon 9790036a2f chore: drop local absolute paths from HybridCLR skills
Reference documentation by its path inside the HybridCLR docs instead of a machine-specific directory.
2026-10-18 13:29:30 +08:00
walon ea9196e8c3 chore: add ai skills 2026-10-18 13:06:37 +08:00
walon 6cadd24d10 chore: release v9.0.3 2026-10-13 21:16:01 +08:00
walon 9b2cbbf1a7 fix: fix compile error on Unity 6000.3.x + macOS editor 2026-10-13 20:26:45 +08:00
walon ab71cfa6cf refactor: clean up codes 2026-10-13 20:26:33 +08:00
walon e61ff2296f chore: release v9.0.2 2026-10-12 12:58:06 +08:00
walon 635dc7dd1e fix: generate an empty method bridge and reverse PInvoke wrapper before generating aot dlls because some build targets will link the generated AOT dll 2026-10-12 12:55:34 +08:00
walon 0762becc28 refactor: remove unused codes for Unity 2021 or lower versions 2026-10-12 12:53:35 +08:00
walon 52f07bc8b3 fix: fix compile error of PatchScriptingAssembliesJsonHook.cs on WebGL or WeixinMiniGame 2026-10-12 12:51:57 +08:00
walon baa70f8eb9 fix: remove UTF-8 BOM from C# source files
Strip mid-file BOM left after copyright headers and convert remaining UTF-8-BOM files to UTF-8 without BOM.
2026-10-12 12:08:19 +08:00
walon 8d0476c2c9 fix: fix compile errors of AddLil2cppSourceCodeToXcodeproj2022OrNewer.cs and AddLil2cppSourceCodeToXcodeproj2023OrNewer.cs on iOS-like build target 2026-10-12 12:07:04 +08:00
walon f5ca39f3c9 chore: release v9.0.1 2026-10-09 20:55:05 +08:00
walon 86e6407a35 chore: release v9.0.0 2026-10-08 21:07:09 +08:00
walon 44057b0107 refactor: remove support for unity 2019-2021. refactor generator. 2026-10-08 21:01:52 +08:00
walon d17a727fac chore: release v8.15.0 2026-09-29 11:51:30 +08:00
walon d91835ac31 doc: update README 2026-09-29 09:58:48 +08:00
walon 6ecc0a9728 refactor: InstallerController find max-lower version as best match version 2026-09-03 18:01:41 +08:00
walon fd32708e7f chore: add description for ZLua and ZenTS to README 2026-08-20 08:49:48 +08:00
walon a0e0b502c6 chore: release v8.14.1 2026-08-19 22:03:48 +08:00
walon a93ca3dc27 fix: fix InstallerController install branch 6000.3.x on 6000.5.x incorrectly 2026-08-19 22:02:31 +08:00
walon b700ae679c chore: release v8.14.0 2026-08-19 19:07:46 +08:00
walon 6e635f78bf feat: installer support 6000.5.x 2026-08-18 12:19:53 +08:00
walon ca7f87b6a7 chore: release v8.13.0 2026-08-02 13:02:16 +08:00
walon e4def761d6 [version] Release v8.12.0 2026-06-01 11:15:52 +08:00
walon f0be76c0ce fix: correct conditional compilation macro for Windows standalone targeting
Fixes an issue where 'UNITY_STANDALONE_WIN' is incorrectly defined when
building or targeting Windows standalone from a non-Windows Unity Editor
(e.g., macOS/Linux). This caused the Editor to incorrectly hit the Windows
code path (kernel32.dll / VirtualProtect) instead of the POSIX one, leading
to compilation errors or runtime crashes during the build process.
2026-05-18 22:29:44 +08:00
walon 4feac30cb2 [version] Release v8.11.0 2026-02-28 09:45:20 +08:00
walon fc3d9dcd7d [version] Release v8.10.0 2026-02-24 10:03:55 +08:00
walon 6a320c556f [new] support BuildTarget GameCoreXboxOne and GameCoreXboxSeries. 2026-02-24 10:03:55 +08:00
walon 03083ad8f9 change: update README.md 2026-01-20 10:21:57 +08:00
walon c6d53bff82 [change] update README.md, add introduce about leanclr 2026-01-19 11:38:27 +08:00
walon 77d4aec034 [version] Release v8.9.0 2026-01-12 10:18:49 +08:00
walon 4df417e56a [version] Release v8.8.0 2025-12-14 13:38:52 +08:00
walon 213d44bd12 [fix] fix deprecated warning of PlayerSettings.GetScriptingBackend(BuildTargetGroup) in Unity 6000 2025-12-14 13:18:57 +08:00
walon c138a58c4d [new] support 6000.3.x 2025-12-14 13:18:46 +08:00
walon fcef6dfe8e [version] Release v8.7.0 2025-11-03 10:00:35 +08:00
walon 478caea644 [change] remove unused import 2025-11-03 09:59:52 +08:00
walon 2534dea381 [remove] remove unused ABIUtils.cs 2025-10-28 10:26:34 +08:00
walon 391cd04cdf [fix] fix raising NullReferenceException in generating MethodBridge for MonoPInvokeCallbackAttribute while constructor arguments is empty. 2025-10-14 17:15:32 +08:00
walon 01754c8fb4 [version] Release v8.6.0 2025-09-27 17:15:06 +08:00
walon 1934d90f27 [remove] remove unused ReversePInvokeWrap.meta 2025-09-03 09:35:55 +08:00
walon 814572e1a1 [fix] fix the bug that BashUtil.CopyDir calls UnityEditor.FileUtil.CopyFileOrDirectory failed when parent directory of dst does not exist. 2025-08-26 21:17:03 +08:00
walon d505624c78 [version] Release v8.5.1 2025-08-25 19:23:54 +08:00
walon e36bbb9022 [fix] fixed PInvokeAnalyzer bug in computing PInvoke function calling conventions. 2025-08-25 19:23:29 +08:00
walon 0642726469 [version] Release v8.5.0 2025-08-20 12:45:19 +08:00
walon d86572db37 [change] change domain hybridclr.doc.code-philosophy.com to www.hybridclr.cn 2025-08-20 12:44:19 +08:00
xiewen b5944ea834 [change] BashUtil::CopyDir replaces CopyWithCheckLongFile with CopyUnityEditor.FileUtil.CopyFileOrDirectory 2025-08-20 12:44:17 +08:00
walon 73654e76d2 [version] Release v8.4.0 2025-07-26 10:24:27 +08:00
walon 1537690bb5 [change] add new LoadImageErrorCode items 2025-07-25 21:07:45 +08:00
walon 7f158f814a [fix] fix the issue that Texture Compression option in Build Settings was changed after running HybridCLR/Generate/All on Android platform 2025-07-04 17:17:44 +08:00
walon ee7af5c592 [version] Release v8.3.0 2025-07-03 20:59:20 +08:00
walon ab41cd0144 [fix] fix the bug that not collect struct in calli and extern method signature in generating MethodBridge. 2025-06-30 12:12:02 +08:00
walon 59a3c3974a [version] Release v8.2.0 2025-06-12 08:38:36 +08:00
walon c9ff293dfe [change] changed from throw exception to logError when not supported pinvoke or reverse pinvoke method parameter type was found 2025-06-06 16:57:53 +08:00
walon 56486b8a76 [change] change package category to Scripting 2025-06-01 18:00:09 +08:00
walon 8e27e8d41b [change] remove warning log when the result of resolving method is null in GenericMethod::ResolveMethod. 2025-05-29 17:04:10 +08:00
walon fca130bbfa [version] Release v8.1.0 2025-05-29 14:26:45 +08:00
walon c21dbcc60a [change] Remove redundant buildOptions |= BuildOptions.CleanBuildCache; code since it's already added in the GetBuildPlayerOptions function. 2025-05-29 14:22:50 +08:00
walon 7f2fa52f37 [change] change visibility of LinkXmlWriter to public. 2025-05-22 19:55:36 +08:00
walon da46e71534 [fix] fix bug of GenericArgumentContext that inflate ByRef and SZArray to Ptr. 2025-05-22 19:53:49 +08:00
walon 804418fddb [change] update supported unity versions in README 2025-05-09 19:17:35 +08:00
walon 7a0032934b [version] Release v8.0.0 2025-05-02 10:41:51 +08:00
walon b301b44cd3 [refactor] move ReversePInvokeWrap/Analyzer.cs to MethodBridge/MonoPInvokeCallbackAnalyzer.cs
[change] validate unsupported parameter type(.e.g string) in MonoPInvokeCallback signature when generate MethodBridge file
2025-04-30 16:20:03 +08:00
walon ddc3332958 [change] validate unsupported parameter type(.e.g string) in PInvoke signature when generate MethodBridge file 2025-04-30 16:11:41 +08:00
walon 52f25bdb2a [change] AssemblyResolver also resolves *.dll.bytes files besides *.dll. 2025-04-30 15:33:46 +08:00
walon 31be818bb6 [fix] fix error of computing CallingConvention in MethodBridge/Generator::BuildCalliMethods 2025-04-30 15:30:03 +08:00
walon 213a11ff25 [new] generate Managed2NativeFunction for PInvoke method 2025-04-30 15:05:40 +08:00
walon 585be97be9 [change] change type of the first argument methodPointer of Managed2NativeFunctionPointer from const void* to Il2CppMethodPointer 2025-04-30 12:40:21 +08:00
walon 361873803f [refactor] refactor code of settings. 2025-04-28 10:20:08 +08:00
walon 46f308ed5e [opt] optimization unnecessary initialization of typeArgsStack and methodArgsStack of GenericArgumentContext 2025-04-25 22:02:54 +08:00
walon 34406b1c13 [change] the shared type of ElementType.FnPtr is changed from IntPtr to UIntPtr 2025-04-25 21:59:15 +08:00
walon e5b52922f7 [version] Release v7.10.0 2025-04-22 12:05:15 +08:00
walon e44fa663db [fix] fix bug of CompileDll(BuildTarget target) that use EditorUserBuildSettings.activeBuildTarget instead of target to call CompileDll 2025-04-12 14:21:35 +08:00
walon 903cf9faa2 [change] add information of beginner QQ group 3 in README.md 2025-04-08 08:50:48 +08:00
L0veTomori 3fe41a8cba [opt] strip AOT assembly resources. (#54) 2025-04-03 10:48:40 +08:00
walon 603b0ccb24 [version] Release v7.9.0 2025-03-31 09:44:50 +08:00
walon 9429a4d24d [version] Release v7.8.1 2025-03-24 19:34:25 +08:00
walon ea592ba20c [version] Release v7.8.0 2025-03-23 23:18:11 +08:00
walon 8d1280a1bd [fix] fixed the bug where BashUtil.RemoveDir failed to run under certain circumstances on macOS systems. 2025-03-14 08:59:11 +08:00
walon 528240b52b [version] Release v7.7.0 2025-03-12 15:29:30 +08:00
walon 4768c039d2 [fix] fixed hook failed in version below MacOS 11 2025-03-07 13:29:47 +08:00
walon 10dc749d7a [change] CompileDllActiveBuildTarget and GenerateAll use EditorUserBuildSettings.development to compile hot update dll. 2025-03-05 16:14:08 +08:00
walon 0c5ef00c12 [remove] remove option HybridCLRSettings.enableStraceTraceInWebGLReleaseBuild 2025-03-05 15:59:37 +08:00
walon 1553582ec1 [remove] remove option HybridCLRSettings.enableProfilerInReleaseBuild 2025-03-05 15:58:11 +08:00
walon 756b906a21 [version] Release v7.6.0 2025-03-01 13:51:01 +08:00
walon 355e24fbe8 [fix] fixed the bug in the MethodBridge generator where it incorrectly handle [StructLayout] and blittable types when generating code for struct classes. 2025-03-01 10:39:05 +08:00
walon 9e4946aa45 [new] add AssemblySorter to sort assemblies by reference order 2025-02-08 16:53:11 +08:00
walon 8e571d594d [version] Release v7.5.0 2025-02-05 10:42:54 +08:00
walon b8dd2be1e4 [revert] Revert "[new] support preserve UnityEngine core types when GenerateLinkXml"
This reverts commit 82163d2e50.
2025-02-05 10:35:49 +08:00
walon de7b60695a [version] Release v7.4.1 2025-01-19 11:41:54 +08:00
walon a11ebecf93 [fix] fixe the bug that preserving UnityEngine.PerformanceReportingModule when generating link.xml would cause the Android app built with Unity 2019 to crash on startup. 2025-01-18 22:55:37 +08:00
walon 019412fa81 [version] Release v7.4.0 2025-01-17 21:40:09 +08:00
walon 84bf6d59db [change] removed unnecessary field initialization in the HybridCLRSettings class. 2025-01-08 16:28:12 +08:00
walon 82163d2e50 [new] support preserve UnityEngine core types when GenerateLinkXml 2025-01-08 16:20:39 +08:00
walon 208372e6af [new] add MethodBridge.cpp.tpl. MethodBridgeGeneratorCommand doesn't generate and override from same file 2025-01-08 15:26:48 +08:00
walon dd8d812641 [change] add UnityVersion.h.tpl and AssemblyManifest.cpp.tpl, Il2CppDefGenerator doesn't generates and override code file from same one 2025-01-08 15:21:43 +08:00
walon c19b34542e [fix] fixed the bug where StripAOTDllCommand did not set BuildPlayerOptions.subtarget in Unity 2021+ versions, causing failure when publishing dedicated buildTarget. 2025-01-08 15:00:54 +08:00
walon e30306d7e1 [fix] fixed the bug in AOTAssemblyMetadataStripper::Strip where ModuleWriterOptions MetadataFlags.PreserveRids was not used. 2025-01-07 16:19:11 +08:00
walon 20f34c9b14 [fix] fix bug of computing CallingConvention of calli 2025-01-03 12:23:04 +08:00
walon 45749ffb5c [new] add Managed2NativeFunctionPointer MethodBridge functions 2025-01-02 22:22:59 +08:00
walon b176d63d93 [version] Release v7.3.0 2024-12-31 12:49:10 +08:00
walon 0c99afd58e [fix] fix the bug where MissingMetadataChecker can't detect references to newly added AOT assemblies. 2024-12-18 18:21:37 +08:00
walon 2458c9a9ba [fix] fix the issue in Unity 6000 where the modification of the trimmed AOT DLL output directory for the visionOS build target caused CopyStrippedAOTAssemblies::GetStripAssembliesDir2021 to fail in copying AOT DLLs. 2024-12-16 19:22:56 +08:00
walon 4d0fef095b [version] Release v7.2.0 2024-12-09 09:36:12 +08:00
walon 642d2cd644 [version] Release v7.1.0 2024-12-04 18:15:52 +08:00
walon e54ce36b0e [fix] fix the bug that CopyStrippedAOTAssemblies didn't work on UWP platform of 6000.0.x 2024-12-01 12:53:38 +08:00
walon ac8b649d50 [fix] fix the issue that CopyStrippedAOTAssemblies didn't support HMIAndroid in tuanjie engine 2024-11-25 12:46:13 +08:00
walon 9ca9cd5aa7 [new] support prejit interpreter class and method 2024-11-20 14:05:34 +08:00
walon 37dafd7b3c [change] change the attributes on fields of HybridCLRSettings from [Header] to [ToolTip] 2024-11-20 11:27:02 +08:00
walon f58d12c2cb [change] refactor code comments and translate them to English 2024-11-20 11:25:31 +08:00
walon d5eaa350c5 [change] add RuntimeOptionId::MaxInlineableMethodBodySize 2024-11-20 09:15:28 +08:00
walon 1f0053a3c9 [version] Release v7.0.0 2024-11-15 20:59:11 +08:00
walon 15dccc7427 [change] add RuntimeOptionId::MaxMethodBodyCacheSize and RuntimeOptionId::MaxMethodInlineDepth 2024-11-15 20:51:10 +08:00
walon 7d287a2293 [fix] fix the bug in MissingMetadataChecker where it did not check for missing fields. 2024-11-06 12:09:06 +08:00
walon f19ba3eb30 [fix] fix the bug in GenericReferenceWriter where _systemTypePattern did not properly escape the '.' in type names. This caused issues when compiler-generated anonymous types and functions contained string sequences like 'System-Int', incorrectly matching them to 'System.Int', resulting in runtime exceptions. 2024-11-05 18:19:13 +08:00
walon 4e172129d8 [version] Release v6.11.0 2024-10-31 09:44:33 +08:00
walon 2414e77fef [version] Release v6.10.1 2024-10-24 15:44:37 +08:00
walon 77517a9814 [fix] Fixs HookUtils compile errors in Unity 2019 and 2020 2024-10-24 15:43:35 +08:00
walon 162f21f6a5 [change] remove README_zh.md.meta, add README_EN.md.meta 2024-10-23 20:48:15 +08:00
walon bd7c3293bc [version] Release v6.10.0 2024-10-23 12:05:33 +08:00
walon e25be945c7 [change] update README.md 2024-10-23 12:02:02 +08:00
walon 925921c27c [fix] 修复MonoHook判定processorType时没有正确处理某些CPU上processorType为全大写的情况(如有些机器上返回INTEL而不是Intel) 2024-09-30 12:13:37 +08:00
walon 64a6d26fa3 [version] 发布v6.9.0版本 2024-09-27 19:37:24 +08:00
walon c24617d864 [version] 发布v6.8.0版本 2024-09-14 12:10:06 +08:00
walon 59bc259cc8 [version] 发布v6.7.1版本 2024-08-26 12:29:07 +08:00
walon c413cd6143 [version] 发布v6.7.0版本 2024-08-25 14:28:35 +08:00
walon c614cdcf4e [fix] 修复PatchScriptingAssembliesJsonHook中的断言在从WebGL平台切换到其他平台时断言失败的问题 2024-08-22 22:19:14 +08:00
walon 08f493ab3e [new] HybridCLRSettings新增enableProfilerInReleaseBuild和enableStraceTraceInWebGLReleaseBuild两个选项 2024-08-22 21:57:40 +08:00
walon 3705ca6e1f [version] 发布v6.6.0版本 2024-08-10 20:47:35 +08:00
walon 34df279943 [version] 发布v6.5.0版本 2024-08-02 15:14:05 +08:00
walon b85ed1aa92 [change] 新增LoadImageErrorCode::PDB_BAD_FILE错误码 2024-08-02 14:31:31 +08:00
walon faf4a328af [fix] 修复RELEASELOG未包含6.3和6.4版本标题的问题 2024-07-31 10:20:03 +08:00
walon 53f4f33bf0 [version] 发布v6.4.0版本 2024-07-25 10:10:16 +08:00
walon 48c91f497b [fix] 修复MethodBridge/Generator GetOrCalculateTypeInfoSignature计算等价类时未考虑到ClassLayout、Layout和FieldOffset因素的bug 2024-07-18 14:12:23 +08:00
walon 9afbe3bd84 [fix] 修复Library/PlayerDataCache目录不存在时,PatchScriptingAssembliesJsonHook运行异常的bug 2024-07-18 13:37:20 +08:00
walon 2d5f71f6b7 [version] 发布v6.3.0版本 2024-07-15 10:26:26 +08:00
walon 5747458bf2 [fix] 修复微信小游戏平台当TextureCompression非默认值时临时目录名为WinxinMiniGame{xxx},导致没有成功修改scriptingassemblies.json文件的bug 2024-07-12 17:54:59 +08:00
walon 0b455eb882 [fix] 修复 Unity 2022导出的xcode工程包含多个ShellScript片段时错误地删除了非重复片断的bug 2024-07-12 09:47:57 +08:00
walon e086228d90 [fix] 修复团结引擎微信小游戏平台由于同时定义了UNITY_WEIXINMINIGAME和UNITY_WEBGL宏,导致从错误路径查找scriptingassemblies.json文件失败,运行时出现脚本missing的bug 2024-07-02 17:00:05 +08:00
walon 909e96ca7c [version] 发布v6.2.0版本 2024-06-30 19:40:27 +08:00
walon 75b24345f6 [change] 更新README 2024-06-17 10:57:07 +08:00
walon 88e20505f8 [version] 发布v6.1.0版本 2024-06-15 01:23:09 +08:00
walon b4b486944c [fix] 修复Generate/LinkXml生成的link.xml中对UnityEngine.Debug preserve all导致在Unity 2023及更高版本的iOS、visionOS等平台上出现Undefined symbols for architecture arm64: "CheckApplicationIntegrity(IntegrityCheckLevel)" 编译错误的问题。此bug由Unity引起,但通过在生成link.xml时忽略UnityEngine.Debug类来临时解决这个问题 2024-06-13 22:04:35 +08:00
walon 360ba38805 [change] 升级dnlib版本,修复ModuleMD保存dll时将未加Assembly限定的mscorlib程序集中类型的程序集设置为当前程序集的严重bug 2024-06-13 19:44:23 +08:00
walon e5a6952777 [version] 发布v6.0.0版本 2024-06-11 00:24:54 +08:00
walon 9330cf682c [fix] 修复在Unity 2023及6000版本在iOS平台的构建bug 2024-06-11 00:24:48 +08:00
walon 16a7d5d529 [remove] 删除无用的 ReversePInvokeWrapperGeneratorCommand代码文件 2024-06-10 13:19:06 +08:00
walon 303c6c7b35 [fix] 修复计算Native2Manager桥接函数未考虑到MonoPInvokeCallback函数,导致从lua或者其他语言调用c#热更新函数有时候会出现UnsupportedNative2ManagedMethod的bug 2024-06-10 13:18:46 +08:00
walon e4cf9e9086 [fix] 修复在某些不支持visionOS的Unity版本上CopyStrippedAOTAssemblies类有编译错误的bug 2024-06-10 12:44:52 +08:00
walon b977a85b23 [opt] 优化 PatchScriptingAssembliesJsonHook.cs在WebGL和WeixinMiniGame平台的宏开关 2024-05-30 19:22:52 +08:00
walon 0fcb51a369 [fix] PatchScriptingAssemblyList.cs在Unity 2023+版本webgl平台的编译错误 2024-05-30 19:21:58 +08:00
walon d61511924d [fix] 修复tuanjie引擎及Unity2023.2.x不支持visionOS引发的编译错误 2024-05-30 19:15:23 +08:00
walon aca7dd0a67 [new] 新增GeneratedAOTGenericReferenceExcludeExistsAOTClassAndMethods,计算热更新引用的AOT泛型类型和函数时排除掉AOT中已经存在的泛型和函数,最终生成更精准的补充元数据程序集列表 2024-05-30 13:08:24 +08:00
walon fc685a99ca [fix] 修复计算 MonoPInvokeCallback的CallingConvention时,如果delegate在其他程序集中定义,会被错误当作Winapi,导致wrapper签名计算错误的bug 2024-05-30 13:08:24 +08:00
walon d431aeb019 [new] 支持MonoPInvokeCallback函数的参数或返回类型为struct类型
[fix] 修复ReversePInvokeWrapper函数定义未包含调用约定的bug
[refactor] 合并ReversePInvokeMethodStub到MethodBridge,同时将MetadataModule中ReversePInvoke相关代码移到InterpreterModule
2024-05-30 13:08:21 +08:00
walon 63d0aaa6e6 [opt] Generate/All在生成之前检查是否已经安装HybridCLR 2024-05-30 13:07:23 +08:00
walon d45974c6b4 [new] 支持Unity 2023 2024-05-30 13:07:23 +08:00
walon 3de931a3af [opt] 打包时检查生成桥接函数时的development选项与当前development选项一致。Generate/All之后切换development选项再打包,将会产生严重的崩溃 2024-05-30 13:07:23 +08:00
walon b96d6fc10d [new] 支持Unity 6 2024-05-30 13:07:23 +08:00
walon ef1b78caae [version] 发布v5.4.1版本 2024-05-30 12:49:11 +08:00
walon 47622bf49c [new] 支持visionOS平台
[fix] 修复tvOS平台使用了错误的Unity-iPhone.xcodeproj路径导致找不到project.pbxproj的bug
2024-05-30 12:45:21 +08:00
walon 846d7103a3 [fix] 修复计算 MonoPInvokeCallback的CallingConvention时,如果delegate在其他程序集中定义,会被错误当作Winapi,导致wrapper签名计算错误的bug 2024-05-30 12:26:48 +08:00
walon 170f13082e [version] 发布v5.4.0版本 2024-05-17 21:43:21 +08:00
walon 60016d7481 [fix] 修复当dll中存在指向本程序集内的TypeRef时,dnlib的TypeDef.DefinitionAssembly返回null导致 Link/Analyzer.cs运行抛出异常的bug 2024-05-17 21:43:15 +08:00
walon 97dae7fed2 [fix] 修复当Append xcode项目到现存的xcode项目时,第1次会导致'Run Script'命令被重复追加,从第2次起将会找不到--external-lib-il2-cpp而打印错误日志的bug 2024-05-14 22:38:38 +08:00
walon f935127cd3 [new] ReversePInvoke支持CallingConvention 2024-05-14 12:48:15 +08:00
walon ec5f2ef05e [fix] 修复计算struct等价性时,将struct平铺展开计算等价,在某些平台并不适用的bug。例如 struct A { uint8_t x; A2 y; } struct A2 { uint8_t x; int32_t y;}; 跟 struct B {uint8_t x; uint8_t y; int32_t z;} 在x86_64 abi下并不等价 2024-05-14 12:48:15 +08:00
Rorschach 6d0ceaa4f5 [fix] 修正HybridCLRSettingProvider.cs中文档链接 (#46) 2024-05-14 12:47:09 +08:00
walon 95922aec1e [version] 发布v5.3.0版本 2024-04-22 10:17:59 +08:00
walon 3259c11828 [fix] 修复导出tvOS工程时未修改xcode工程设置,导致打包失败的bug 2024-04-21 13:45:47 +08:00
walon 74bab1d935 [fix] 修复tvOS目标时,未复制裁剪AOT dll,导致生成桥接函数失败的bug 2024-04-21 13:44:54 +08:00
walon fd81edb495 [fix] 解决StripAOTDllCommand生成的临时项目的locationPathName不规范导致与某些插件如Embeded Browser不兼容的问题 2024-04-12 00:35:09 +08:00
walon 12bafb897f [fix] 修复团结引擎1.1.0起删除TUANJIE_2022宏导致没有复制裁剪后的AOT程序集的bug 2024-04-10 10:32:23 +08:00
walon a6befb1312 [fix] 修复开启development build选项时出现mono相关头文件找不到的bug 2024-04-10 10:31:30 +08:00
walon a36e3fe72d [fix] 修复__ReversePInvokeMethod_XXX函数未设置Il2CppThreadContext,导致从native线程回调时获取Thread变量崩溃的bug 2024-04-10 10:31:30 +08:00
walon d9776d1793 [new] UnityVersion.h中新增 HYBRIDCLR_TUANJIE_VERSION 宏 2024-04-08 21:55:13 +08:00
walon 2697eb5a90 [version] 发布v5.2.1版本 2024-04-05 14:17:35 +08:00
walon 4879bb7f44 [opt] LoadModule中设置 mod.EnableTypeDefFindCache = true,数倍提升了计算桥接函数的性能 2024-04-03 11:09:04 +08:00
walon 24f85780a2 [fix] 修复团结引擎导出iOS平台xcode工程文件名改名为Tuanjie-iPhone.xcodeproj导致构建xcode工程失败的bug 2024-03-26 21:06:37 +08:00
walon 6c679cc3ab [version] 发布v5.2.0版本 2024-03-25 10:12:17 +08:00
walon 20a06f1ec5 [fix] 修复GenericArgumentContext不支持ElementType.FnPtr的bug 2024-02-29 20:37:57 +08:00
walon 5446bd937c [new] Installer支持团结引擎 2024-02-28 14:20:39 +08:00
walon ae88dd0eec Revert "[change] Il2CppDefGenerator对于团结引擎额外生成一个UNITY_ENGINE_TUANJIE宏定义"
This reverts commit c6caba5662bc1f35bd0590963fd01286672a8185.
2024-02-27 16:04:15 +08:00
walon a5c006d67c [change] 为RuntimeApi添加[Preserve]特性,避免被裁剪 2024-02-26 14:17:45 +08:00
walon 67c487f521 [version] 发布v5.1.0版本 2024-02-26 10:46:11 +08:00
walon 6ffb977ef3 [version] 发布v5.0.0版本。恢复对Unity 2019的支持,并且支持2019版本在iOS平台以源码形式构建 2024-01-26 11:57:34 +08:00
walon f59ba2623a [fix] 修复2019 build iOS出现 zutil.c编译错误的bug 2024-01-25 23:05:28 +08:00
walon 4b57138935 [new] 新增 MissingMetadataChecker检查裁剪类型或者函数丢失的问题 2024-01-23 20:24:12 +08:00
walon 276cd0a4a8 [change] AssemblyCacheBase新增TryLoadModule接口
[change] AssemblyCacheBase加载Module时先File.ReadAllBytes读取dll内容,避免Dispose问题
2024-01-23 20:24:12 +08:00
walon 22a9793b9d [new] 支持2019下以源码方式打包iOS 2024-01-15 13:24:19 +08:00
walon 1b7947b196 [fix] 修复2019 Mac Standalone 没有正确 PatchScriptingAssemblyList的bug 2024-01-15 13:24:19 +08:00
walon 188fdc9430 [fix] 修复2019 Mac Standalone 没有正确 PatchScriptingAssemblyList的bug 2024-01-15 13:24:19 +08:00
walon ff0f225423 还原 2019 2024-01-15 13:24:03 +08:00
walon 36ca398543 [opt] AOTAssemblyMetadataStripper保存时保持table~的id稳定 2024-01-15 09:42:35 +08:00
walon f30e2f5b33 [new] 新增 AOTAssemblyMetadataStripper用于剔除AOT dll中非泛型函数元数据 2024-01-12 21:40:45 +08:00
walon a531a213c2 [opt] 优化 AOTReference计算,如果泛型的所有泛型参数都是class约束,则不加入到需要补充元数据的集合 2024-01-12 21:36:04 +08:00
walon 2b42376505 [new] 新增对团结引擎 HMIAndroid、OpenHarmony、WeixinMiniGame平台的支持 2024-01-04 11:48:30 +08:00
walon ef103d8351 [new] 支持团结引擎WeixinMiniGame和OpenHarmony BuildTarget下复制裁剪后的AOT dll 2024-01-03 17:30:28 +08:00
walon db87b92f78 [change] Il2CppDefGenerator对于团结引擎额外生成一个UNITY_ENGINE_TUANJIE宏定义 2024-01-02 13:06:29 +08:00
walon 51da1d4c43 [version] 发布v4.0.15版本 2024-01-02 11:35:32 +08:00
walon 71ad34d7ac [fix] 修复Additional Compiler Arguments中输入 -nullable:enable 之后,Editor抛出InvalidCastException的bug。来自报告 https://github.com/focus-creative-games/hybridclr/issues/116 2023-12-22 21:51:41 +08:00
walon 7c29ab804b [refactor] RuntimeApi中设置hybridclr参数的功能统一通过GetRuntimeOption和SetRuntimeOption函数 2023-12-22 12:24:09 +08:00
walon 9b269ea4c2 [opt] 优化桥接函数生成,将同构的struct映射到同一个结构,减少了30-35%的桥接函数数量 2023-12-16 15:17:30 +08:00
Alan Liu c9ad6880cb 修复报错:BuildFailedException: Build path contains a project previously built without the "Create Visual Studio Solution" 2023-12-15 11:05:51 +08:00
walon 372fa9e06e [change] 调整Installer窗口的显示内容 2023-12-15 11:05:04 +08:00
walon 3df95d138d [change] StripAOTDllCommand导出时不再设置BuildScriptsOnly选项 2023-12-14 12:00:28 +08:00
walon 410bb9b542 [version] 发布v4.0.14版本 2023-12-08 12:24:04 +08:00
walon 15155b9a46 [change] InstallerController::WriteLocalVersion写入后打印日志 2023-11-28 21:02:17 +08:00
walon f810ede6d7 [version] 发布v4.0.13版本 2023-11-26 22:32:48 +08:00
walon 63d9e7f4c3 [fix] 修复当出现非常规字段名时生成的桥接函数代码文件有编译错误的bug 2023-11-24 10:00:57 +08:00
walon 3cea936aa4 [refactor] 重构 AssemblyCache和 AssemblyReferenceDeepCollector,消除冗余代码
[fix] 修复裁剪aot dll中出现netstandard时,生成桥接函数异常的bug
2023-11-23 13:48:06 +08:00
walon d90faed922 [change] 删除不必要的Datas~/Templates目录,直接以原始文件为模板 2023-11-10 13:35:53 +08:00
walon febff1c658 [version] 发布v4.0.12版本 2023-11-02 10:51:58 +08:00
walon 94a329a522 [fix] 修复BashUtil.RemoveDir的bug 2023-11-02 10:47:55 +08:00
walon 84ed2e6b9d [version] 发布v4.0.11版本 2023-11-01 22:37:15 +08:00
walon 47fbd443c1 [fix] 修复桥接函数计算时未归结函数参数类型,导致出现多个同名签名的bug 2023-11-01 20:34:24 +08:00
walon d5b52cc8db [fix] 修复BashUtil.RemoveDir在偶然情况下出现删除目录失败的问题。新增多次重试。 2023-11-01 20:34:24 +08:00
walon d9ed27abfb [new] Generate支持 netstandard 2023-11-01 20:33:42 +08:00
walon f51c2803c1 [fix] 修复 ReversePInvokeWrap生成不必要地解析referenced dll,导致如果有aot dll引用了netstandard会出现解析错误的bug 2023-10-30 11:19:53 +08:00
walon 05a34d4d12 [new] 检查当前安装的libil2cpp版本是否与package版本匹配,避免升级package后未重新install的问题 2023-10-15 12:44:22 +08:00
walon 216d09f7b6 [version] 发布v4.0.10版本 2023-10-12 13:58:55 +08:00
walon 8d441a02d2 [version] 发布v4.0.9版本 2023-10-11 19:18:50 +08:00
walon de2bc21f20 [fix] 修复Unity 2022上AddLil2cppSourceCodeToXcodeproj2022OrNewer的编译错误 2023-10-11 19:10:20 +08:00
walon 4aba5c2a5e [version] 发布v4.0.8版本 2023-10-10 17:36:17 +08:00
walon b573e61504 [refactor] RuntimeApi相关函数由PInvoke改为InternalCall 2023-10-09 22:24:35 +08:00
walon 69de3d733d [refactor] 调整HybridCLR.Editor模块一些不规范的命名空间 2023-10-09 15:39:32 +08:00
walon a77ed7369a [version] 发布v4.0.7版本 2023-10-08 23:06:36 +08:00
walon 1bd27a3e22 [fix] 修复生成桥接函数时,如果热更新程序集未包含任何代码直接引用了某个aot程序集,则没有为该aot程序集生成桥接函数,导致出现NotSupportNative2Managed异常的bug 2023-10-08 13:27:23 +08:00
walon 4da7c1a524 [change] 打包时清空裁减aot dll目录 2023-10-07 21:59:48 +08:00
Rorschach 5c750e9c02 [fix] PS5构建Package包时,在IUnityLinkerProcessor.GenerateAdditionalLinkXmlFile处理 ScriptingAssemblies.json (#36) 2023-09-28 20:18:22 +08:00
firleaves cc09487671 [fix] 修复mac下面路径过长导致拷贝文件失败 (#37) 2023-09-28 19:37:46 +08:00
walon b024a18ba1 [version] 发布v4.0.6版本 2023-09-26 16:25:13 +08:00
walon 4587cb7c19 [version] 发布v4.0.5版本 2023-09-25 09:59:54 +08:00
walon beec0b73e6 [fix] 修复MetaUtil.ToShareTypeSig将Ptr和ByRef计算成IntPtr的bug,正确应该是UIntPtr 2023-09-23 21:19:45 +08:00
walon 61fb0cfe34 [change] 对于小版本不兼容的Unity版本,不再禁止安装,而是提示警告 2023-09-17 23:30:09 +08:00
yanbing.zhou 260909bd4b [fix] 修改StandaloneLinux平台dll路径 (#35) 2023-09-17 20:58:18 +08:00
walon 06a250b9fa [version] 发布v4.0.4版本。正式支持所有平台 2023-09-10 13:37:36 +08:00
walon dc884d36b8 [change] 支持获得UWP、PS5等平台的裁剪后aot dll 2023-09-10 13:37:12 +08:00
walon 1168d51e93 [change] 更新README和LICENSE 2023-09-10 13:22:53 +08:00
walon 7270e9194d [change] 调整RuntimeApi.cs中dllName的实现 2023-09-10 13:22:53 +08:00
walon 1d50dfcb6e [fix] StripAOTDllCommand生成AOT dll时的BuildOption采用当前Player的设置,避免当打包开启development时, StripAOTDllCommand生成Release aot dll,而打包生成debug aot dll,产生补充元数据及桥接函数生成不匹配的严重错误 2023-09-10 13:22:33 +08:00
walon 1eaaf44c97 [fix] 修复不正确地从EditorUserBuildSettings.selectedBuildTargetGroup获得BuildGroupTarget的bug 2023-09-10 13:21:56 +08:00
walon 9cf8f19517 [fix] 修复Unity 2020的il2cpp在不同目录存在同名ThreadPool文件,导致偶发生成的同一个lump文件中包含这两个文件时,出现编译错误的问题。解决方式为给每个目录生成一个lump文件 2023-09-10 13:21:28 +08:00
walon 22760c6c7c [remove] 移除无用的LZ4.dll 2023-09-03 19:08:46 +08:00
walon 47e43b0afa [change] 小幅重构生成Native2Managed及AdjustorThunk的代码,消除重复代码 2023-08-31 19:22:07 +08:00
walon 58c7073073 [version] 发布v4.0.3版本 2023-08-31 11:20:07 +08:00
walon 9dafabd1ee [fix] 修复桥接函数签名计算的bug 2023-08-31 11:06:06 +08:00
walon 5857696b56 [change] 日志和异常文本换成英文,方便海外开发者 2023-08-30 11:07:12 +08:00
walon f2807f4838 [version] 发布v4.0.2版本 2023-08-29 20:22:51 +08:00
walon f46c180181 [version] 发布v4.0.1版本 2023-08-28 11:19:51 +08:00
walon 1e14a5f30f [version] 发布v4.0.0版本 2023-08-27 23:08:19 +08:00
walon dfa11d11c3 [change] object及指针类型的签名由i改为u 2023-08-24 19:36:00 +08:00
walon 69d3303f3d [opt] 大幅优化Native2Managed方向桥接函数传参性能 2023-08-24 19:26:50 +08:00
walon 9eb6dda71b [refactor] 重构桥接函数,彻底解决跨平台问题 2023-08-24 12:58:09 +08:00
walon 10e0568251 [change] 关闭检查增量式GC选项 2023-08-21 11:34:19 +08:00
walon 1f9faf49a3 [version] 发布v3.4.2版本 2023-08-13 13:07:49 +08:00
walon 3f1b34682d [fix] 修复计算 AOTGenericReferences时未考虑到泛型中调用泛型的问题,导致间接调用的泛型未被统计在内的bug 2023-08-13 13:07:37 +08:00
walon c3f6325e4a [version] 发布v3.4.1版本 2023-07-31 11:06:02 +08:00
walon a9f5608ecf [change] 检查Settings中热更新程序集列表配置中程序集名不能为空
[fix] 修复当某个热更新程序集正好是另一个AOT程序集后缀时,由于只对比字符串尾部,意外将该AOT程序集也过滤的bug
2023-07-21 18:05:12 +08:00
walon 8a95fd57f5 [version] 发布v3.4.0版本 2023-07-17 12:33:23 +08:00
walon 679c21da43 [fix] 修复计算桥接函数未考虑到泛型类的成员函数中可能包含Native2Manager调用 2023-07-12 23:09:58 +08:00
walon 52bab856ed [change] README中新增RELEASELOG的链接 2023-07-11 15:15:18 +08:00
walon 844b2fb62f [change] 从hybridclr仓库同步 README 2023-07-11 15:01:20 +08:00
walon 88404cbbfc [refactor] 重构Installer 2023-07-11 12:27:11 +08:00
walon 9b4aa904ef [new] 整理 RELEASELOG.md 较旧的版本记录 2023-07-09 13:59:46 +08:00
walon a71153d414 [change] 修正RuntimeApi.cs文件某些代码的缩进问题 2023-07-07 21:38:38 +08:00
walon bec8c84c56 [fix] 修复Win下生成的Lump文件中include路径以\为目录分隔符导致同步到Mac后找不到路径的bug 2023-07-07 21:37:18 +08:00
walon 79bab0459c [change] link.xml及AOTGenericReferences.cs默认输出路径改为HybridCLRGenerate,避免与顶层HybridCLRData混淆 2023-07-04 12:25:35 +08:00
walon 1d09f72460 [change] RuntimeApi::GetInterpreterThreadFrameStackSize 之类的函数在Editor下为空非extern函数,避免Editor下调用时出错 2023-07-03 22:54:33 +08:00
walon 058270c658 [version] 发布v3.3.0版本 2023-07-03 10:48:16 +08:00
walon 210c781fad [change] 禁用hybridclr后打包ios时不再修改导出的xcode工程 2023-07-02 21:50:52 +08:00
walon 6757f6df5b [fix] 修复2020-2021编译libil2cpp.a未包含brotli相关代码文件导致出现编译错误的bug 2023-06-30 20:15:03 +08:00
walon 41c73fe35b [fix] 修复使用不兼容版本打开Installer时出现异常的bug 2023-06-30 12:20:56 +08:00
walon 4d487fa4c4 [fix] 修复Installer中将hybridclr拼成bybridclr的错误 2023-06-28 11:46:04 +08:00
walon 2f71bb515d [change] 调整CompileDll ScriptCompilationSettings设置相关代码 2023-06-27 08:58:08 +08:00
walon 0d8b001dd2 [fix] 解决ReversePInvokeWrap生成不稳定的问题 2023-06-27 08:57:14 +08:00
walon 3d68dc4db3 [fix] 解决MethodBridge生成不稳定的问题 2023-06-27 08:57:02 +08:00
walon 2988aef85a [change] 优化LinkXml生成 2023-06-27 08:18:11 +08:00
walon 768512bcfa [change] 解决AOTGenericReference生成不稳定的问题 2023-06-27 08:13:16 +08:00
walon 4492449b73 [fix] 修复从导出xcode项目包含绝对路径导致传送到其他机器上编译时找不到路径的bug 2023-06-23 16:19:58 +08:00
walon be113567ba [version] 发布v3.2.1版本 2023-06-21 11:08:13 +08:00
walon e45a789569 [change] 为Anaylizer加上using 限定,解决某些情况下与项目的类型同名而产生编译冲突的问题 2023-06-21 11:07:00 +08:00
walon 0a82b0d339 [new] Installer界面新增显示package版本 2023-06-16 18:20:18 +08:00
walon c8cd323bb0 [fix] 修复重构文档站后的帮助文档的链接错误 2023-06-15 17:06:55 +08:00
walon 2f09f88ca2 [new] CompileDll新增MacOS、Linux、WebGL目标 2023-06-15 17:05:46 +08:00
walon 8e178c0e37 [version] 发布v3.2.0版本 2023-06-15 12:00:05 +08:00
walon 40711cbf38 [new] iOS打包时直接将源码包含到工程,不再需要单独编译libil2cpp.a
[remove] 移除无用的iOSBuild目录
2023-06-15 09:57:15 +08:00
walon 7749b6448e [change] 当用不兼容版本打开Installer时不再抛出异常,而是显示“与当前版本不兼容” 2023-06-12 13:30:32 +08:00
walon 1459992ec4 [version] 发布v3.1.1版本 2023-06-12 10:34:00 +08:00
walon c09dad4ae1 [remove] CheckSettings中不再自动设置Api Compatible Level 2023-06-08 13:24:00 +08:00
walon 271dc70626 [opt] 生成AOTGenericReferences时,补充元数据assembly列表由注释改成List<string>列表,方便在代码中直接使用。 2023-06-07 12:17:10 +08:00
walon c462aeb2ef [fix] 修复计算桥接函数时未考虑到补充元数据泛型实例化会导致访问到一些非公开的函数的情况,导致少生成一些必要的桥接函数 2023-06-07 11:47:17 +08:00
walon adbdbf3a00 [remove] 删除无用的复制Unity 2019 Unity.IL2CPP.dll 的代码 2023-06-06 15:51:18 +08:00
walon 10684d29cd [fix] CompileDll后主动关闭进度条,临时解决Unity 2022版本Editor的bug 2023-06-06 11:28:27 +08:00
walon 7d58454fdd [version] 发布v3.1.0版本 2023-06-03 19:51:05 +08:00
walon 21b85aa2d3 [fix] 修复WebGL平台ABI的bug 2023-06-03 19:44:50 +08:00
walon 8439e4176d [new] 新增对Unity 2020的支持 2023-06-03 19:42:56 +08:00
walon 4b43870ff2 [version] 发布v3.0.3版本 2023-06-02 15:49:08 +08:00
walon b49b94521e [version] 发布v3.0.2版本 2023-06-01 11:52:49 +08:00
walon 49873ba6ed [new] 新增菜单命令HybridCLR/CompileDll/ActiveBuildTarget_Development,用于编译出DevelopmentBuild模式的热更新dll 2023-06-01 11:43:41 +08:00
walon 97f083f07d [revert] Revert "[new] HybridCLRSettings新增AOT dll快照目录,由于保存打包时生成的AOT dlls"
This reverts commit 8d0634620a.
2023-06-01 11:15:40 +08:00
walon 941bbc723a [version] 发布3.0.1版本,正式支持2022.3.0 2023-06-01 00:40:46 +08:00
walon 18def7886d [version] 发布v3.0.0版本 2023-05-21 11:43:16 +08:00
walon f1336c56d4 [change] 移除一些无用代码 2023-05-21 10:00:44 +08:00
walon 8f89651d10 [merge][version] 合并3.0分支改动,正式进入3.0.0版本。 2023-05-21 09:50:38 +08:00
walon 8d0634620a [new] HybridCLRSettings新增AOT dll快照目录,由于保存打包时生成的AOT dlls 2023-05-20 10:59:34 +08:00
walon f5afc43625 [version] 发布2.4.2版本 2023-05-19 12:31:09 +08:00
walon f8eee2ba49 [change] 更新package信息 2023-05-13 09:38:10 +08:00
walon 07b52bed05 [version] 发布2.4.1 2023-05-12 22:54:25 +08:00
walon 3139fbefa6 [new] 补充遗漏的 RELEASELOG.md.meta 文件 2023-05-10 11:34:31 +08:00
walon fbeeb3d959 发布v2.4.0版本 2023-05-09 18:46:08 +08:00
walon 1f4e754adb [fix] 修复当struct只包含一个float或double字段时,在arm64上计算桥接函数签名错误的bug 2023-05-06 18:57:47 +08:00
walon f63bbc8a52 [opt] CheckSettings中检查ScriptingBackend及ApiCompatibleLevel,切换为正确的值 2023-05-06 12:28:03 +08:00
walon b17751b8a8 [new] 新增 MsvcStdextWorkaround.cs 解决2020 vs下stdext编译错误的问题 2023-05-04 16:23:07 +08:00
walon 05e721cf02 [fix] BuildOptions.CleanBuildCache从UNITY_2021_2_OR_NEWER开始才有,而不是UNITY_2021_1_OR_NEWER 2023-05-03 17:17:40 +08:00
walon 29646f1294 [change] 替换package.json中focus-creative-games为code-philosophy 2023-05-03 15:50:20 +08:00
walon 3702411ac8 [fix] 修复本地复制libil2cpp却仍然从仓库下载安装的bug 2023-05-03 12:22:16 +08:00
walon d205f00a1b [version] 2.3.0版本 2023-04-30 12:03:28 +08:00
walon 2894701063 [fix] 修复2019版本MonoBleedingEdge的子目录中包含了过长路径的文件导致Installer复制文件出错的问题
[change] StripAOTDllCommand失败时抛出异常而不是打印错误日志
2023-04-30 01:35:25 +08:00
walon 1045538b40 [refactor] 调整Installer接口 2023-04-29 12:41:47 +08:00
walon 8fd9b2ec82 [new] Installer支持从本地目录复制改造后的libil2cpp目录 2023-04-29 12:11:16 +08:00
walon 0ccdd424ab [version] 2.2.0版本,支持 2020.3.47及2021.3.23 2023-04-26 11:09:52 +08:00
walon c083e4ada4 [opt] 优化Resolve Assembly失败时的错误信息 2023-04-23 12:20:56 +08:00
walon 4c6dd1249a [fix] 修复WebGL一些桥接函数ABI计算的bug 2023-04-22 14:05:50 +08:00
walon b8b990bfc1 [fix] 为PatchScriptingAssembliesJsonHook的proxy函数添加无用代码以满足最小代码长度要求 2023-03-31 00:22:48 +08:00
walon 252e6add67 [remove] 删除无用的测试代码文件 BuildPipeline_StripDll_HookTest.cs 2023-03-31 00:21:52 +08:00
walon 6e76b96f97 [version] 升级到2.1.0 2023-03-28 22:35:44 +08:00
walon dd18ecdba5 [version] 升级到2.0.11版本 2023-03-28 16:03:37 +08:00
walon 2ff3e276d2 [revert] 回滚版本"6909c32a0c8fcf11d4b573af890a0232c1525afe [new] 支持 2021 WebGL资源上挂载脚本" 引入的MonoHook的bug 2023-03-28 13:25:53 +08:00
Jonson 1d5f2a953c [fix] 修复MonoHook在2020.3.x系列编辑器compile的时候,有可能发生hook没有及时注入从而导致打iOS包失败
[fix]  较高版本的Unity GetFunctionPointer不再依赖GUISkin.current,反而高版本unity的GUISkin.current这个值不会立即有值,导致在编辑器compile等时候,hook没有及时注入从而导致打iOS包失败

---------

Co-authored-by: liaoqiang <liaoqiang@nibirutech.com>
2023-03-28 13:25:32 +08:00
walon 75cb53cb19 [opt] 优化AOTGenericReferences生成,包含assembly列表及美化后的泛型类型及函数名 2023-03-20 17:30:05 +08:00
walon c84f575a2e [change] 对2019修改data.unity3d文件时不再备份data.unity32.bak 2023-03-16 08:39:47 +08:00
walon 3beb788baa [fix] 修复 StripAOTDllCommand由于缓存原因,有些情况下生成失败的问题。通过添加BuildOptions.CleanBuildCache选项解决。此选项在Unity 2021及更高版本新增。 2023-03-13 12:17:39 +08:00
walon 6909c32a0c [new] 支持 2021 WebGL资源上挂载脚本 2023-03-13 09:55:26 +08:00
walon bbb43c3185 [version] hybridclr仓库版本升到v2.0.3 2023-03-11 22:02:32 +08:00
walon 1159125044 [version] 支持2020.3.45及2021.3.20版本 2023-03-11 12:09:46 +08:00
walon 141ff18a7e [version] 升级hybridclr版本为v2.0.2 2023-03-03 12:01:56 +08:00
walon a9ca9fc613 [change] Installer使用tag而不是commit id,安装时不必拉取整个branch,大幅缩短安装时间
[change] 升级hybridclr和il2cpp_plus版本
2023-02-22 10:43:30 +08:00
walon 15f2f0b83c [opt] 优化AssemblyResolver失败时的错误日志 2023-02-12 11:38:18 +08:00
walon d67a11b384 [fix] 修复WebGL平台未正确处理空struct类型的桥接函数签名的bug 2023-02-09 20:11:15 +08:00
walon ff93f30a69 [new] 添加 Mac M1 silicon 平台的MonoHook native插件 2023-02-08 21:59:24 +08:00
walon 275a3bd01a [remove] 移除HybridCLRSettings的collectAssetReferenceTypes选项 2023-02-07 12:42:16 +08:00
walon b5a7899657 [new] 引入 [MonoHook](https://github.com/Misaka-Mikoto-Tech/MonoHook) 彻底解决获得2021版本iOS平台裁剪后AOT dll的问题,不再需要修改UnityEditor.CoreModule.dll 2023-02-06 20:48:22 +08:00
walon fdba92588a [version] 升级到2.0.0版本 2023-02-06 16:42:18 +08:00
walon bf6ae99dad [change] 直接配置了每个unity大版本对应的hybridclr及il2cpp_plus版本,避免出现安装了不兼容版本的问题 2023-01-26 13:11:38 +08:00
walon dbd8121ee2 [remove] 移除2021.3.6版本的 UnityEditor.CoreModule-* 文件
[remove] 移除去安装时对git是否安装的检查
2023-01-20 12:50:24 +08:00
walon 5a50778821 [fix] 修复 Il2CppDefGeneratorCommand 中生成 PlaceHolder Assembly列表时未包含 preserveHotUpdateAssemblies的bug 2023-01-11 17:41:44 +08:00
walon 6834a17968 [change] 升级版本号到1.1.17 2023-01-10 22:09:39 +08:00
walon ef70a49ae2 [change] Il2CppDefGenerator命令新增将热更新dll列表生成到 Il2CppCompatibleDefs.cpp 2023-01-05 21:38:32 +08:00
walon 83c336a5ce [fix] 修复Installer不同的Unity年度版本仍然读取相同的hybridclr及il2cpp_plus版本号配置,导致切换Unity版本时有可能发生默认显示的版本号错误的问题 2022-12-29 20:41:52 +08:00
walon 00cedc166f [fix] 修复macOS下的编译bug 2022-12-16 11:23:37 +08:00
walon 0e04a66c91 [new] 新增菜单命令 HybridCLR/Generate/AOTDlls 快捷生成裁剪后的AOT dlls 2022-12-16 11:03:03 +08:00
walon 00f94335c3 [refactor] 重构并且修复了Generate相关Assembly Resolve潜在的bug。
[opt] 优化 PrebuildCommand.Build 中多次编译热更新dll的问题,大幅缩短了时间。
2022-12-14 14:11:32 +08:00
walon 947b15e7d9 [fix] 修复StructLayout中只指定LayoutKind参数时,struct的ClassLayout为空,计算type size和aligment错误的bug 2022-12-14 10:21:31 +08:00
walon b40d62e16e [opt] 优化link.xml生成,只加载热更新dll,不再加载它们依赖的其他dll 2022-12-13 18:10:20 +08:00
walon c8acfef61d [fix] 修复 externalHotUpdateAssembliyDirs 无法正确工作的bug 2022-12-13 11:40:18 +08:00
walon 8afdcb985d [fix] 修复 ReversePInvokeWrap生成代码的bug 2022-12-12 21:36:41 +08:00
walon a107f43173 [fix] 修复生成N2M桥接函数Stub时,失误将末尾项的sinature填成""的bug,正确应该是nullptr 2022-12-12 12:01:02 +08:00
walon 0edd822101 [fix] 修复生成桥接函数时不必要地多次调用 CleanIl2CppBuildCache,并有可能因并发清除而抛出异常的问题 2022-12-08 22:19:27 +08:00
walon 419c3a98f6 [opt] installer安装成功后会记录 安装的版本,并且显示。 2022-12-06 18:57:48 +08:00
walon 6be8b2671e [refactor] 重构Installer,不再支持从其他版本安装HybridCLR,极大简化了代码。 2022-12-06 11:52:47 +08:00
walon 38615500fb [change] 移除HybridCLR.Runtime中DHE相关代码 2022-12-04 21:37:17 +08:00
walon e7fac5b0b8 [change] 移除DHE相关代码 2022-12-03 11:56:36 +08:00
walon bc6e285b92 [change] 禁用HybridCLR时不再复制裁剪后的AOT dll
[new] SettingsUtil.Enable 支持setter,允许代码中修改开启状态。
2022-12-02 13:14:06 +08:00
walon abc70a7ffc [new] 支持自定义外部热更新dll的搜索路径 externalHotUpdateAssembliyDirs 2022-12-02 10:33:13 +08:00
walon 45d97d758f [change] 桥接函数生成时,新增跟旧版本一样的托底AssemblyResolver,避免初始项目第一次 generate/all 失败的情况 2022-11-30 17:31:11 +08:00
walon b066cc50fa [fix] 修复??=语法在2019下编译出错的bug 2022-11-30 09:21:25 +08:00
walon 93f855f8ae [fix] 修复生成桥接函数时错误使用editor环境的dll,导致NativeArray之类的类型与打包的aot dll不一致,进而生成桥接签名错误的bug。目前直接从裁剪后的AOT dll目录读取,但缺点是需要先build一次生成AOT dll,再生成桥接函数。 2022-11-29 17:11:25 +08:00
walon 5270f307b9 [change] il2cpp_plus启动新的分支名 2019-main、2020-main、2021-main,相应调整代码
[opt] 优化installer的显示
2022-11-29 09:23:24 +08:00
walon f36da3529a [new] 支持按版本号安装hybridclr和il2cpp_plus代码 2022-11-28 12:20:52 +08:00
walon 521db6e38c [new] 创建1.0.0版本 2022-11-28 11:11:28 +08:00
walon c85adbe65b [refactor] UNITY_VERSION 相关定义从 Il2CppCompatibleDef.h 移到 il2cpp-config.h 2022-11-24 12:09:04 +08:00
walon b9ea9b21f3 [fix] 修复扫描Plugin assembly时未忽略~结尾的目录的bug 2022-11-18 19:38:21 +08:00
walon 429845bf9e [new] installer支持使用自定义仓库地址
[opt] 优化installer的显示
2022-11-09 11:28:09 +08:00
walon c95b7eaf3b [new] 为测试openupm而升到0.10.3 2022-11-07 15:27:38 +08:00
walon fdb9cc034a [fix] 修复检查更新未生效的bug 2022-11-06 20:16:38 +08:00
walon bdc0d772c8 [new] 支持 Differential Hybrid Execution基础版本 2022-11-05 22:22:39 +08:00
walon 2ccfd28337 [change] 更新版本号到0.9.1 2022-11-02 17:56:10 +08:00
雨落随风 689e582efd [fix] 解决编辑器打包时出现的 _serializedObject.targetObject 意外销毁的情况 (#17) 2022-11-02 17:54:46 +08:00
雨落随风 3918b707e3 [fix] 修复 SettingsProvider 卡编辑器的问题 (#16)
* [change] 跨版本兼容问题优化,菜单新增文档

1. 添加 EditorStatusWatcher 解决 git 等外部修改了配置不能同步的问题。
2. Reset 按钮 icon 2021版本有区别,同步之

* [fix] 解决 SettingProviders 卡编辑器的问题
2022-11-02 10:17:41 +08:00
ForeseePretty bf8e5c4840 [fix]:修正hybridclr与il2cpp_plus仓库更新检测的fetch深度 (#15)
[fix]:修正hybridclr与il2cpp_plus仓库更新检测的fetch深度
2022-10-28 13:52:32 +08:00
walon 77b7dea7bc [new] 补充元数据支持使用超集aot dll,也就是可以使用原始aot dll而不再限定是裁减后的aot dll 2022-10-26 11:28:49 +08:00
雨落随风 c12f1ee8e9 [change] 跨版本兼容问题优化,菜单新增文档 (#14)
1. 添加 EditorStatusWatcher 解决 git 等外部修改了配置不能同步的问题。
2. Reset 按钮 icon 2021版本有区别,同步之
2022-10-25 17:36:32 +08:00
ForeseePretty 1b69c9ca78 [fix]:支持hybridclr与il2cpp_plus仓库更新 (#11)
* fix: Data~文件读取修正

* [fix]:支持hybridclr与il2cpp_plus仓库更新
2022-10-25 17:26:21 +08:00
walon fc5bf86887 [new] 新增 hotUpdateDllCompileOutputRootDir和strippedAOTDllOutputRootDir配置字段 2022-10-23 17:46:09 +08:00
walon 2ad7c31302 [fix] 修复 ReversePInvokeWrap 生成的bug 2022-10-21 17:42:31 +08:00
walon 4f64ea1c6c [new] PathScriptingAssembilesFile 支持WebGL平台 2022-10-19 14:20:17 +08:00
walon 687366cd82 [new] HybridCLRSettings新增 patchAOTAssemblies字段用于配置补充元数据dll列表。 2022-10-19 11:57:53 +08:00
walon 276307dc51 [fix] 修复 MethodBridge.Analyzer::TryAddAndWalkGenericType 某些情况下抛出空指针异常的bug 2022-10-19 11:43:56 +08:00
walon 15319a59fa [new] 支持WebGL 2022-10-19 09:54:33 +08:00
walon 093f67296a [refactor] 少量代码重构 2022-10-18 13:51:38 +08:00
walon be4d220529 [new] HybridCLRSettings 新增 preserveHotUpdateAssemblies字段,用于预留assembly 2022-10-18 13:48:43 +08:00
walon 339b9f9fde [fix] 为了解决与Xlua的兼容问题,扫描MonoPInvokeCallbackAttribute时只比较类名而不比较全名,因为Xlua使用自定义的 Xlua.MonoPInvokeCallbackAttribute 特性 2022-10-18 13:30:42 +08:00
walon 82499dfe32 [fix] 修复未对 MonoPInvokeCallback标注的函数签名做Optimized变换,导致与Runtime计算结果不一致的bug 2022-10-18 09:21:51 +08:00
walon d8e155dc25 [new] MonoPInvokeCallback支持任意签名的函数
[refactor] 重构模板文件,除去重复。统一调整生成文件的输出目录到 hybridclr/generated
2022-10-17 21:38:39 +08:00
walon 9ea240ab82 重构 2022-10-17 12:16:18 +08:00
walon d7a1765146 [new] HybridCLRSettings新增collectAssetReferenceTypes字段指示生成link.xml是否扫描资源中引用的类型 2022-10-14 23:20:35 +08:00
walon a74130618e [fix] 将两处正常日志的级别由错误改为警告 2022-10-14 22:32:15 +08:00
walon 63f1d3b2e4 [opt] 生成link.xml时扫描除了场景以外的所有资源,收集所有UnityEngine.Object类型引用 2022-10-14 18:51:19 +08:00
walon 4a00e944a6 [fix] 修复ReversePInvokeWrapper生成的bug 2022-10-14 16:15:18 +08:00
walon e3095ccc01 [fix] 修复桥接函数遍历收集签名时,未等遍历完就结束执行,导致生成的桥接文件不完整的bug 2022-10-14 14:47:27 +08:00
walon 823877275c [refactor] 重构methodPointer,微小调整了桥接函数生成 2022-10-14 11:44:30 +08:00
walon 2899d13d60 [fix] 修复2019的不兼容编译错误 2022-10-09 21:08:53 +08:00
walon ef83fca9a0 [refactor] 一些重构 2022-10-09 20:53:13 +08:00
walon 7fea92cc75 [new] 支持hybridclr安装到全局位置,但仍然需要自己复制文件。 2022-10-09 20:22:23 +08:00
walon 85fcd0481a Merge pull request #10 from Bian-Sh/main
[update] 对 Hybrid Global Settings 工作流稍作完善
2022-10-09 19:58:06 +08:00
边上海 caa0281e18 [update] 对 Hybrid Global Settings 工作流稍作完善
1. 将 hybrid settings 转移到 ProjectSettings 文件夹
2. 将 hybrid Settings 绘制到 编辑器 ProjectSettings 面板
3. 添加 文档 、Presets、Reset 功能
4. 在 installer 添加 settings 入口
5. 在 菜单栏添加 setting 入口,关于我们、以及文档入口
2022-10-09 19:42:16 +08:00
walon 47da01204b Merge pull request #5 from Roland0511/fix/exist-program-check
[fix] 修复ExistProgram在非Windows平台无法返回正确结果的问题
2022-10-08 21:32:31 +08:00
walon 756fdedc14 [fix] 修复由于cmake设置的原因,导致 build_libil2cpp.sh 生成的.a文件为模拟器版本的问题 2022-10-08 18:04:33 +08:00
walon f2ee5e7af1 [fix] 修复 UnityPluginAssemblyResolver 搜索依赖dll未检查Plugins外目录的bug
[refactor] 一些重命名 hotfix -> hotUpdate
[refactor] HybridCLRGlobalSettings移除 hotUpdateDllOutputDir、 hybridCLRDataDir、strippedAssemblyDir这三个配置项,改为直接写死
[change] Editor下调用LoadMetadataForAOTAssembly返回成功而不是抛出错误
2022-10-08 12:35:57 +08:00
walon 8eb94be37e Merge pull request #6 from Senfee-Cheng/main
[fix] 修复路径带空格时,gen_lump.sh运行出错的bug
2022-09-29 19:35:35 +08:00
walon f810ac53ba [opt] 当Installer中il2cpp路径不包含版本号时,给出提示
[opt] 新增 LoadMetadataForAOTAssembly(byte[])函数,简化使用。同时在Editor下被意外调用时给出更清晰的信息
2022-09-28 21:48:09 +08:00
Rorschach 1e6defaad8 shell 空格路径处理
如果项目名带空格,现在可以正常编译 .a
2022-09-28 21:34:06 +08:00
walon a56f940890 [fix] 修复遗漏扫描泛型类里的非泛型函数,导致桥接函数缺失的问题 2022-09-28 15:35:37 +08:00
lizhou.zhu dea7351771 [fix] 修复ExistProgram在非Windows平台无法返回正确结果的问题
linux和OSX中并没有where命令
2022-09-27 16:48:54 +08:00
walon 62bf4c2847 [fix] 修复 UnityPluginAssemblyResolver 扫描dll时,失误扫描了非Plugins dll的bug 2022-09-27 16:12:34 +08:00
walon cd68f33161 [fix] 修复plugin dll与Unity自带dll同名时,GenerateMethodBridge生成失败的bug 2022-09-27 14:57:00 +08:00
walon 07b56fe7e5 [fix] 修复调用Data目录为Data~目录后读取资源文件失败的bug 2022-09-26 13:30:07 +08:00
walon 3440f79421 [fix] 修复ResolveClass某些情况下抛出NullReferenceException的bug 2022-09-26 12:49:23 +08:00
walon d544133227 Merge pull request #2 from huangchaoqun/main
[refactor] Data目录重命名为Data~,避免生成meta文件
2022-09-26 12:48:15 +08:00
ForeseePretty 3c280ba80b Merge pull request #1 from focus-creative-games/main
[fix] 生成完成后释放dnlib相关对象,避免出现dll文件被占用的异常
2022-09-26 12:41:18 +08:00
walon 5926b285e3 [fix] 生成完成后释放dnlib相关对象,避免出现dll文件被占用的异常 2022-09-26 12:12:57 +08:00
hansheng eb2522049a fix: ignores Data
Data to Data~
2022-09-26 11:54:14 +08:00
walon 830f0cca7d [opt] 生成的 AOTGenericReferences 文件中泛型类型和函数按名称排序 2022-09-23 18:09:14 +08:00
walon c76e68411f [new] AOTGenericReferences打印出详细的泛型类型及函数签名 2022-09-23 15:16:43 +08:00
walon aed13e464b [new] 过滤非aot泛型类及函数 2022-09-23 14:26:28 +08:00
walon 0af6f704b2 [refactor] 重构。将7Zip及UnitFS移入HybridCLR.Editor模块。合并Generate命令。 2022-09-23 09:40:06 +08:00
332 changed files with 11198 additions and 9520 deletions
-5
View File
@@ -1,5 +0,0 @@
# change logs
- 2022.8.30 创建
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 94322e93a1f61b340bdc1d5042dab659
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a96a2c46326d2a84984c2820bd4bfc91
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 33c064b00b452284f93cd6e89de8a06d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d104ab5da8136154899a40116dc88731
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f42c0f03663d4c14f8a49912c08a514f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b3b3b1f0cbc038149acb4d23bc6d5bf5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f54201f21d7421d4c894298aa5266c73
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-22
View File
@@ -1,22 +0,0 @@
#include "MethodBridge.h"
#include <codegen/il2cpp-codegen-metadata.h>
#include "vm/ClassInlines.h"
#include "vm/Object.h"
#include "vm/Class.h"
#include "../metadata/MetadataModule.h"
#include "../metadata/MetadataUtil.h"
#include "Interpreter.h"
#include "MemoryUtil.h"
#include "InstrinctDef.h"
using namespace hybridclr::interpreter;
using hybridclr::GetInterpreterDirectlyCallMethodPointer;
#if HYBRIDCLR_ABI_ARM_64
//!!!{{INVOKE_STUB
//!!!}}INVOKE_STUB
#endif
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 1249fb131a848a14f8dd0938e3cc2558
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,22 +0,0 @@
#include "MethodBridge.h"
#include <codegen/il2cpp-codegen-metadata.h>
#include "vm/ClassInlines.h"
#include "vm/Object.h"
#include "vm/Class.h"
#include "../metadata/MetadataModule.h"
#include "../metadata/MetadataUtil.h"
#include "Interpreter.h"
#include "MemoryUtil.h"
#include "InstrinctDef.h"
using namespace hybridclr::interpreter;
using hybridclr::GetInterpreterDirectlyCallMethodPointer;
#if HYBRIDCLR_ABI_UNIVERSAL_32
//!!!{{INVOKE_STUB
//!!!}}INVOKE_STUB
#endif
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: e06e14385d246aa4ab853d3fd04d6eec
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,22 +0,0 @@
#include "MethodBridge.h"
#include <codegen/il2cpp-codegen-metadata.h>
#include "vm/ClassInlines.h"
#include "vm/Object.h"
#include "vm/Class.h"
#include "../metadata/MetadataModule.h"
#include "../metadata/MetadataUtil.h"
#include "Interpreter.h"
#include "MemoryUtil.h"
#include "InstrinctDef.h"
using namespace hybridclr::interpreter;
using hybridclr::GetInterpreterDirectlyCallMethodPointer;
#if HYBRIDCLR_ABI_UNIVERSAL_64
//!!!{{INVOKE_STUB
//!!!}}INVOKE_STUB
#endif
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2965fa89651ee0c4eb4c4fdcf95b76b8
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,36 +0,0 @@
#include "ReversePInvokeMethodStub.h"
#include "MetadataModule.h"
namespace hybridclr
{
namespace metadata
{
//!!!{{REVERSE_PINVOKE_METHOD_STUB
void CallLuaFunction(void* xState, int32_t wrapperIndex)
{
const MethodInfo* method = MetadataModule::GetMethodInfoByReversePInvokeWrapperIndex(wrapperIndex);
typedef void (*Callback)(void* xState, const MethodInfo* method);
((Callback)GetInterpreterDirectlyCallMethodPointer(method))(xState, method);
}
void __ReversePInvokeMethod_0(void* xState)
{
CallLuaFunction(xState, 0);
}
void __ReversePInvokeMethod_1(void* xState)
{
CallLuaFunction(xState, 1);
}
Il2CppMethodPointer s_ReversePInvokeMethodStub[]
{
(Il2CppMethodPointer)__ReversePInvokeMethod_0,
(Il2CppMethodPointer)__ReversePInvokeMethod_1,
nullptr,
};
//!!!}}REVERSE_PINVOKE_METHOD_STUB
}
}
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 6447cdc1825eeef49a3679545ac31d95
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c9442afcb42f28646a509d70ffe3d880
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-88
View File
@@ -1,88 +0,0 @@
# file: CMakeList.txt
cmake_minimum_required(VERSION 3.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
set(TMP $ENV{HUATUO_IL2CPP_SOURCE_DIR})
if ( NOT TMP )
message(FATAL_ERROR "需要设置环境变量: HUATUO_IL2CPP_SOURCE_DIR")
else()
message(STATUS "unity il2cpp 路径为: ${TMP}")
endif()
set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
if ( SDK_VERSION )
message(STATUS "使用iPhoneSimulator版本:" ${SDK_VERSION})
else()
message(STATUS "当前使用默认版本的iPhoneSimulator,可以通过设置环境变量IPHONESIMULATOR_VERSION,指定版本")
endif()
project(il2cpp)
execute_process(COMMAND sh gen_lump.sh ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
add_subdirectory(external)
add_subdirectory(objective)
set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
message(STATUS "il2cpp project, binary dir: " ${CMAKE_BINARY_DIR})
message(STATUS "il2cpp project, build dir: " ${PROJECT_BINARY_DIR})
message(STATUS "il2cpp project, il2cpp source dir: " ${IL2CPP_SOURCE_DIR})
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
if (NOT CLANG_EXECUTABLE)
message(FATAL_ERROR "Cannot find any clang executable.")
endif()
set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
#set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_C_COMPILER clang)
#add_compile_options(-x objective-c++)
# 以下命令为复制的Xcode生成中的命令
set(CMAKE_CXX_FLAGS "-target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++1z -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DIL2CPP_TARGET_IOS=1 -isysroot ${CMAKE_OSX_SYSROOT} -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -Wunguarded-availability ")
add_definitions(-DIL2CPP_TARGET_IOS=1)
add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
add_definitions(-DAARCH64)
add_definitions(-D__aarch64__)
add_definitions(-DIL2CPP_SUPPORT_THREADS)
add_definitions(-DIL2CPP_THREADS_PTHREAD)
#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
#add_definitions(-DIL2CPP_TARGET_DARWIN)
add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO)
add_definitions(-MMD)
add_definitions(-MT dependencies)
include_directories(${IL2CPP_SOURCE_DIR}/libil2cpp/)
include_directories(${IL2CPP_SOURCE_DIR}/external/)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
# 修改为本机对应SDK路径
include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/c++/v1)
include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include)
aux_source_directory(${PROJECT_BINARY_DIR}/lump_cpp LUMP_SOURCE_LIST)
aux_source_directory(${IL2CPP_SOURCE_DIR}/libil2cpp LIBIL2CPP_SOURCE_LIST)
#find_library(zlib ${PROJECT_SOURCE_DIR}/external)
add_library(il2cpp_original STATIC ${LIBIL2CPP_SOURCE_LIST} ${LUMP_SOURCE_LIST})
add_dependencies(il2cpp_original external objective)
add_custom_command(TARGET il2cpp_original
POST_BUILD
COMMAND xcrun -r libtool -static -o libil2cpp.a libil2cpp_original.a external/libexternal.a objective/libobjective.a
COMMENT "post build this is command combine libil2cpp_original.a, libojjective.a and libzlib.a into libil2cpp"
)
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3436274d6dd0cc64fb4d15c898cc1d1d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-19
View File
@@ -1,19 +0,0 @@
#!/bin/bash
export HUATUO_IL2CPP_SOURCE_DIR=$(pushd ../LocalIl2CppData-OSXEditor/il2cpp > /dev/null && pwd && popd > /dev/null)
export IPHONESIMULATOR_VERSION=
rm -rf build
mkdir build
cd build
cmake ..
make -j24
if [ -f "libil2cpp.a" ]
then
echo 'build succ'
else
echo "build fail"
exit 1
fi
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8ed3bb85d9526f9468289a2e26dadf0b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-47
View File
@@ -1,47 +0,0 @@
# file: external/CMakeList.txt
cmake_minimum_required(VERSION 3.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
message(STATUS "external project, external source dir: " ${IL2CPP_SOURCE_DIR})
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
if (NOT CLANG_EXECUTABLE)
message(FATAL_ERROR "Cannot find any clang executable.")
endif()
set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_C_COMPILER clang)
set(CMAKE_C_FLAGS "-x c -target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu11 -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DIL2CPP_TARGET_IOS=1 -isysroot ${CMAKE_OSX_SYSROOT} -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -Wunguarded-availability")
add_definitions(-DIL2CPP_TARGET_IOS=1)
add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
add_definitions(-DAARCH64)
add_definitions(-D__aarch64__)
#add_definitions(-D__arm64__)
add_definitions(-DIL2CPP_SUPPORT_THREADS)
add_definitions(-DIL2CPP_THREADS_PTHREAD)
#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
#add_definitions(-DIL2CPP_TARGET_DARWIN)
add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO=0)
add_definitions(-MMD)
add_definitions(-MT dependencies)
include_directories(${IL2CPP_SOURCE_DIR}/external/)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
aux_source_directory(${IL2CPP_SOURCE_DIR}/external/zlib/ ZLIB_C_SOURCE_LIST)
add_library(external STATIC ${ZLIB_C_SOURCE_LIST})
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 03b1d6a5f25828042a1d215904917995
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-64
View File
@@ -1,64 +0,0 @@
echo '====================================================================='
echo 'gen lump'
echo '$HUATUO_IL2CPP_SOURCE_DIR='${HUATUO_IL2CPP_SOURCE_DIR} #/Applications/Unity/Unity.app/Contents/il2cpp/
GEN_SOURCE_DIR=$1
BASE_DIR=${HUATUO_IL2CPP_SOURCE_DIR}/libil2cpp
echo base dir: ${BASE_DIR}
echo " "
#BASE_DIR=${HUATUO_IL2CPP_SOURCE_DIR}/libil2cpp
function SearchCppFile()
{
for f in $(ls $1)
do
SUB_DIR=$1/$f
if [ -d ${SUB_DIR} ]; then
SearchCppFile ${SUB_DIR}
fi
done
CPP_FILE_NUM=`ls -l $1/ | grep "\.cpp$"|wc -l`
if (( ${CPP_FILE_NUM} > 0 ))
then
for f in $1/*.cpp
do
echo "#include \""$f"\"" >> ${OUTPUT_FILE_NAME}
done
fi
MM_FILE_NUM=`ls -l $1/ | grep "\.mm$"|wc -l`
if (( ${MM_FILE_NUM} > 0 ))
then
for f in $1/*.mm
do
echo "#include \""$f"\"" >> ${OBJECTIVE_FILE_NAME}
done
fi
}
rm -rf ${GEN_SOURCE_DIR}/lump_cpp
rm -rf ${GEN_SOURCE_DIR}/lump_mm
mkdir ${GEN_SOURCE_DIR}/lump_cpp
mkdir ${GEN_SOURCE_DIR}/lump_mm
OBJECTIVE_FILE_NAME=${GEN_SOURCE_DIR}/lump_mm/lump_libil2cpp_ojective.mm
echo "#include \"${BASE_DIR}/il2cpp-config.h\"" > ${OBJECTIVE_FILE_NAME}
echo gen file: ${OBJECTIVE_FILE_NAME}
for FOLDER in hybridclr vm pch utils vm-utils codegen metadata os debugger mono gc icalls
do
OUTPUT_FILE_NAME=${GEN_SOURCE_DIR}/lump_cpp/lump_libil2cpp_${FOLDER}.cpp
echo "#include \"${BASE_DIR}/il2cpp-config.h\"" > ${OUTPUT_FILE_NAME}
if [ $FOLDER = hybridclr ] || [ $FOLDER = vm ]
then
echo "#include \"${BASE_DIR}/codegen/il2cpp-codegen.h\"" >> ${OUTPUT_FILE_NAME}
fi
SearchCppFile ${BASE_DIR}/${FOLDER}
echo gen file: ${OUTPUT_FILE_NAME}
done
echo gen done.
echo '====================================================================='
echo " "
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 01ed218875eaf574694fbe3a8e0c4a64
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-62
View File
@@ -1,62 +0,0 @@
# file: CMakeList.txt
cmake_minimum_required(VERSION 3.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
project(il2cpp)
set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
message(STATUS "objective project, binary dir: " ${PROJECT_BINARY_DIR})
message(STATUS "objective project, il2cpp source dir: " ${PROJECT_SOURCE_DIR})
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
if (NOT CLANG_EXECUTABLE)
message(FATAL_ERROR "Cannot find any clang executable.")
endif()
set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_C_COMPILER clang)
#add_compile_options(-x objective-c++)
# 以下命令为复制的Xcode生成中的命令
set(CMAKE_CXX_FLAGS "-target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++1z -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DIL2CPP_TARGET_IOS=1 -isysroot ${SDK_VERSION} -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -Wunguarded-availability ")
add_definitions(-DIL2CPP_TARGET_IOS=1)
add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
add_definitions(-DAARCH64)
add_definitions(-D__aarch64__)
add_definitions(-DIL2CPP_SUPPORT_THREADS)
add_definitions(-DIL2CPP_THREADS_PTHREAD)
#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
#add_definitions(-DIL2CPP_TARGET_DARWIN)
add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO)
add_definitions(-MMD)
add_definitions(-MT dependencies)
include_directories(${IL2CPP_SOURCE_DIR}/libil2cpp)
include_directories(${IL2CPP_SOURCE_DIR}/external)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
# 修改为本机对应SDK路径
include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/c++/v1)
include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include)
get_filename_component(PARENT_PATH ${PROJECT_BINARY_DIR} PATH)
aux_source_directory(${PARENT_PATH}/lump_mm LUMP_SOURCE_LIST)
#find_library(zlib ${PROJECT_SOURCE_DIR}/external)
add_library(objective STATIC ${LUMP_SOURCE_LIST})
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 76642fe740b6fd74b9a4491ce83b897e
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
Binary file not shown.
+24
View File
@@ -0,0 +1,24 @@
{
"versions": [
{
"unity_version":"2022.3.x",
"hybridclr" : { "tag":"v9.1.0"},
"il2cpp_plus": { "tag":"v2022.3.x-9.1.0"}
},
{
"unity_version":"2022.3.x-tuanjie",
"hybridclr" : { "tag":"v9.1.0"},
"il2cpp_plus": { "tag":"v2022.3.x-tuanjie-9.1.0"}
},
{
"unity_version":"6000.0.x",
"hybridclr" : { "tag":"v9.1.0"},
"il2cpp_plus": { "tag":"v6000.0.x-9.1.0"}
},
{
"unity_version":"6000.3.x",
"hybridclr" : { "tag":"v6000.3.x-9.1.0"},
"il2cpp_plus": { "tag":"v6000.3.x-9.1.0"}
}
]
}
@@ -0,0 +1,51 @@
---
name: hybridclr-aot-generic
description: >-
Handle HybridCLR AOT generics: supplementary metadata via LoadMetadataForAOTAssembly, saving stripped AOT dlls per platform, HomologousImageMode, AOTGenericReference, and MissingMethodException for an AOT generic method. Use when an AOT generic fails to instantiate, the user asks about metadata patching, List/Dictionary/async generics, or which supplementary dll to ship.
---
# AOT generics
Docs: `guide/build/aotgeneric.md` and `start/generic.md` in the HybridCLR documentation.
Generic types and methods **defined in hot-update assemblies** have no AOT restriction. The restriction is hot-update code using a generic **defined in an AOT assembly** (`List<T>`, `Dictionary<TKey,TValue>`, async state machines, and similar) when that instantiation was not generated in AOT. Typical log:
```text
MissingMethodException: AOT generic method not instantiated in aot module
```
## Default: supplementary metadata
The community edition uses supplementary metadata. Do not send the user to hand-written RefTypes unless they are chasing one instantiation or optimizing a hot path.
Patch the **AOT dll that contains the generic method**, not the dll that contains the generic argument. `List<SomeHotUpdateStruct>` needs `mscorlib.dll`, because the missing IL is `List<T>.Add`, not the struct.
```csharp
// Call once before any hot-update code uses that AOT generic. Order among dlls does not matter.
LoadImageErrorCode err = HybridCLR.RuntimeApi.LoadMetadataForAOTAssembly(dllBytes, HomologousImageMode.SuperSet);
// Do not keep dllBytes. The API copies them.
```
- Call it after player startup, or after hot-update dlls are loaded and before business code runs. The supplementary dlls can ship in the player (for example StreamingAssets) or with a hot update.
- Call it on another thread if it stalls.
- Loaded metadata uses several times the dll size and is not released. Memory-tight projects use the commercial full generic sharing build (no supplementary dlls), or run `AOTAssemblyMetadataStripper.Strip` to drop non-generic method metadata first.
- `HybridCLR/Generate/AOTGenericReference` writes a conservative `PatchedAOTAssemblyList`. Load the whole list when memory is fine. Otherwise start with common dlls such as `mscorlib` and add a dll when a new AOT generic error appears. Supplementary dlls can themselves be hot-updated.
## Which dll
The player build copies stripped AOT dlls to `{project}/HybridCLRData/AssembliesPostIl2CppStrip/{target}`. `Generate/AotDlls` can also produce them by exporting a temp project.
- **Stripped dlls from different BuildTargets are not interchangeable.**
- **Freeze the dlls from the shipped player.** Do not replace them with a newer Generate output on every hot update.
- `HomologousImageMode.SuperSet`: a superset is enough. Stripped or original AOT dlls both work. Use this by default.
- `HomologousImageMode.Consistent`: the bytes must match **that player build's** stripped dll. Original dlls do not work. `Generate/All` output often differs slightly from the real player, so Consistent fails more often.
## Generic sharing (optional)
After metadata is loaded, HybridCLR still prefers an il2cpp shared instantiation when one exists. Class type arguments share as `object`. Non-enum value types share only with themselves. Enums share with enums of the same underlying type. Value types do not share across different types the way classes do, so `List<HotUpdateStruct>` is not covered by an AOT `List<int>`.
Instantiations in `AOTGenericReferences.cs` are comments and are overwritten on regenerate. Copy any you want into another AOT file (for example `new List<object>()`). That is a performance optimization, not a requirement for correctness.
## Full generic sharing
Commercial editions only. It removes the size, memory, and interpreted-call cost of supplementary metadata. Do not switch the workflow to it unless the user has that edition.
@@ -0,0 +1,48 @@
---
name: hybridclr-avoid-code-strip
description: >-
Keep Unity IL2CPP from stripping AOT types and methods that hot-update code calls: Generate/LinkXml, linkPreserveLevel, a hand-written Assets/link.xml, a real reference from the main project, and MissingMetadataChecker. Use for TypeLoadException, MissingMethodException that is not an AOT generic error, code stripping, link.xml, or Generate/LinkXml.
---
# Avoid code stripping
Doc: `guide/build/codestriping.md` in the HybridCLR documentation.
If a stripped AOT type or method is called from hot-update code:
```text
TypeLoadException: Could not load type 'Xxx' from assembly 'yyy'
MissingMethodException: ...
```
If the log says `AOT generic method not instantiated`, use `hybridclr-aot-generic`. link.xml does not fix that.
## Before the player build
Run `HybridCLR/Generate/All` before building the player. It includes `Generate/LinkXml`. LinkXml alone scans AOT references from the current hot-update dlls.
- Output is Settings `outputLinkFile`, default `Assets/HybridCLR/Generate/link.xml`.
- **Do not** point `outputLinkFile` at a hand-maintained `Assets/link.xml`. Generation overwrites it.
- `linkPreserveLevel`: default `PreserveAllOfDeclaringType` keeps the whole referenced type. Use `PreserveExactMember` only to shrink the player (referenced fields, methods, properties, and events). A later hot update that touches another member can then miss it.
## When link.xml has no effect
If the main project never references any type or method in an AOT assembly, Unity strips that assembly entirely and preserve entries are ignored. Reference one type or method from that dll in the main project.
`preserve all` on `UnityEngine.Debug` can hit a Unity bug. Since 6.1.0, generated link.xml skips that class. Do not add it back.
## Reserve types for later hot updates
`Generate/LinkXml` only covers references in the **current** hot-update dlls. Put types you will need later in a separate `Assets/link.xml`, or call them from the main project. Do not put them in the generated file.
## Check before publishing a hot update
Use the stripped AOT dll directory saved from the player build. Do not use `AssembliesPostIl2CppStrip` after a later `Generate/All` has refreshed it.
```csharp
var checker = new HybridCLR.HotUpdate.MissingMetadataChecker(
aotDirFromPlayerBuild, SettingsUtil.HotUpdateAssemblyNamesIncludePreserved);
bool ok = checker.Check(hotUpdateDllPath); // false: the dll touches a stripped type or method
```
The second argument is hot-update assembly names without `.dll`. If an Ultimate build also has DHE assemblies, include those names in the list.
+51
View File
@@ -0,0 +1,51 @@
---
name: hybridclr-configure
description: >-
Configure HybridCLR Settings and PlayerSettings: enable, hot-update assembly lists, external dll search paths, link.xml output, linkPreserveLevel, incremental GC, and IL2CPP. Use when the user opens HybridCLR/Settings, edits ProjectSettings/HybridCLRSettings.asset, checks settings before a player build, or asks what a setting does.
---
# Configure HybridCLR
Docs: `guide/setup/projectsettings.md` and `guide/setup/hybridclr-unity-package.md` in the HybridCLR documentation. Fields follow `Editor/Settings/HybridCLRSettings.cs` in this repo. The asset is `ProjectSettings/HybridCLRSettings.asset`.
How to split assemblies and create asmdefs is `hybridclr-hotupdate-assembly`. Do not expand that here.
## PlayerSettings
- Scripting Backend is **IL2CPP**. WebGL does not use this option. Since v2.4.0 the build check switches this automatically.
- Api Compatibility Level is **.NET Framework**.
- Incremental GC is allowed since v4.0.0. Older packages must turn it off.
## Hot-update lists
`hotUpdateAssemblyDefinitions` and `hotUpdateAssemblies` merge into the final hot-update dll list. **Do not put the same assembly in both.**
| Source | Where |
|---|---|
| asmdef | `hotUpdateAssemblyDefinitions` |
| External dll, or `Assembly-CSharp` | `hotUpdateAssemblies`, name **without** `.dll` |
An empty list fails the player-build check. `IFilterBuildAssemblies` removes these dlls from the player build so they are not compiled into AOT.
## Settings
- `enable`: default true. Turning it off drops HybridCLR from the player. Also remove the main project's reference to `HybridCLR.Runtime`, or symbols such as `LoadMetadataForAOTAssembly` are missing.
- `useGlobalIl2cpp`: default false. Keep the local `UNITY_IL2CPP_PATH`.
- `hybridclrRepoURL` / `il2cppPlusRepoURL`: clone URLs for the installer. Default is gitee.
- `preserveHotUpdateAssemblies`: names of hot-update dlls that do not exist yet (no `.dll`). The build does not check that the files exist, but it writes the names into `ScriptingAssemblies.json` so scripts can be attached to assets later. Do not list dlls that already exist.
- `externalHotUpdateAssembliyDirs`: search paths for external hot-update dlls. The serialized name is spelled `Assembliy`. Do not rename it. Paths are relative to the **project root** (parent of Assets). Each entry is searched as `{dir}/{platform}` first, then `{dir}`. Earlier entries win. The dll name still goes in `hotUpdateAssemblies`.
- `outputLinkFile`: output of `Generate/LinkXml`. Default `HybridCLR/Generate/link.xml`, relative to Assets. **Do not** point it at `Assets/link.xml`. Generation overwrites the file.
- `linkPreserveLevel`: `PreserveAllOfDeclaringType` (default; keep every member of a referenced type) or `PreserveExactMember` (only referenced fields, methods, properties, and events; smaller).
- `outputAOTGenericReferenceFile`: default `HybridCLR/Generate/AOTGenericReferences.cs`.
- `maxGenericReferenceIteration` / `maxMethodBridgeGenericIteration`: generic scan iteration cap, default 10. Raise them only if the log shows the scan has not converged.
## Fixed output directories
These are not settings:
- Hot-update dlls: `{project}/HybridCLRData/HotUpdateDlls/{target}`
- Stripped AOT dlls: `{project}/HybridCLRData/AssembliesPostIl2CppStrip/{target}`
## What the package does during a player build
Do not hand-edit these: set or clear the process `UNITY_IL2CPP_PATH` from `enable`; strip hot-update assemblies from the build; write hot-update dll names into the assembly list; copy stripped AOT dlls to the directory above.
@@ -0,0 +1,61 @@
---
name: hybridclr-hotupdate-assembly
description: >-
Split, create, compile, and load HybridCLR hot-update assemblies: asmdefs and Assembly-CSharp, forbidding AOT references to hot-update code, CompileDll, Assembly.Load order, and calling hot-update entry points from the main project. Use when the user adds a hot-update module, splits AOT and hot-update code, compiles HotUpdate.dll, loads a dll, hits a duplicate load, or a player build references a hot-update assembly.
---
# Hot-update assemblies
Docs: `guide/setup/hotupdateassemblysetting.md`, `guide/build/compileassembly.md`, and `guide/build/runhotupdatecodes.md` in the HybridCLR documentation. Settings fields are in `hybridclr-configure`.
## Split
Keep at least one **AOT** assembly for startup and for downloading hot-update content. Hot-update code must live in its own assembly.
Two common layouts:
- `Assembly-CSharp` stays AOT, and other code is split into AOT and hot-update asmdefs. **Turn off Auto Referenced on hot-update asmdefs.** `Assembly-CSharp` references every other assembly, so Auto Referenced easily creates an AOT reference to a hot-update dll and the player build fails.
- `Assembly-CSharp` itself is hot-update. Put the name in `hotUpdateAssemblies` without `.dll`.
AOT assemblies must not reference hot-update assemblies. Hot-update assemblies may reference each other. Load dependencies first.
## Create
1. Create a folder, for example `Assets/HotUpdate`.
2. Create → Assembly Definition, named like the module.
3. In `HybridCLR/Settings`, put asmdefs in `hotUpdateAssemblyDefinitions`. Put assemblies that have no asmdef in `hotUpdateAssemblies` by name. Do not add the same assembly to both.
4. For a prebuilt dll outside the default output directory, put the name in `hotUpdateAssemblies` and the directory in `externalHotUpdateAssembliyDirs` (relative to the project root).
## Compile
Do not ship dlls from `Library/ScriptAssemblies`. Those are compiled for the Editor target and depend on the debugger setting.
- Use `HybridCLR/Compile/{platform}`, or `HybridCLR.Editor.Commands.CompileDllCommand.CompileDll(BuildTarget)`.
- Output: `{project}/HybridCLRData/HotUpdateDlls/{target}`. Compile once per BuildTarget so defines such as `UNITY_ANDROID` match.
- `HybridCLR/Generate/All` also compiles hot-update dlls. **After the player is shipped**, a normal hot update only recompiles and publishes the dll. Do not run Generate every time.
When copying into assets, add a `.bytes` extension (`HotUpdate.dll.bytes`).
## Load
```csharp
// The runtime copies the bytes. Do not keep assemblyData or pdb after the call returns.
Assembly ass = Assembly.Load(assemblyData);
// Since v6.4.0, symbols can load with the assembly:
Assembly ass2 = Assembly.Load(assemblyData, pdbSymbolData);
```
- `Assembly.Load` multiple dlls in dependency order. Move the call to another thread if it stalls the main thread.
- **Do not Load again in the Editor.** The assemblies are already in the domain. Wrap the load in `#if !UNITY_EDITOR` and, in the Editor, find them with `AppDomain.CurrentDomain.GetAssemblies()`.
- An assembly missing from the hot-update lists is compiled into AOT. Loading it again at runtime is a duplicate load.
## Call hot-update code from AOT
The main project cannot reference hot-update types directly. Typical entry points:
- Reflection: `ass.GetType(...).GetMethod(...).Invoke`
- `Delegate.CreateDelegate`, or `Activator.CreateInstance` cast to an interface defined in AOT
- `go.AddComponent(type)` after the dll is loaded
- Instantiate a prefab or scene packed in an AssetBundle (extra rules for scripts on assets are in `hybridclr-monobehaviour`)
Load the dll **before** loading an AssetBundle that should restore those scripts.
@@ -0,0 +1,28 @@
---
name: hybridclr-monobehaviour
description: >-
Use MonoBehaviour and ScriptableObject from HybridCLR hot-update code: AddComponent, scripts on assets, ScriptingAssemblies.json, AssetBundle load order, Script Missing, and the GetComponent(string) limitation. Use when the user attaches a hot-update script to a prefab or scene, hits Script Missing, or asks about the hot-update MonoBehaviour workflow.
---
# Hot-update MonoBehaviour
Doc: `guide/features/monobehaviour.md` in the HybridCLR documentation. Registering the assembly is `hybridclr-hotupdate-assembly`.
`AddComponent<T>()` and `AddComponent(Type)` work after that dll has been `Assembly.Load`ed.
## Scripts and ScriptableObjects on assets
Deserialization needs all of the following:
1. The dll that contains the script is already loaded.
2. The asset is loaded from an AssetBundle (Addressables and other AB-based systems count). A script on a Resources asset or a scene that ships in the player becomes **Script Missing**. Building that asset into an AssetBundle and then placing the bundle in Resources is fine.
3. The dll name is in the generated `ScriptingAssemblies.json`. Hot-update dlls are removed by `IFilterBuildAssemblies`, so they are not listed on their own. `PatchScriptingAssemblyList` writes names from `hotUpdateAssemblyDefinitions`, `hotUpdateAssemblies`, and `preserveHotUpdateAssemblies`. Unlisted assemblies are not restored.
The hot-update dll itself may live in an AssetBundle, as a raw file, or in an encrypted package. `Assembly.Load` it **before** loading assets that contain the scripts.
Do not rename these assemblies after release. The assembly list is baked into the player and cannot be hot-updated.
## Known limits
- `GetComponent(string)` cannot find a hot-update script that was restored from a hot-update asset. Use `GetComponent<T>()` or `GetComponent(typeof(T))`. Components added with `AddComponent` in code are not affected.
- Do not disable TypeTree when building AssetBundles. Script signature checks then fail and a normal load fails. If TypeTree must be off, call `AssetBundleCreateRequest.SetEnableCompatibilityChecks(false)` through reflection and keep code and asset versions matched. A mismatch can crash.
@@ -0,0 +1,39 @@
---
name: hybridclr-monopinvokecallback
description: >-
Reserve MonoPInvokeCallback and ReversePInvokeWrapper slots for HybridCLR hot-update methods: ReversePInvokeWrapperGenerationAttribute, Generate/ReversePInvokeWrapper, and the lack of automatic marshaling for string and other non-blittable arguments. Use for MonoPInvokeCallback, xlua/tolua/puerts callbacks, too few wrappers, or a crash when native code calls hot-update C#.
---
# MonoPInvokeCallback
Doc: `guide/features/monopinvokecallback.md` in the HybridCLR documentation. Choosing a Lua, JS, or Python stack is `hybridclr-script-language`.
A static method with `[MonoPInvokeCallback]` needs a C++ wrapper before `Marshal.GetFunctionPointerForDelegate` can return a pointer. Platforms that cannot JIT, including iOS, cannot create that wrapper at runtime. Generate it in the player build with `HybridCLR/Generate/ReversePInvokeWrapper` (`Generate/All` includes it).
## Reserve a count
Generating one wrapper per current callback runs out as soon as a later hot update adds another callback.
Add `[ReversePInvokeWrapperGeneration(preserveCount)]` (`HybridCLR` namespace) on the callback. **Counts are per signature:**
wrappers for a signature = sum of `preserveCount` on that signature + number of callbacks of that signature that do not have the attribute.
```csharp
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
delegate int LuaFunction(IntPtr luaState);
[ReversePInvokeWrapperGeneration(10)]
[MonoPInvokeCallback(typeof(LuaFunction))]
public static int LuaCallback(IntPtr luaState) => 0;
```
The reservation is fixed in the player. Hot updates can only consume wrappers that were already generated.
## Argument marshaling
HybridCLR does **not** marshal arguments when calling these callbacks. `int` and `float` work. `string` arrives as `char*` and using it as a string crashes.
Two options:
1. Put the callback in AOT and call into hot-update code from there. The AOT wrapper has il2cpp marshaling.
2. Take `IntPtr` in the hot-update callback and convert with `Marshal.PtrToStringUTF8`. Do the same for other non-primitive types that need marshaling.
@@ -0,0 +1,36 @@
---
name: hybridclr-script-language
description: >-
Run HybridCLR next to Lua, JavaScript/TypeScript, or Python: prefer ZLua and ZenTS; xlua, tolua, slua, and puerts need reserved ReversePInvokeWrappers and generated binding code moved into a hot-update assembly. Use when the user combines HybridCLR with lua, js, ts, python, xlua, tolua, puerts, zlua, or ZenTS, or is moving script hot update to C#.
---
# Script languages
Doc: `guide/features/workwithscriptlanguage.md` in the HybridCLR documentation. Wrapper reservation rules are in `hybridclr-monopinvokecallback`. Do not restate them here.
HybridCLR is native C# hot update. It can sit beside an existing script stack while gameplay moves back to C#.
## Prefer ZLua / ZenTS
For a new scripting layer, use the official stacks instead of xlua or puerts.
- [ZLua](https://github.com/focus-creative-games/zlua) for Lua
- [ZenTS](https://github.com/focus-creative-games/zen-ts) for JavaScript / TypeScript
They talk to il2cpp directly. They do not need `[MonoPInvokeCallback]` or a wrapper quota. Use the path below only when the project is already on xlua, tolua, or puerts.
## Other script stacks
xlua, tolua, slua, puerts, and similar binders call C# from native through `[MonoPInvokeCallback]`. Before the player build:
1. Add `[ReversePInvokeWrapperGeneration(n)]` on signatures that will grow. The count must cover later hot updates, not only the callbacks that exist now.
2. Run `HybridCLR/Generate/All` (includes `ReversePInvokeWrapper`).
3. Put generated binding code in a **hot-update** assembly and register that assembly. Do not leave it where it will be compiled as AOT.
### xlua
xlua emits code into global `Assembly-CSharp` and ties it to runtime types with partial classes. The generated output usually has to be edited before it can live in a hot-update assembly. [HybridCLRXlua](https://gitee.com/ldr123/HybridCLRXlua) is a working reference. Follow that project's assembly split. Do not assume the stock xlua generator supports HybridCLR as-is.
### tolua, slua, puerts
Check three things: enough wrappers are reserved, generated code is in the hot-update module, and registration runs after the hot-update dll is loaded.
+47
View File
@@ -0,0 +1,47 @@
---
name: hybridclr-setup
description: >-
Install and initialize com.code-philosophy.hybridclr: pick a matching Unity and package version, add the package from git or a local Packages folder, run HybridCLR/Installer, and recover from git or network failures. Use when the user installs, upgrades, or initializes HybridCLR, or when install fails, git clone fails, or the player still uses stock IL2CPP.
---
# Install HybridCLR
Docs: `guide/setup/install.md` and `guide/setup/supported-platforms-and-unity-versions.md` in the HybridCLR documentation. Package and il2cpp branches come from this repo's `Data~/hybridclr_version.json`. Do not change those branches from memory.
## Versions
- **v9.x** supports Unity **2022.3.x** and **6000.x** except 6000.5.x. Use **v8.x** for 2019.4, 2020.3, and 2021.3.
- The package name is `com.code-philosophy.hybridclr`. Before v3.0.0 it was `com.focus-creative-games.hybridclr_unity`.
- Standalone players need the **IL2CPP** module (`Windows Build Support (IL2CPP)` or `Mac Build Support (IL2CPP)`). An editor that only has the iOS or Android module cannot build that Standalone player. Exporting an iOS Xcode project does not require a local signing certificate.
## Install the package
Either:
1. Package Manager → Add package from git URL: `https://gitee.com/focus-creative-games/hybridclr_unity.git` or the GitHub repo with the same name. Pin a tag with `#{tag}`, for example `#v9.0.0`.
2. Place the repo at `Packages/com.code-philosophy.hybridclr`.
## Initialize (required)
Installing the package does not replace libil2cpp.
1. **git** must be installed. Restart the Unity Editor and Hub after installing git. Restart the machine if git is on PATH but the installer still cannot find it.
2. Open `HybridCLR/Installer...` and use the default remote install. Success prints `安装成功` and the status becomes installed.
3. The installer clones the `hybridclr` and `il2cpp_plus` branches listed in `Data~/hybridclr_version.json` for the current Unity major version. Do not edit that file unless the user explicitly wants a non-matching version.
4. If git or the network is unavailable, merge a local libil2cpp that already contains HybridCLR, enable "copy libil2cpp from local" in the installer, and install. Merge `il2cpp_plus/libil2cpp` with `hybridclr/hybridclr` into the final libil2cpp (see the install doc).
Local install lands in `{project}/HybridCLRData/LocalIl2CppData-{platform}/`. The package sets `UNITY_IL2CPP_PATH` only for the **current Editor process**. Leave `useGlobalIl2cpp` off.
## Updates
After updating the package, run `HybridCLR/Installer` again. The installer clears `Library/Il2cppBuildCache`. If libil2cpp was replaced by hand, delete that cache or the player build keeps the old IL2CPP.
## Host tools
- Windows: Visual Studio 2022 or newer with the Unity game development and C++ game development workloads, plus git.
- Mac: macOS 12 or newer, Xcode 13 or newer, plus git and cmake.
## Do not
- Do not replace libil2cpp inside the Editor install unless the user explicitly wants a global install and accepts that other projects are affected and that every `Generate` must be copied back over the Editor libil2cpp.
- WebGL uses the same local install as other platforms.
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1cd43f2247d29084fa2b393c30648e64
guid: daa1e09af240aae4da0741843cb2b3f3
folderAsset: yes
DefaultImporter:
externalObjects: {}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8f2a6638b09b52f4c9dc8906d090b710
guid: 13fe0cab0b357464d889de45c8d98850
folderAsset: yes
DefaultImporter:
externalObjects: {}
+439
View File
@@ -0,0 +1,439 @@
using DotNetDetour;
using System;
namespace MonoHook
{
public unsafe abstract class CodePatcher
{
public bool isValid { get; protected set; }
protected void* _pTarget, _pReplace, _pProxy;
protected int _jmpCodeSize;
protected byte[] _targetHeaderBackup;
public CodePatcher(IntPtr target, IntPtr replace, IntPtr proxy, int jmpCodeSize)
{
_pTarget = target.ToPointer();
_pReplace = replace.ToPointer();
_pProxy = proxy.ToPointer();
_jmpCodeSize = jmpCodeSize;
}
public void ApplyPatch()
{
BackupHeader();
EnableAddrModifiable();
PatchTargetMethod();
PatchProxyMethod();
FlushICache();
}
public void RemovePatch()
{
if (_targetHeaderBackup == null)
return;
EnableAddrModifiable();
RestoreHeader();
FlushICache();
}
protected void BackupHeader()
{
if (_targetHeaderBackup != null)
return;
uint requireSize = LDasm.SizeofMinNumByte(_pTarget, _jmpCodeSize);
_targetHeaderBackup = new byte[requireSize];
fixed (void* ptr = _targetHeaderBackup)
HookUtils.MemCpy(ptr, _pTarget, _targetHeaderBackup.Length);
}
protected void RestoreHeader()
{
if (_targetHeaderBackup == null)
return;
HookUtils.MemCpy_Jit(_pTarget, _targetHeaderBackup);
}
protected void PatchTargetMethod()
{
byte[] buff = GenJmpCode(_pTarget, _pReplace);
HookUtils.MemCpy_Jit(_pTarget, buff);
}
protected void PatchProxyMethod()
{
if (_pProxy == null)
return;
// copy target's code to proxy
HookUtils.MemCpy_Jit(_pProxy, _targetHeaderBackup);
// jmp to target's new position
long jmpFrom = (long)_pProxy + _targetHeaderBackup.Length;
long jmpTo = (long)_pTarget + _targetHeaderBackup.Length;
byte[] buff = GenJmpCode((void*)jmpFrom, (void*)jmpTo);
HookUtils.MemCpy_Jit((void*)jmpFrom, buff);
}
protected void FlushICache()
{
HookUtils.FlushICache(_pTarget, _targetHeaderBackup.Length);
HookUtils.FlushICache(_pProxy, _targetHeaderBackup.Length * 2);
}
protected abstract byte[] GenJmpCode(void* jmpFrom, void* jmpTo);
#if ENABLE_HOOK_DEBUG
protected string PrintAddrs()
{
if (IntPtr.Size == 4)
return $"target:0x{(uint)_pTarget:x}, replace:0x{(uint)_pReplace:x}, proxy:0x{(uint)_pProxy:x}";
else
return $"target:0x{(ulong)_pTarget:x}, replace:0x{(ulong)_pReplace:x}, proxy:0x{(ulong)_pProxy:x}";
}
#endif
private void EnableAddrModifiable()
{
HookUtils.SetAddrFlagsToRWX(new IntPtr(_pTarget), _targetHeaderBackup.Length);
HookUtils.SetAddrFlagsToRWX(new IntPtr(_pProxy), _targetHeaderBackup.Length + _jmpCodeSize);
}
}
public unsafe class CodePatcher_x86 : CodePatcher
{
protected static readonly byte[] s_jmpCode = new byte[] // 5 bytes
{
0xE9, 0x00, 0x00, 0x00, 0x00, // jmp $val ; $val = $dst - $src - 5
};
public CodePatcher_x86(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length) { }
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
int val = (int)jmpTo - (int)jmpFrom - 5;
fixed (void* p = &ret[0])
{
byte* ptr = (byte*)p;
*ptr = 0xE9;
int* pOffset = (int*)(ptr + 1);
*pOffset = val;
}
return ret;
}
}
/// <summary>
/// x64下2G 内的跳转
/// </summary>
public unsafe class CodePatcher_x64_near : CodePatcher_x86 // x64_near pathcer code is same to x86
{
public CodePatcher_x64_near(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy) { }
}
/// <summary>
/// x64下距离超过2G的跳转
/// </summary>
public unsafe class CodePatcher_x64_far : CodePatcher
{
protected static readonly byte[] s_jmpCode = new byte[] // 12 bytes
{
// 由于 rax 会被函数作为返回值修改,并且不会被做为参数使用,因此修改是安全的
0x48, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // mov rax, <jmpTo>
0x50, // push rax
0xC3 // ret
};
//protected static readonly byte[] s_jmpCode2 = new byte[] // 14 bytes
//{
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // <jmpTo>
// 0xFF, 0x25, 0xF2, 0xFF, 0xFF, 0xFF // jmp [rip - 0xe]
//};
public CodePatcher_x64_far(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length) { }
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
fixed (void* p = &ret[0])
{
byte* ptr = (byte*)p;
*ptr++ = 0x48;
*ptr++ = 0xB8;
*(long*)ptr = (long)jmpTo;
ptr += 8;
*ptr++ = 0x50;
*ptr++ = 0xC3;
}
return ret;
}
}
public unsafe class CodePatcher_arm32_near : CodePatcher
{
private static readonly byte[] s_jmpCode = new byte[] // 4 bytes
{
0x00, 0x00, 0x00, 0xEA, // B $val ; $val = (($dst - $src) / 4 - 2) & 0x1FFFFFF
};
public CodePatcher_arm32_near(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length)
{
if (Math.Abs((long)target - (long)replace) >= ((1 << 25) - 1))
throw new ArgumentException("address offset of target and replace must less than ((1 << 25) - 1)");
#if ENABLE_HOOK_DEBUG
Debug.Log($"CodePatcher_arm32_near: {PrintAddrs()}");
#endif
}
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
int val = ((int)jmpTo - (int)jmpFrom) / 4 - 2;
fixed (void* p = &ret[0])
{
byte* ptr = (byte*)p;
*ptr++ = (byte)val;
*ptr++ = (byte)(val >> 8);
*ptr++ = (byte)(val >> 16);
*ptr++ = 0xEA;
}
return ret;
}
}
public unsafe class CodePatcher_arm32_far : CodePatcher
{
private static readonly byte[] s_jmpCode = new byte[] // 8 bytes
{
0x04, 0xF0, 0x1F, 0xE5, // LDR PC, [PC, #-4]
0x00, 0x00, 0x00, 0x00, // $val
};
public CodePatcher_arm32_far(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length)
{
if (Math.Abs((long)target - (long)replace) < ((1 << 25) - 1))
throw new ArgumentException("address offset of target and replace must larger than ((1 << 25) - 1), please use InstructionModifier_arm32_near instead");
#if ENABLE_HOOK_DEBUG
Debug.Log($"CodePatcher_arm32_far: {PrintAddrs()}");
#endif
}
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
fixed (void* p = &ret[0])
{
uint* ptr = (uint*)p;
*ptr++ = 0xE51FF004;
*ptr = (uint)jmpTo;
}
return ret;
}
}
/// <summary>
/// arm64 下 ±128MB 范围内的跳转
/// </summary>
public unsafe class CodePatcher_arm64_near : CodePatcher
{
private static readonly byte[] s_jmpCode = new byte[] // 4 bytes
{
/*
* from 0x14 to 0x17 is B opcode
* offset bits is 26
* https://developer.arm.com/documentation/ddi0596/2021-09/Base-Instructions/B--Branch-
*/
0x00, 0x00, 0x00, 0x14, // B $val ; $val = (($dst - $src)/4) & 7FFFFFF
};
/// <summary>
/// B 指令的 imm26 是有符号数,以 4 字节为单位,可达范围是 -128MB ~ +128MB-4
/// </summary>
public const long MaxJmpOffset = (1L << 27) - 4;
public CodePatcher_arm64_near(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length)
{
if (Math.Abs((long)target - (long)replace) > MaxJmpOffset)
throw new ArgumentException("address offset of target and replace must not exceed ±128MB, please use CodePatcher_arm64_far instead");
// proxy 末尾要跳回 target,距离同样受 B 指令范围限制
if (proxy != IntPtr.Zero && Math.Abs((long)target - (long)proxy) > MaxJmpOffset)
throw new ArgumentException("address offset of target and proxy must not exceed ±128MB, please use CodePatcher_arm64_far instead");
#if ENABLE_HOOK_DEBUG
Debug.Log($"CodePatcher_arm64: {PrintAddrs()}");
#endif
}
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
int val = (int)((long)jmpTo - (long)jmpFrom) / 4;
fixed (void* p = &ret[0])
{
byte* ptr = (byte*)p;
*ptr++ = (byte)val;
*ptr++ = (byte)(val >> 8);
*ptr++ = (byte)(val >> 16);
byte last = (byte)(val >> 24);
last &= 0b11;
last |= 0x14;
*ptr = last;
}
return ret;
}
}
/// <summary>
/// arm64 下距离超过 ±128MB 的跳转
/// 会覆盖 target 开头 4 条指令,并把它们原样搬到 proxy 执行,所以这 4 条指令里不能有 PC 相对寻址或跳转,否则拒绝 hook
/// </summary>
public unsafe class CodePatcher_arm64_far : CodePatcher
{
private static readonly byte[] s_jmpCode = new byte[] // 16 bytes
{
/*
* LDR(literal): https://developer.arm.com/documentation/ddi0596/2021-09/Base-Instructions/LDR--literal---Load-Register--literal--
* BR: https://developer.arm.com/documentation/ddi0596/2021-09/Base-Instructions/BR--Branch-to-Register-
* X16/X17(IP0/IP1) 是 AAPCS64 规定的过程间临时寄存器,函数入口处本就允许被 veneer 改写,用来中转是安全的
*/
0x50, 0x00, 0x00, 0x58, // LDR X16, #8
0x00, 0x02, 0x1F, 0xD6, // BR X16
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // $dst
};
private readonly int _scratchReg;
public CodePatcher_arm64_far(IntPtr target, IntPtr replace, IntPtr proxy) : base(target, replace, proxy, s_jmpCode.Length)
{
int insCount = s_jmpCode.Length / 4;
uint* ins = (uint*)_pTarget;
// 没有 proxy:被覆盖的指令不会再执行,只要求函数不短于 16 字节;函数入口处 X16 可以随意改写
if (proxy == IntPtr.Zero)
{
for (int i = 0; i < insCount - 1; i++)
{
if (IsFunctionEnd(ins[i]))
throw new ArgumentException($"can not hook target 0x{(long)target:x}: instruction {i} (0x{ins[i]:X8}) ends the function, it is shorter than {s_jmpCode.Length} bytes");
}
_scratchReg = 16;
#if ENABLE_HOOK_DEBUG
Debug.Log($"CodePatcher_arm64_far: {PrintAddrs()}, scratch: X{_scratchReg}");
#endif
return;
}
for (int i = 0; i < insCount; i++)
{
if (IsPcRelativeOrBranch(ins[i]))
throw new ArgumentException($"can not hook target 0x{(long)target:x}: instruction {i} (0x{ins[i]:X8}) is pc-relative or a branch, can not be relocated");
}
// proxy 执行完搬过去的指令后跳回 target 时会改写中转寄存器,X16/X17 里挑一个此时已经没用的
if (IsDeadAfter(ins, insCount, 16))
_scratchReg = 16;
else if (IsDeadAfter(ins, insCount, 17))
_scratchReg = 17;
else
throw new ArgumentException($"can not hook target 0x{(long)target:x}: X16 and X17 may both be live after the first {insCount} instructions " +
$"({ins[0]:X8} {ins[1]:X8} {ins[2]:X8} {ins[3]:X8})");
// proxy 要写入 32 字节(搬过去的 4 条指令 + 跳回 target),前 7 条里就出现 RET 说明 proxy 太短,会写坏后面的函数
uint* proxyIns = (uint*)_pProxy;
for (int i = 0; i < s_jmpCode.Length * 2 / 4 - 1; i++)
{
if ((proxyIns[i] & 0xFFFFFC1F) == 0xD65F0000) // RET Xn
throw new ArgumentException($"proxy method at 0x{(long)proxy:x} is too short for arm64 far jump (need {s_jmpCode.Length * 2} bytes), please fill some dummy code inside");
}
#if ENABLE_HOOK_DEBUG
Debug.Log($"CodePatcher_arm64_far: {PrintAddrs()}, scratch: X{_scratchReg}");
#endif
}
protected override unsafe byte[] GenJmpCode(void* jmpFrom, void* jmpTo)
{
byte[] ret = new byte[s_jmpCode.Length];
fixed (void* p = &ret[0])
{
uint* ptr = (uint*)p;
*ptr++ = 0x58000040u | (uint)_scratchReg; // LDR Xn, #8
*ptr++ = 0xD61F0000u | ((uint)_scratchReg << 5); // BR Xn
*(long*)ptr = (long)jmpTo;
}
return ret;
}
private static bool IsPcRelativeOrBranch(uint ins)
{
return (ins & 0x1F000000) == 0x10000000 // ADR / ADRP
|| (ins & 0x7C000000) == 0x14000000 // B / BL
|| (ins & 0xFF000000) == 0x54000000 // B.cond
|| (ins & 0x7E000000) == 0x34000000 // CBZ / CBNZ
|| (ins & 0x7E000000) == 0x36000000 // TBZ / TBNZ
|| (ins & 0x3B000000) == 0x18000000 // LDR / LDRSW / PRFM (literal)
|| (ins & 0xFE000000) == 0xD6000000; // BR / BLR / RET 等寄存器跳转
}
private static bool IsFunctionEnd(uint ins)
{
return (ins & 0xFFFFFC1F) == 0xD65F0000 // RET
|| (ins & 0xFFFFFC1F) == 0xD61F0000 // BR
|| (ins & 0xFC000000) == 0x14000000; // B
}
/// <summary>
/// 粗略判断:凡是可能放寄存器号的字段等于 reg 就算用到,宁可多判
/// </summary>
private static bool MayUseReg(uint ins, int reg)
{
uint r = (uint)reg;
return (ins & 0x1F) == r || ((ins >> 5) & 0x1F) == r || ((ins >> 10) & 0x1F) == r || ((ins >> 16) & 0x1F) == r;
}
/// <summary>
/// 判断执行完前 count 条指令后 reg 是否已经没用:
/// 1. 这几条指令根本没碰它:函数入口处 X16/X17 本就没有有效值(AAPCS64 允许 veneer 随意改写);
/// 2. 最后一次访问是 add/sub/mov 把它当源操作数读掉:mono 只把 IP0/IP1 当作单条 IR 内的临时寄存器,
/// 如大栈帧序言 movz x16, #size; sub x17, sp, x16; mov sp, x17。
/// 其它指令不区分读写,一律当作可能仍在用。
/// </summary>
private static bool IsDeadAfter(uint* ins, int count, int reg)
{
uint r = (uint)reg;
for (int i = count - 1; i >= 0; i--)
{
uint x = ins[i];
if (!MayUseReg(x, reg))
continue;
bool addSubImm = (x & 0x1F000000) == 0x11000000; // ADD/SUB (immediate),含 mov sp, xN
bool addSubLogicReg = (x & 0x1F000000) == 0x0B000000 // ADD/SUB (shifted / extended register)
|| (x & 0x1F000000) == 0x0A000000; // AND/ORR/EOR (shifted register),含 mov xd, xm
if (!addSubImm && !addSubLogicReg)
return false;
if ((x & 0x1F) == r) // Rd:被改写,值可能留到后面用
return false;
if (((x >> 5) & 0x1F) == r || (addSubLogicReg && ((x >> 16) & 0x1F) == r))
return true; // Rn / Rm:作为源操作数读掉
// 只是立即数字段恰好等于 reg,不算访问,继续往前看
}
return true;
}
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7db18e1736f593c4089c85d764cf8620
guid: 97cc0d26f72fc4148b8370b2252d1585
MonoImporter:
externalObjects: {}
serializedVersion: 2
+70
View File
@@ -0,0 +1,70 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
#if UNITY_EDITOR
#endif
namespace MonoHook
{
/// <summary>
/// Hook 池,防止重复 Hook
/// </summary>
public static class HookPool
{
private static Dictionary<MethodBase, MethodHook> _hooks = new Dictionary<MethodBase, MethodHook>();
public static void AddHook(MethodBase method, MethodHook hook)
{
MethodHook preHook;
if (_hooks.TryGetValue(method, out preHook))
{
preHook.Uninstall();
_hooks[method] = hook;
}
else
_hooks.Add(method, hook);
}
public static MethodHook GetHook(MethodBase method)
{
if (method == null) return null;
MethodHook hook;
if (_hooks.TryGetValue(method, out hook))
return hook;
return null;
}
public static void RemoveHooker(MethodBase method)
{
if (method == null) return;
_hooks.Remove(method);
}
public static void UninstallAll()
{
var list = _hooks.Values.ToList();
foreach (var hook in list)
hook.Uninstall();
_hooks.Clear();
}
public static void UninstallByTag(string tag)
{
var list = _hooks.Values.ToList();
foreach (var hook in list)
{
if (hook.tag == tag)
hook.Uninstall();
}
}
public static List<MethodHook> GetAllHooks()
{
return _hooks.Values.ToList();
}
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 103704591750908419902643015e920a
guid: 6b7421e47f0ae1e4ebb72bf18d1d7d48
MonoImporter:
externalObjects: {}
serializedVersion: 2
+272
View File
@@ -0,0 +1,272 @@
#if !(UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX)
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using UnityEngine;
namespace MonoHook
{
public static unsafe class HookUtils
{
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
delegate void DelegateFlushICache(void* code, int size); // delegate * unmanaged[Cdecl] <void, byte, uint> native_flush_cache_fun_ptr; // unsupported at C# 8.0
static DelegateFlushICache flush_icache;
private static readonly long _Pagesize;
static HookUtils()
{
PropertyInfo p_SystemPageSize = typeof(Environment).GetProperty("SystemPageSize");
if (p_SystemPageSize == null)
throw new NotSupportedException("Unsupported runtime");
_Pagesize = (int)p_SystemPageSize.GetValue(null, new object[0]);
SetupFlushICacheFunc();
}
public static void MemCpy(void* pDst, void* pSrc, int len)
{
byte* pDst_ = (byte*)pDst;
byte* pSrc_ = (byte*)pSrc;
for (int i = 0; i < len; i++)
*pDst_++ = *pSrc_++;
}
public static void MemCpy_Jit(void* pDst, byte[] src)
{
fixed (void* p = &src[0])
{
MemCpy(pDst, p, src.Length);
}
}
/// <summary>
/// set flags of address to `read write execute`
/// </summary>
public static void SetAddrFlagsToRWX(IntPtr ptr, int size)
{
if (ptr == IntPtr.Zero)
return;
#if UNITY_EDITOR_WIN || (!UNITY_EDITOR && UNITY_STANDALONE_WIN)
uint oldProtect;
bool ret = VirtualProtect(ptr, (uint)size, Protection.PAGE_EXECUTE_READWRITE, out oldProtect);
UnityEngine.Debug.Assert(ret);
#else
SetMemPerms(ptr,(ulong)size,MmapProts.PROT_READ | MmapProts.PROT_WRITE | MmapProts.PROT_EXEC);
#endif
}
public static void FlushICache(void* code, int size)
{
if (code == null)
return;
flush_icache?.Invoke(code, size);
#if ENABLE_HOOK_DEBUG
Debug.Log($"flush icache at 0x{(IntPtr.Size == 4 ? (uint)code : (ulong)code):x}, size:{size}");
#endif
}
public static KeyValuePair<long, long> GetPageAlignedAddr(long code, int size)
{
long pagesize = _Pagesize;
long startPage = (code) & ~(pagesize - 1);
long endPage = (code + size + pagesize - 1) & ~(pagesize - 1);
return new KeyValuePair<long, long>(startPage, endPage);
}
const int PRINT_SPLIT = 4;
const int PRINT_COL_SIZE = PRINT_SPLIT * 4;
public static string HexToString(void* ptr, int size, int offset = 0)
{
Func<IntPtr, string> formatAddr = (IntPtr addr__) => IntPtr.Size == 4 ? $"0x{(uint)addr__:x}" : $"0x{(ulong)addr__:x}";
byte* addr = (byte*)ptr;
StringBuilder sb = new StringBuilder(1024);
sb.AppendLine($"addr:{formatAddr(new IntPtr(addr))}");
addr += offset;
size += Math.Abs(offset);
int count = 0;
while (true)
{
sb.Append($"\r\n{formatAddr(new IntPtr(addr + count))}: ");
for (int i = 1; i < PRINT_COL_SIZE + 1; i++)
{
if (count >= size)
goto END;
sb.Append($"{*(addr + count):x2}");
if (i % PRINT_SPLIT == 0)
sb.Append(" ");
count++;
}
}
END:;
return sb.ToString();
}
static void SetupFlushICacheFunc()
{
string processorType = SystemInfo.processorType.ToLowerInvariant();
if (processorType.Contains("intel") || processorType.Contains("amd"))
return;
if (IntPtr.Size == 4)
{
// never release, so save GCHandle is unnecessary
s_ptr_flush_icache_arm32 = GCHandle.Alloc(s_flush_icache_arm32, GCHandleType.Pinned).AddrOfPinnedObject().ToPointer();
SetAddrFlagsToRWX(new IntPtr(s_ptr_flush_icache_arm32), s_flush_icache_arm32.Length);
flush_icache = Marshal.GetDelegateForFunctionPointer<DelegateFlushICache>(new IntPtr(s_ptr_flush_icache_arm32));
}
else
{
s_ptr_flush_icache_arm64 = GCHandle.Alloc(s_flush_icache_arm64, GCHandleType.Pinned).AddrOfPinnedObject().ToPointer();
SetAddrFlagsToRWX(new IntPtr(s_ptr_flush_icache_arm64), s_flush_icache_arm64.Length);
flush_icache = Marshal.GetDelegateForFunctionPointer<DelegateFlushICache>(new IntPtr(s_ptr_flush_icache_arm64));
}
#if ENABLE_HOOK_DEBUG
Debug.Log($"flush_icache delegate is {((flush_icache != null) ? "not " : "")}null");
#endif
}
static void* s_ptr_flush_icache_arm32, s_ptr_flush_icache_arm64;
private static byte[] s_flush_icache_arm32 = new byte[]
{
// void cdecl mono_arch_flush_icache (guint8 *code, gint size)
0x00, 0x48, 0x2D, 0xE9, // PUSH {R11,LR}
0x0D, 0xB0, 0xA0, 0xE1, // MOV R11, SP
0x08, 0xD0, 0x4D, 0xE2, // SUB SP, SP, #8
0x04, 0x00, 0x8D, 0xE5, // STR R0, [SP,#8+var_4]
0x00, 0x10, 0x8D, 0xE5, // STR R1, [SP,#8+var_8]
0x04, 0x00, 0x9D, 0xE5, // LDR R0, [SP,#8+var_4]
0x04, 0x10, 0x9D, 0xE5, // LDR R1, [SP,#8+var_4]
0x00, 0x20, 0x9D, 0xE5, // LDR R2, [SP,#8+var_8]
0x02, 0x10, 0x81, 0xE0, // ADD R1, R1, R2
0x01, 0x00, 0x00, 0xEB, // BL __clear_cache
0x0B, 0xD0, 0xA0, 0xE1, // MOV SP, R11
0x00, 0x88, 0xBD, 0xE8, // POP {R11,PC}
// __clear_cache ; CODE XREF: j___clear_cache+8↑j
0x80, 0x00, 0x2D, 0xE9, // PUSH { R7 }
0x02, 0x70, 0x00, 0xE3, 0x0F, 0x70, 0x40, 0xE3, // MOV R7, #0xF0002
0x00, 0x20, 0xA0, 0xE3, // MOV R2, #0
0x00, 0x00, 0x00, 0xEF, // SVC 0
0x80, 0x00, 0xBD, 0xE8, // POP {R7}
0x1E, 0xFF, 0x2F, 0xE1, // BX LR
};
private static byte[] s_flush_icache_arm64 = new byte[] // X0: code, W1: size
{
// void cdecl mono_arch_flush_icache (guint8 *code, gint size)
0xFF, 0xC3, 0x00, 0xD1, // SUB SP, SP, #0x30
0xE8, 0x03, 0x7E, 0xB2, // MOV X8, #4
0xE0, 0x17, 0x00, 0xF9, // STR X0, [SP,#0x30+var_8]
0xE1, 0x27, 0x00, 0xB9, // STR W1, [SP,#0x30+var_C]
0xE0, 0x17, 0x40, 0xF9, // LDR X0, [SP,#0x30+var_8]
0xE9, 0x27, 0x80, 0xB9, // LDRSW X9, [SP,#0x30+var_C]
0x09, 0x00, 0x09, 0x8B, // ADD X9, X0, X9
0xE9, 0x0F, 0x00, 0xF9, // STR X9, [SP,#0x30+var_18]
0xE8, 0x07, 0x00, 0xF9, // STR X8, [SP,#0x30+var_28]
0xE8, 0x03, 0x00, 0xF9, // STR X8, [SP,#0x30+var_30]
0xE8, 0x17, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_8]
0x08, 0xF5, 0x7E, 0x92, // AND X8, X8, #0xFFFFFFFFFFFFFFFC
0xE8, 0x0B, 0x00, 0xF9, // STR X8, [SP,#0x30+var_20]
// loc_590 ; CODE XREF: mono_arch_flush_icache(uchar*, int)+58↓j
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0xE9, 0x0F, 0x40, 0xF9, // LDR X9, [SP,#0x30+var_18]
0x1F, 0x01, 0x09, 0xEB, // CMP X8, X9
0xE2, 0x00, 0x00, 0x54, // B.CS loc_5B8
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0x28, 0x7E, 0x0B, 0xD5, // SYS #3, c7, c14, #1, X8
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0x08, 0x11, 0x00, 0x91, // ADD X8, X8, #4
0xE8, 0x0B, 0x00, 0xF9, // STR X8, [SP,#0x30+var_20]
0xF7, 0xFF, 0xFF, 0x17, // B loc_590
// ; ---------------------------------------------------------------------------
// loc_5B8 ; CODE XREF: mono_arch_flush_icache(uchar *, int)+40↑j
0x9F, 0x3B, 0x03, 0xD5, // DSB ISH
0xE8, 0x17, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_8]
0x08, 0xF5, 0x7E, 0x92, // AND X8, X8, #0xFFFFFFFFFFFFFFFC
0xE8, 0x0B, 0x00, 0xF9, // STR X8, [SP,#0x30+var_20]
// loc_5C8 ; CODE XREF: mono_arch_flush_icache(uchar *, int)+90↓j
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0xE9, 0x0F, 0x40, 0xF9, // LDR X9, [SP,#0x30+var_18]
0x1F, 0x01, 0x09, 0xEB, // CMP X8, X9
0xE2, 0x00, 0x00, 0x54, // B.CS loc_5F0
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0x28, 0x75, 0x0B, 0xD5, // SYS #3, c7, c5, #1, X8
0xE8, 0x0B, 0x40, 0xF9, // LDR X8, [SP,#0x30+var_20]
0x08, 0x11, 0x00, 0x91, // ADD X8, X8, #4
0xE8, 0x0B, 0x00, 0xF9, // STR X8, [SP,#0x30+var_20]
0xF7, 0xFF, 0xFF, 0x17, // B loc_5C8
// ; ---------------------------------------------------------------------------
// loc_5F0 ; CODE XREF: mono_arch_flush_icache(uchar *, int)+78↑j
0x9F, 0x3B, 0x03, 0xD5, // DSB ISH
0xDF, 0x3F, 0x03, 0xD5, // ISB
0xFF, 0xC3, 0x00, 0x91, // ADD SP, SP, #0x30 ; '0'
0xC0, 0x03, 0x5F, 0xD6, // RET
};
#if UNITY_EDITOR_WIN || (!UNITY_EDITOR && UNITY_STANDALONE_WIN)
[Flags]
public enum Protection
{
PAGE_NOACCESS = 0x01,
PAGE_READONLY = 0x02,
PAGE_READWRITE = 0x04,
PAGE_WRITECOPY = 0x08,
PAGE_EXECUTE = 0x10,
PAGE_EXECUTE_READ = 0x20,
PAGE_EXECUTE_READWRITE = 0x40,
PAGE_EXECUTE_WRITECOPY = 0x80,
PAGE_GUARD = 0x100,
PAGE_NOCACHE = 0x200,
PAGE_WRITECOMBINE = 0x400
}
[DllImport("kernel32")]
public static extern bool VirtualProtect(IntPtr lpAddress, uint dwSize, Protection flNewProtect, out uint lpflOldProtect);
#else
[Flags]
public enum MmapProts : int {
PROT_READ = 0x1,
PROT_WRITE = 0x2,
PROT_EXEC = 0x4,
PROT_NONE = 0x0,
PROT_GROWSDOWN = 0x01000000,
PROT_GROWSUP = 0x02000000,
}
[DllImport("libc", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
private static extern int mprotect(IntPtr start, IntPtr len, MmapProts prot);
public static unsafe void SetMemPerms(IntPtr start, ulong len, MmapProts prot) {
var requiredAddr = GetPageAlignedAddr(start.ToInt64(), (int)len);
long startPage = requiredAddr.Key;
long endPage = requiredAddr.Value;
if (mprotect((IntPtr) startPage, (IntPtr) (endPage - startPage), prot) != 0)
throw new Exception($"mprotect with prot:{prot} fail!");
}
#endif
}
}
#endif
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 78d06a3ad750c0b4b80b583188b02df3
guid: e84139b42a6164e4c93ce4df1be6dcfb
MonoImporter:
externalObjects: {}
serializedVersion: 2
+116
View File
@@ -0,0 +1,116 @@
#if (UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX)
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using UnityEngine;
namespace MonoHook
{
public static unsafe class HookUtils
{
static bool jit_write_protect_supported;
private static readonly long _Pagesize;
static HookUtils()
{
try
{
jit_write_protect_supported = pthread_jit_write_protect_supported_np() != 0;
}
catch { }
PropertyInfo p_SystemPageSize = typeof(Environment).GetProperty("SystemPageSize");
if (p_SystemPageSize == null)
throw new NotSupportedException("Unsupported runtime");
_Pagesize = (int)p_SystemPageSize.GetValue(null, new object[0]);
}
public static void MemCpy(void* pDst, void* pSrc, int len)
{
byte* pDst_ = (byte*)pDst;
byte* pSrc_ = (byte*)pSrc;
for (int i = 0; i < len; i++)
*pDst_++ = *pSrc_++;
}
public static void MemCpy_Jit(void* pDst, byte[] src)
{
if (!jit_write_protect_supported)
{
fixed(void * pSrc = &src[0])
{
MemCpy(pDst, pSrc, src.Length);
}
return;
}
fixed(void * p = &src[0])
{
memcpy_jit(new IntPtr(pDst), new IntPtr(p), src.Length);
}
}
/// <summary>
/// set flags of address to `read write execute`
/// </summary>
public static void SetAddrFlagsToRWX(IntPtr ptr, int size) { }
public static void FlushICache(void* code, int size) { }
public static KeyValuePair<long, long> GetPageAlignedAddr(long code, int size)
{
long pagesize = _Pagesize;
long startPage = (code) & ~(pagesize - 1);
long endPage = (code + size + pagesize - 1) & ~(pagesize - 1);
return new KeyValuePair<long, long>(startPage, endPage);
}
const int PRINT_SPLIT = 4;
const int PRINT_COL_SIZE = PRINT_SPLIT * 4;
public static string HexToString(void* ptr, int size, int offset = 0)
{
Func<IntPtr, string> formatAddr = (IntPtr addr__) => IntPtr.Size == 4 ? $"0x{(uint)addr__:x}" : $"0x{(ulong)addr__:x}";
byte* addr = (byte*)ptr;
StringBuilder sb = new StringBuilder(1024);
sb.AppendLine($"addr:{formatAddr(new IntPtr(addr))}");
addr += offset;
size += Math.Abs(offset);
int count = 0;
while (true)
{
sb.Append($"\r\n{formatAddr(new IntPtr(addr + count))}: ");
for (int i = 1; i < PRINT_COL_SIZE + 1; i++)
{
if (count >= size)
goto END;
sb.Append($"{*(addr + count):x2}");
if (i % PRINT_SPLIT == 0)
sb.Append(" ");
count++;
}
}
END:;
return sb.ToString();
}
[DllImport("pthread", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
private static extern int pthread_jit_write_protect_supported_np();
[DllImport("libMonoHookUtils_OSX", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
private static extern IntPtr memcpy_jit(IntPtr dst, IntPtr src, int len);
}
}
#endif
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b9f06ff0612105b4ea20e0309e759e24
guid: efda6e010e5c6594081c4a62861d469f
MonoImporter:
externalObjects: {}
serializedVersion: 2
+905
View File
@@ -0,0 +1,905 @@
using System;
using System.Runtime.InteropServices;
namespace DotNetDetour
{
/// <summary>
/// 用于计算汇编指令长度,使用的是BlackBone的LDasm.c中的算法,我把他翻译成C#了
/// </summary>
public unsafe class LDasm
{
const int F_INVALID = 0x01;
const int F_PREFIX = 0x02;
const int F_REX = 0x04;
const int F_MODRM = 0x08;
const int F_SIB = 0x10;
const int F_DISP = 0x20;
const int F_IMM = 0x40;
const int F_RELATIVE = 0x80;
const int OP_NONE = 0x00;
const int OP_INVALID = 0x80;
const int OP_DATA_I8 = 0x01;
const int OP_DATA_I16 = 0x02;
const int OP_DATA_I16_I32 = 0x04;
const int OP_DATA_I16_I32_I64 = 0x08;
const int OP_EXTENDED = 0x10;
const int OP_RELATIVE = 0x20;
const int OP_MODRM = 0x40;
const int OP_PREFIX = 0x80;
struct ldasm_data
{
public byte flags;
public byte rex;
public byte modrm;
public byte sib;
public byte opcd_offset;
public byte opcd_size;
public byte disp_offset;
public byte disp_size;
public byte imm_offset;
public byte imm_size;
}
static byte[] flags_table =
{
/* 00 */ OP_MODRM,
/* 01 */ OP_MODRM,
/* 02 */ OP_MODRM,
/* 03 */ OP_MODRM,
/* 04 */ OP_DATA_I8,
/* 05 */ OP_DATA_I16_I32,
/* 06 */ OP_NONE,
/* 07 */ OP_NONE,
/* 08 */ OP_MODRM,
/* 09 */ OP_MODRM,
/* 0A */ OP_MODRM,
/* 0B */ OP_MODRM,
/* 0C */ OP_DATA_I8,
/* 0D */ OP_DATA_I16_I32,
/* 0E */ OP_NONE,
/* 0F */ OP_NONE,
/* 10 */ OP_MODRM,
/* 11 */ OP_MODRM,
/* 12 */ OP_MODRM,
/* 13 */ OP_MODRM,
/* 14 */ OP_DATA_I8,
/* 15 */ OP_DATA_I16_I32,
/* 16 */ OP_NONE,
/* 17 */ OP_NONE,
/* 18 */ OP_MODRM,
/* 19 */ OP_MODRM,
/* 1A */ OP_MODRM,
/* 1B */ OP_MODRM,
/* 1C */ OP_DATA_I8,
/* 1D */ OP_DATA_I16_I32,
/* 1E */ OP_NONE,
/* 1F */ OP_NONE,
/* 20 */ OP_MODRM,
/* 21 */ OP_MODRM,
/* 22 */ OP_MODRM,
/* 23 */ OP_MODRM,
/* 24 */ OP_DATA_I8,
/* 25 */ OP_DATA_I16_I32,
/* 26 */ OP_PREFIX,
/* 27 */ OP_NONE,
/* 28 */ OP_MODRM,
/* 29 */ OP_MODRM,
/* 2A */ OP_MODRM,
/* 2B */ OP_MODRM,
/* 2C */ OP_DATA_I8,
/* 2D */ OP_DATA_I16_I32,
/* 2E */ OP_PREFIX,
/* 2F */ OP_NONE,
/* 30 */ OP_MODRM,
/* 31 */ OP_MODRM,
/* 32 */ OP_MODRM,
/* 33 */ OP_MODRM,
/* 34 */ OP_DATA_I8,
/* 35 */ OP_DATA_I16_I32,
/* 36 */ OP_PREFIX,
/* 37 */ OP_NONE,
/* 38 */ OP_MODRM,
/* 39 */ OP_MODRM,
/* 3A */ OP_MODRM,
/* 3B */ OP_MODRM,
/* 3C */ OP_DATA_I8,
/* 3D */ OP_DATA_I16_I32,
/* 3E */ OP_PREFIX,
/* 3F */ OP_NONE,
/* 40 */ OP_NONE,
/* 41 */ OP_NONE,
/* 42 */ OP_NONE,
/* 43 */ OP_NONE,
/* 44 */ OP_NONE,
/* 45 */ OP_NONE,
/* 46 */ OP_NONE,
/* 47 */ OP_NONE,
/* 48 */ OP_NONE,
/* 49 */ OP_NONE,
/* 4A */ OP_NONE,
/* 4B */ OP_NONE,
/* 4C */ OP_NONE,
/* 4D */ OP_NONE,
/* 4E */ OP_NONE,
/* 4F */ OP_NONE,
/* 50 */ OP_NONE,
/* 51 */ OP_NONE,
/* 52 */ OP_NONE,
/* 53 */ OP_NONE,
/* 54 */ OP_NONE,
/* 55 */ OP_NONE,
/* 56 */ OP_NONE,
/* 57 */ OP_NONE,
/* 58 */ OP_NONE,
/* 59 */ OP_NONE,
/* 5A */ OP_NONE,
/* 5B */ OP_NONE,
/* 5C */ OP_NONE,
/* 5D */ OP_NONE,
/* 5E */ OP_NONE,
/* 5F */ OP_NONE,
/* 60 */ OP_NONE,
/* 61 */ OP_NONE,
/* 62 */ OP_MODRM,
/* 63 */ OP_MODRM,
/* 64 */ OP_PREFIX,
/* 65 */ OP_PREFIX,
/* 66 */ OP_PREFIX,
/* 67 */ OP_PREFIX,
/* 68 */ OP_DATA_I16_I32,
/* 69 */ OP_MODRM | OP_DATA_I16_I32,
/* 6A */ OP_DATA_I8,
/* 6B */ OP_MODRM | OP_DATA_I8,
/* 6C */ OP_NONE,
/* 6D */ OP_NONE,
/* 6E */ OP_NONE,
/* 6F */ OP_NONE,
/* 70 */ OP_RELATIVE | OP_DATA_I8,
/* 71 */ OP_RELATIVE | OP_DATA_I8,
/* 72 */ OP_RELATIVE | OP_DATA_I8,
/* 73 */ OP_RELATIVE | OP_DATA_I8,
/* 74 */ OP_RELATIVE | OP_DATA_I8,
/* 75 */ OP_RELATIVE | OP_DATA_I8,
/* 76 */ OP_RELATIVE | OP_DATA_I8,
/* 77 */ OP_RELATIVE | OP_DATA_I8,
/* 78 */ OP_RELATIVE | OP_DATA_I8,
/* 79 */ OP_RELATIVE | OP_DATA_I8,
/* 7A */ OP_RELATIVE | OP_DATA_I8,
/* 7B */ OP_RELATIVE | OP_DATA_I8,
/* 7C */ OP_RELATIVE | OP_DATA_I8,
/* 7D */ OP_RELATIVE | OP_DATA_I8,
/* 7E */ OP_RELATIVE | OP_DATA_I8,
/* 7F */ OP_RELATIVE | OP_DATA_I8,
/* 80 */ OP_MODRM | OP_DATA_I8,
/* 81 */ OP_MODRM | OP_DATA_I16_I32,
/* 82 */ OP_MODRM | OP_DATA_I8,
/* 83 */ OP_MODRM | OP_DATA_I8,
/* 84 */ OP_MODRM,
/* 85 */ OP_MODRM,
/* 86 */ OP_MODRM,
/* 87 */ OP_MODRM,
/* 88 */ OP_MODRM,
/* 89 */ OP_MODRM,
/* 8A */ OP_MODRM,
/* 8B */ OP_MODRM,
/* 8C */ OP_MODRM,
/* 8D */ OP_MODRM,
/* 8E */ OP_MODRM,
/* 8F */ OP_MODRM,
/* 90 */ OP_NONE,
/* 91 */ OP_NONE,
/* 92 */ OP_NONE,
/* 93 */ OP_NONE,
/* 94 */ OP_NONE,
/* 95 */ OP_NONE,
/* 96 */ OP_NONE,
/* 97 */ OP_NONE,
/* 98 */ OP_NONE,
/* 99 */ OP_NONE,
/* 9A */ OP_DATA_I16 | OP_DATA_I16_I32,
/* 9B */ OP_NONE,
/* 9C */ OP_NONE,
/* 9D */ OP_NONE,
/* 9E */ OP_NONE,
/* 9F */ OP_NONE,
/* A0 */ OP_DATA_I8,
/* A1 */ OP_DATA_I16_I32_I64,
/* A2 */ OP_DATA_I8,
/* A3 */ OP_DATA_I16_I32_I64,
/* A4 */ OP_NONE,
/* A5 */ OP_NONE,
/* A6 */ OP_NONE,
/* A7 */ OP_NONE,
/* A8 */ OP_DATA_I8,
/* A9 */ OP_DATA_I16_I32,
/* AA */ OP_NONE,
/* AB */ OP_NONE,
/* AC */ OP_NONE,
/* AD */ OP_NONE,
/* AE */ OP_NONE,
/* AF */ OP_NONE,
/* B0 */ OP_DATA_I8,
/* B1 */ OP_DATA_I8,
/* B2 */ OP_DATA_I8,
/* B3 */ OP_DATA_I8,
/* B4 */ OP_DATA_I8,
/* B5 */ OP_DATA_I8,
/* B6 */ OP_DATA_I8,
/* B7 */ OP_DATA_I8,
/* B8 */ OP_DATA_I16_I32_I64,
/* B9 */ OP_DATA_I16_I32_I64,
/* BA */ OP_DATA_I16_I32_I64,
/* BB */ OP_DATA_I16_I32_I64,
/* BC */ OP_DATA_I16_I32_I64,
/* BD */ OP_DATA_I16_I32_I64,
/* BE */ OP_DATA_I16_I32_I64,
/* BF */ OP_DATA_I16_I32_I64,
/* C0 */ OP_MODRM | OP_DATA_I8,
/* C1 */ OP_MODRM | OP_DATA_I8,
/* C2 */ OP_DATA_I16,
/* C3 */ OP_NONE,
/* C4 */ OP_MODRM,
/* C5 */ OP_MODRM,
/* C6 */ OP_MODRM | OP_DATA_I8,
/* C7 */ OP_MODRM | OP_DATA_I16_I32,
/* C8 */ OP_DATA_I8 | OP_DATA_I16,
/* C9 */ OP_NONE,
/* CA */ OP_DATA_I16,
/* CB */ OP_NONE,
/* CC */ OP_NONE,
/* CD */ OP_DATA_I8,
/* CE */ OP_NONE,
/* CF */ OP_NONE,
/* D0 */ OP_MODRM,
/* D1 */ OP_MODRM,
/* D2 */ OP_MODRM,
/* D3 */ OP_MODRM,
/* D4 */ OP_DATA_I8,
/* D5 */ OP_DATA_I8,
/* D6 */ OP_NONE,
/* D7 */ OP_NONE,
/* D8 */ OP_MODRM,
/* D9 */ OP_MODRM,
/* DA */ OP_MODRM,
/* DB */ OP_MODRM,
/* DC */ OP_MODRM,
/* DD */ OP_MODRM,
/* DE */ OP_MODRM,
/* DF */ OP_MODRM,
/* E0 */ OP_RELATIVE | OP_DATA_I8,
/* E1 */ OP_RELATIVE | OP_DATA_I8,
/* E2 */ OP_RELATIVE | OP_DATA_I8,
/* E3 */ OP_RELATIVE | OP_DATA_I8,
/* E4 */ OP_DATA_I8,
/* E5 */ OP_DATA_I8,
/* E6 */ OP_DATA_I8,
/* E7 */ OP_DATA_I8,
/* E8 */ OP_RELATIVE | OP_DATA_I16_I32,
/* E9 */ OP_RELATIVE | OP_DATA_I16_I32,
/* EA */ OP_DATA_I16 | OP_DATA_I16_I32,
/* EB */ OP_RELATIVE | OP_DATA_I8,
/* EC */ OP_NONE,
/* ED */ OP_NONE,
/* EE */ OP_NONE,
/* EF */ OP_NONE,
/* F0 */ OP_PREFIX,
/* F1 */ OP_NONE,
/* F2 */ OP_PREFIX,
/* F3 */ OP_PREFIX,
/* F4 */ OP_NONE,
/* F5 */ OP_NONE,
/* F6 */ OP_MODRM,
/* F7 */ OP_MODRM,
/* F8 */ OP_NONE,
/* F9 */ OP_NONE,
/* FA */ OP_NONE,
/* FB */ OP_NONE,
/* FC */ OP_NONE,
/* FD */ OP_NONE,
/* FE */ OP_MODRM,
/* FF */ OP_MODRM
};
static byte[] flags_table_ex =
{
/* 0F00 */ OP_MODRM,
/* 0F01 */ OP_MODRM,
/* 0F02 */ OP_MODRM,
/* 0F03 */ OP_MODRM,
/* 0F04 */ OP_INVALID,
/* 0F05 */ OP_NONE,
/* 0F06 */ OP_NONE,
/* 0F07 */ OP_NONE,
/* 0F08 */ OP_NONE,
/* 0F09 */ OP_NONE,
/* 0F0A */ OP_INVALID,
/* 0F0B */ OP_NONE,
/* 0F0C */ OP_INVALID,
/* 0F0D */ OP_MODRM,
/* 0F0E */ OP_INVALID,
/* 0F0F */ OP_MODRM | OP_DATA_I8, //3Dnow
/* 0F10 */ OP_MODRM,
/* 0F11 */ OP_MODRM,
/* 0F12 */ OP_MODRM,
/* 0F13 */ OP_MODRM,
/* 0F14 */ OP_MODRM,
/* 0F15 */ OP_MODRM,
/* 0F16 */ OP_MODRM,
/* 0F17 */ OP_MODRM,
/* 0F18 */ OP_MODRM,
/* 0F19 */ OP_INVALID,
/* 0F1A */ OP_INVALID,
/* 0F1B */ OP_INVALID,
/* 0F1C */ OP_INVALID,
/* 0F1D */ OP_INVALID,
/* 0F1E */ OP_INVALID,
/* 0F1F */ OP_NONE,
/* 0F20 */ OP_MODRM,
/* 0F21 */ OP_MODRM,
/* 0F22 */ OP_MODRM,
/* 0F23 */ OP_MODRM,
/* 0F24 */ OP_MODRM | OP_EXTENDED, //SSE5
/* 0F25 */ OP_INVALID,
/* 0F26 */ OP_MODRM,
/* 0F27 */ OP_INVALID,
/* 0F28 */ OP_MODRM,
/* 0F29 */ OP_MODRM,
/* 0F2A */ OP_MODRM,
/* 0F2B */ OP_MODRM,
/* 0F2C */ OP_MODRM,
/* 0F2D */ OP_MODRM,
/* 0F2E */ OP_MODRM,
/* 0F2F */ OP_MODRM,
/* 0F30 */ OP_NONE,
/* 0F31 */ OP_NONE,
/* 0F32 */ OP_NONE,
/* 0F33 */ OP_NONE,
/* 0F34 */ OP_NONE,
/* 0F35 */ OP_NONE,
/* 0F36 */ OP_INVALID,
/* 0F37 */ OP_NONE,
/* 0F38 */ OP_MODRM | OP_EXTENDED,
/* 0F39 */ OP_INVALID,
/* 0F3A */ OP_MODRM | OP_EXTENDED | OP_DATA_I8,
/* 0F3B */ OP_INVALID,
/* 0F3C */ OP_INVALID,
/* 0F3D */ OP_INVALID,
/* 0F3E */ OP_INVALID,
/* 0F3F */ OP_INVALID,
/* 0F40 */ OP_MODRM,
/* 0F41 */ OP_MODRM,
/* 0F42 */ OP_MODRM,
/* 0F43 */ OP_MODRM,
/* 0F44 */ OP_MODRM,
/* 0F45 */ OP_MODRM,
/* 0F46 */ OP_MODRM,
/* 0F47 */ OP_MODRM,
/* 0F48 */ OP_MODRM,
/* 0F49 */ OP_MODRM,
/* 0F4A */ OP_MODRM,
/* 0F4B */ OP_MODRM,
/* 0F4C */ OP_MODRM,
/* 0F4D */ OP_MODRM,
/* 0F4E */ OP_MODRM,
/* 0F4F */ OP_MODRM,
/* 0F50 */ OP_MODRM,
/* 0F51 */ OP_MODRM,
/* 0F52 */ OP_MODRM,
/* 0F53 */ OP_MODRM,
/* 0F54 */ OP_MODRM,
/* 0F55 */ OP_MODRM,
/* 0F56 */ OP_MODRM,
/* 0F57 */ OP_MODRM,
/* 0F58 */ OP_MODRM,
/* 0F59 */ OP_MODRM,
/* 0F5A */ OP_MODRM,
/* 0F5B */ OP_MODRM,
/* 0F5C */ OP_MODRM,
/* 0F5D */ OP_MODRM,
/* 0F5E */ OP_MODRM,
/* 0F5F */ OP_MODRM,
/* 0F60 */ OP_MODRM,
/* 0F61 */ OP_MODRM,
/* 0F62 */ OP_MODRM,
/* 0F63 */ OP_MODRM,
/* 0F64 */ OP_MODRM,
/* 0F65 */ OP_MODRM,
/* 0F66 */ OP_MODRM,
/* 0F67 */ OP_MODRM,
/* 0F68 */ OP_MODRM,
/* 0F69 */ OP_MODRM,
/* 0F6A */ OP_MODRM,
/* 0F6B */ OP_MODRM,
/* 0F6C */ OP_MODRM,
/* 0F6D */ OP_MODRM,
/* 0F6E */ OP_MODRM,
/* 0F6F */ OP_MODRM,
/* 0F70 */ OP_MODRM | OP_DATA_I8,
/* 0F71 */ OP_MODRM | OP_DATA_I8,
/* 0F72 */ OP_MODRM | OP_DATA_I8,
/* 0F73 */ OP_MODRM | OP_DATA_I8,
/* 0F74 */ OP_MODRM,
/* 0F75 */ OP_MODRM,
/* 0F76 */ OP_MODRM,
/* 0F77 */ OP_NONE,
/* 0F78 */ OP_MODRM,
/* 0F79 */ OP_MODRM,
/* 0F7A */ OP_INVALID,
/* 0F7B */ OP_INVALID,
/* 0F7C */ OP_MODRM,
/* 0F7D */ OP_MODRM,
/* 0F7E */ OP_MODRM,
/* 0F7F */ OP_MODRM,
/* 0F80 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F81 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F82 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F83 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F84 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F85 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F86 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F87 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F88 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F89 */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8A */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8B */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8C */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8D */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8E */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F8F */ OP_RELATIVE | OP_DATA_I16_I32,
/* 0F90 */ OP_MODRM,
/* 0F91 */ OP_MODRM,
/* 0F92 */ OP_MODRM,
/* 0F93 */ OP_MODRM,
/* 0F94 */ OP_MODRM,
/* 0F95 */ OP_MODRM,
/* 0F96 */ OP_MODRM,
/* 0F97 */ OP_MODRM,
/* 0F98 */ OP_MODRM,
/* 0F99 */ OP_MODRM,
/* 0F9A */ OP_MODRM,
/* 0F9B */ OP_MODRM,
/* 0F9C */ OP_MODRM,
/* 0F9D */ OP_MODRM,
/* 0F9E */ OP_MODRM,
/* 0F9F */ OP_MODRM,
/* 0FA0 */ OP_NONE,
/* 0FA1 */ OP_NONE,
/* 0FA2 */ OP_NONE,
/* 0FA3 */ OP_MODRM,
/* 0FA4 */ OP_MODRM | OP_DATA_I8,
/* 0FA5 */ OP_MODRM,
/* 0FA6 */ OP_INVALID,
/* 0FA7 */ OP_INVALID,
/* 0FA8 */ OP_NONE,
/* 0FA9 */ OP_NONE,
/* 0FAA */ OP_NONE,
/* 0FAB */ OP_MODRM,
/* 0FAC */ OP_MODRM | OP_DATA_I8,
/* 0FAD */ OP_MODRM,
/* 0FAE */ OP_MODRM,
/* 0FAF */ OP_MODRM,
/* 0FB0 */ OP_MODRM,
/* 0FB1 */ OP_MODRM,
/* 0FB2 */ OP_MODRM,
/* 0FB3 */ OP_MODRM,
/* 0FB4 */ OP_MODRM,
/* 0FB5 */ OP_MODRM,
/* 0FB6 */ OP_MODRM,
/* 0FB7 */ OP_MODRM,
/* 0FB8 */ OP_MODRM,
/* 0FB9 */ OP_MODRM,
/* 0FBA */ OP_MODRM | OP_DATA_I8,
/* 0FBB */ OP_MODRM,
/* 0FBC */ OP_MODRM,
/* 0FBD */ OP_MODRM,
/* 0FBE */ OP_MODRM,
/* 0FBF */ OP_MODRM,
/* 0FC0 */ OP_MODRM,
/* 0FC1 */ OP_MODRM,
/* 0FC2 */ OP_MODRM | OP_DATA_I8,
/* 0FC3 */ OP_MODRM,
/* 0FC4 */ OP_MODRM | OP_DATA_I8,
/* 0FC5 */ OP_MODRM | OP_DATA_I8,
/* 0FC6 */ OP_MODRM | OP_DATA_I8,
/* 0FC7 */ OP_MODRM,
/* 0FC8 */ OP_NONE,
/* 0FC9 */ OP_NONE,
/* 0FCA */ OP_NONE,
/* 0FCB */ OP_NONE,
/* 0FCC */ OP_NONE,
/* 0FCD */ OP_NONE,
/* 0FCE */ OP_NONE,
/* 0FCF */ OP_NONE,
/* 0FD0 */ OP_MODRM,
/* 0FD1 */ OP_MODRM,
/* 0FD2 */ OP_MODRM,
/* 0FD3 */ OP_MODRM,
/* 0FD4 */ OP_MODRM,
/* 0FD5 */ OP_MODRM,
/* 0FD6 */ OP_MODRM,
/* 0FD7 */ OP_MODRM,
/* 0FD8 */ OP_MODRM,
/* 0FD9 */ OP_MODRM,
/* 0FDA */ OP_MODRM,
/* 0FDB */ OP_MODRM,
/* 0FDC */ OP_MODRM,
/* 0FDD */ OP_MODRM,
/* 0FDE */ OP_MODRM,
/* 0FDF */ OP_MODRM,
/* 0FE0 */ OP_MODRM,
/* 0FE1 */ OP_MODRM,
/* 0FE2 */ OP_MODRM,
/* 0FE3 */ OP_MODRM,
/* 0FE4 */ OP_MODRM,
/* 0FE5 */ OP_MODRM,
/* 0FE6 */ OP_MODRM,
/* 0FE7 */ OP_MODRM,
/* 0FE8 */ OP_MODRM,
/* 0FE9 */ OP_MODRM,
/* 0FEA */ OP_MODRM,
/* 0FEB */ OP_MODRM,
/* 0FEC */ OP_MODRM,
/* 0FED */ OP_MODRM,
/* 0FEE */ OP_MODRM,
/* 0FEF */ OP_MODRM,
/* 0FF0 */ OP_MODRM,
/* 0FF1 */ OP_MODRM,
/* 0FF2 */ OP_MODRM,
/* 0FF3 */ OP_MODRM,
/* 0FF4 */ OP_MODRM,
/* 0FF5 */ OP_MODRM,
/* 0FF6 */ OP_MODRM,
/* 0FF7 */ OP_MODRM,
/* 0FF8 */ OP_MODRM,
/* 0FF9 */ OP_MODRM,
/* 0FFA */ OP_MODRM,
/* 0FFB */ OP_MODRM,
/* 0FFC */ OP_MODRM,
/* 0FFD */ OP_MODRM,
/* 0FFE */ OP_MODRM,
/* 0FFF */ OP_INVALID,
};
static byte cflags(byte op)
{
return flags_table[op];
}
static byte cflags_ex(byte op)
{
return flags_table_ex[op];
}
/// <summary>
/// 计算大于等于 size 字节的最少指令的长度
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
public static uint SizeofMinNumByte(void* code, int size)
{
if (IsARM())
return (uint)((size + 3) / 4) * 4; // 此为 jit 模式下的长度,不再支持 thumb
uint Length;
byte* pOpcode;
uint Result = 0;
ldasm_data data = new ldasm_data();
bool is64 = IntPtr.Size == 8;
do
{
Length = ldasm(code, data, is64);
pOpcode = (byte*)code + data.opcd_offset;
Result += Length;
if (Result >= size)
break;
if ((Length == 1) && (*pOpcode == 0xCC))
break;
code = (void*)((ulong)code + Length);
} while (Length > 0);
return Result;
}
static bool? s_isArm;
public static bool IsARM()
{
if (s_isArm.HasValue)
return s_isArm.Value;
var arch = RuntimeInformation.ProcessArchitecture;
s_isArm = arch == Architecture.Arm || arch == Architecture.Arm64;
return s_isArm.Value;
}
public static bool IsArm32()
{
return IsARM() && IntPtr.Size == 4;
}
public static bool IsArm64()
{
return IsARM() && IntPtr.Size == 8;
}
static bool? s_isiOS;
public static bool IsiOS()
{
if (s_isiOS.HasValue)
return s_isiOS.Value;
s_isiOS = UnityEngine.SystemInfo.operatingSystem.ToLower().Contains("ios");
return s_isiOS.Value;
}
static bool? s_isIL2CPP;
public static bool IsIL2CPP()
{
if (s_isIL2CPP.HasValue)
return s_isIL2CPP.Value;
try
{
byte[] ilBody = typeof(LDasm).GetMethod("IsIL2CPP").GetMethodBody().GetILAsByteArray();
if (ilBody == null || ilBody.Length == 0)
s_isIL2CPP = true;
else
s_isIL2CPP = false;
}
catch
{
s_isIL2CPP = true;
}
return s_isIL2CPP.Value;
}
public static bool IsThumb(IntPtr code)
{
return IsArm32() && ((long)code & 0x1) == 0x1;
}
/// <summary>
/// 计算 thumb 指令长度
/// </summary>
/// <param name="code"></param>
/// <param name="size"></param>
/// <returns></returns>
public static uint CalcARMThumbMinLen(void* code, int size)
{
uint len = 0;
ushort* ins = (ushort*)code;
while (true)
{
if (len >= size)
return len;
if (((*ins >> 13) & 3) == 3)
{
ins += 2;
len += 4;
}
else
{
ins++;
len += 2;
}
}
}
static uint ldasm(void* code, ldasm_data ld, bool is64)
{
byte* p = (byte*)code;
byte s, op, f;
byte rexw, pr_66, pr_67;
s = rexw = pr_66 = pr_67 = 0;
/* dummy check */
if ((int)code == 0)
return 0;
/* init output data */
//memset(ld, 0, sizeof(ldasm_data));
/* phase 1: parse prefixies */
while ((cflags(*p) & OP_PREFIX) != 0)
{
if (*p == 0x66)
pr_66 = 1;
if (*p == 0x67)
pr_67 = 1;
p++; s++;
ld.flags |= F_PREFIX;
if (s == 15)
{
ld.flags |= F_INVALID;
return s;
}
}
/* parse REX prefix */
if (is64 && *p >> 4 == 4)
{
ld.rex = *p;
rexw = (byte)((ld.rex >> 3) & 1);
ld.flags |= F_REX;
p++; s++;
}
/* can be only one REX prefix */
if (is64 && *p >> 4 == 4)
{
ld.flags |= F_INVALID;
s++;
return s;
}
/* phase 2: parse opcode */
ld.opcd_offset = (byte)(p - (byte*)code);
ld.opcd_size = 1;
op = *p++; s++;
/* is 2 byte opcode? */
if (op == 0x0F)
{
op = *p++; s++;
ld.opcd_size++;
f = cflags_ex(op);
if ((f & OP_INVALID) != 0)
{
ld.flags |= F_INVALID;
return s;
}
/* for SSE instructions */
if ((f & OP_EXTENDED) != 0)
{
op = *p++; s++;
ld.opcd_size++;
}
}
else
{
f = cflags(op);
/* pr_66 = pr_67 for opcodes A0-A3 */
if (op >= 0xA0 && op <= 0xA3)
pr_66 = pr_67;
}
/* phase 3: parse ModR/M, SIB and DISP */
if ((f & OP_MODRM) != 0)
{
byte mod = (byte)(*p >> 6);
byte ro = (byte)((*p & 0x38) >> 3);
byte rm = (byte)(*p & 7);
ld.modrm = *p++; s++;
ld.flags |= F_MODRM;
/* in F6,F7 opcodes immediate data present if R/O == 0 */
if (op == 0xF6 && (ro == 0 || ro == 1))
f |= OP_DATA_I8;
if (op == 0xF7 && (ro == 0 || ro == 1))
f |= OP_DATA_I16_I32_I64;
/* is SIB byte exist? */
if (mod != 3 && rm == 4 && !(!is64 && pr_67 != 0))
{
ld.sib = *p++; s++;
ld.flags |= F_SIB;
/* if base == 5 and mod == 0 */
if ((ld.sib & 7) == 5 && mod == 0)
{
ld.disp_size = 4;
}
}
switch (mod)
{
case 0:
if (is64)
{
if (rm == 5)
{
ld.disp_size = 4;
if (is64)
ld.flags |= F_RELATIVE;
}
}
else if (pr_67 != 0)
{
if (rm == 6)
ld.disp_size = 2;
}
else
{
if (rm == 5)
ld.disp_size = 4;
}
break;
case 1:
ld.disp_size = 1;
break;
case 2:
if (is64)
ld.disp_size = 4;
else if (pr_67 != 0)
ld.disp_size = 2;
else
ld.disp_size = 4;
break;
}
if (ld.disp_size > 0)
{
ld.disp_offset = (byte)(p - (byte*)code);
p += ld.disp_size;
s += ld.disp_size;
ld.flags |= F_DISP;
}
}
/* phase 4: parse immediate data */
if (rexw != 0 && (f & OP_DATA_I16_I32_I64) != 0)
ld.imm_size = 8;
else if ((f & OP_DATA_I16_I32) != 0 || (f & OP_DATA_I16_I32_I64) != 0)
ld.imm_size = (byte)(4 - (pr_66 << 1));
/* if exist, add OP_DATA_I16 and OP_DATA_I8 size */
ld.imm_size += (byte)(f & 3);
if ((ld.imm_size) != 0)
{
s += ld.imm_size;
ld.imm_offset = (byte)(p - (byte*)code);
ld.flags |= F_IMM;
if ((f & OP_RELATIVE) != 0)
ld.flags |= F_RELATIVE;
}
/* instruction is too long */
if (s > 15)
ld.flags |= F_INVALID;
return s;
}
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3c561c9729c367e4fbef63f4ec56f268
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+21
View File
@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2018 Misaka Mikoto
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cbb71cfc70bb1304f9527eb7ca5d38ee
guid: 9298d9b76a5b2074da06bd90eb3bb6fd
DefaultImporter:
externalObjects: {}
userData:
+385
View File
@@ -0,0 +1,385 @@
/*
Desc: 一个可以运行时 Hook Mono 方法的工具,让你可以无需修改 UnityEditor.dll 等文件就可以重写其函数功能
Author: Misaka Mikoto
Github: https://github.com/Misaka-Mikoto-Tech/MonoHook
*/
using DotNetDetour;
using System;
using System.Reflection;
using System.Runtime.InteropServices;
#if UNITY_EDITOR
#endif
using UnityEngine;
/*
>>>>>>> 原始 UnityEditor.LogEntries.Clear 一型(.net 4.x)
0000000000403A00 < | 55 | push rbp |
0000000000403A01 | 48 8B EC | mov rbp,rsp |
0000000000403A04 | 48 81 EC 80 00 00 00 | sub rsp,80 |
0000000000403A0B | 48 89 65 B0 | mov qword ptr ss:[rbp-50],rsp |
0000000000403A0F | 48 89 6D A8 | mov qword ptr ss:[rbp-58],rbp |
0000000000403A13 | 48 89 5D C8 | mov qword ptr ss:[rbp-38],rbx | <<
0000000000403A17 | 48 89 75 D0 | mov qword ptr ss:[rbp-30],rsi |
0000000000403A1B | 48 89 7D D8 | mov qword ptr ss:[rbp-28],rdi |
0000000000403A1F | 4C 89 65 E0 | mov qword ptr ss:[rbp-20],r12 |
0000000000403A23 | 4C 89 6D E8 | mov qword ptr ss:[rbp-18],r13 |
0000000000403A27 | 4C 89 75 F0 | mov qword ptr ss:[rbp-10],r14 |
0000000000403A2B | 4C 89 7D F8 | mov qword ptr ss:[rbp-8],r15 |
0000000000403A2F | 49 BB 00 2D 1E 1A FE 7F 00 00 | mov r11,7FFE1A1E2D00 |
0000000000403A39 | 4C 89 5D B8 | mov qword ptr ss:[rbp-48],r11 |
0000000000403A3D | 49 BB 08 2D 1E 1A FE 7F 00 00 | mov r11,7FFE1A1E2D08 |
>>>>>>> 二型(.net 2.x)
0000000000403E8F | 55 | push rbp |
0000000000403E90 | 48 8B EC | mov rbp,rsp |
0000000000403E93 | 48 83 EC 70 | sub rsp,70 |
0000000000403E97 | 48 89 65 C8 | mov qword ptr ss:[rbp-38],rsp |
0000000000403E9B | 48 89 5D B8 | mov qword ptr ss:[rbp-48],rbx |
0000000000403E9F | 48 89 6D C0 | mov qword ptr ss:[rbp-40],rbp | <<(16)
0000000000403EA3 | 48 89 75 F8 | mov qword ptr ss:[rbp-8],rsi |
0000000000403EA7 | 48 89 7D F0 | mov qword ptr ss:[rbp-10],rdi |
0000000000403EAB | 4C 89 65 D0 | mov qword ptr ss:[rbp-30],r12 |
0000000000403EAF | 4C 89 6D D8 | mov qword ptr ss:[rbp-28],r13 |
0000000000403EB3 | 4C 89 75 E0 | mov qword ptr ss:[rbp-20],r14 |
0000000000403EB7 | 4C 89 7D E8 | mov qword ptr ss:[rbp-18],r15 |
0000000000403EBB | 48 83 EC 20 | sub rsp,20 |
0000000000403EBF | 49 BB 18 3F 15 13 FE 7F 00 00 | mov r11,7FFE13153F18 |
0000000000403EC9 | 41 FF D3 | call r11 |
0000000000403ECC | 48 83 C4 20 | add rsp,20 |
>>>>>>>>> arm64
il2cpp:00000000003DE714 F5 0F 1D F8 STR X21, [SP,#-0x10+var_20]! | << absolute safe
il2cpp:00000000003DE718 F4 4F 01 A9 STP X20, X19, [SP,#0x20+var_10] | << may be safe
il2cpp:00000000003DE71C FD 7B 02 A9 STP X29, X30, [SP,#0x20+var_s0] |
il2cpp:00000000003DE720 FD 83 00 91 ADD X29, SP, #0x20 |
il2cpp:00000000003DE724 B5 30 00 B0 ADRP X21, #_ZZ62GameObject_SetActive_mCF1EEF2A314F3AE | << dangerous: relative instruction, can not be overwritten
il2cpp:00000000003DE728 A2 56 47 F9 LDR method, [X21,#_ZZ62GameObject_SetActive_mCF] ; |
il2cpp:00000000003DE72C F3 03 01 2A MOV W19, W1 |
*/
namespace MonoHook
{
/// <summary>
/// Hook 类,用来 Hook 某个 C# 方法
/// </summary>
public unsafe class MethodHook
{
public string tag;
public bool isHooked { get; private set; }
public bool isPlayModeHook { get; private set; }
public MethodBase targetMethod { get; private set; } // 需要被hook的目标方法
public MethodBase replacementMethod { get; private set; } // 被hook后的替代方法
public MethodBase proxyMethod { get; private set; } // 目标方法的代理方法(可以通过此方法调用被hook后的原方法)
private IntPtr _targetPtr; // 目标方法被 jit 后的地址指针
private IntPtr _replacementPtr;
private IntPtr _proxyPtr;
private CodePatcher _codePatcher;
#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
/// <summary>
/// call `MethodInfo.MethodHandle.GetFunctionPointer()`
/// will visit static class `UnityEditor.IMGUI.Controls.TreeViewGUI.Styles` and invoke its static constructor,
/// and init static filed `foldout`, but `GUISKin.current` is null now,
/// so we should wait until `GUISKin.current` has a valid value
/// </summary>
private static FieldInfo s_fi_GUISkin_current;
#endif
static MethodHook()
{
#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
s_fi_GUISkin_current = typeof(GUISkin).GetField("current", BindingFlags.Static | BindingFlags.NonPublic);
#endif
}
/// <summary>
/// 创建一个 Hook
/// </summary>
/// <param name="targetMethod">需要替换的目标方法</param>
/// <param name="replacementMethod">准备好的替换方法</param>
/// <param name="proxyMethod">如果还需要调用原始目标方法,可以通过此参数的方法调用,如果不需要可以填 null</param>
public MethodHook(MethodBase targetMethod, MethodBase replacementMethod, MethodBase proxyMethod, string data = "")
{
this.targetMethod = targetMethod;
this.replacementMethod = replacementMethod;
this.proxyMethod = proxyMethod;
this.tag = data;
CheckMethod();
}
public void Install()
{
if (LDasm.IsiOS()) // iOS 不支持修改 code 所在区域 page
return;
if (isHooked)
return;
#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
if (s_fi_GUISkin_current.GetValue(null) != null)
DoInstall();
else
EditorApplication.update += OnEditorUpdate;
#else
DoInstall();
#endif
isPlayModeHook = Application.isPlaying;
}
public void Uninstall()
{
if (!isHooked)
return;
_codePatcher.RemovePatch();
isHooked = false;
HookPool.RemoveHooker(targetMethod);
}
#region private
private void DoInstall()
{
if (targetMethod == null || replacementMethod == null)
throw new Exception("none of methods targetMethod or replacementMethod can be null");
HookPool.AddHook(targetMethod, this);
if (_codePatcher == null)
{
if (GetFunctionAddr())
{
#if ENABLE_HOOK_DEBUG
UnityEngine.Debug.Log($"Original [{targetMethod.DeclaringType.Name}.{targetMethod.Name}]: {HookUtils.HexToString(_targetPtr.ToPointer(), 64, -16)}");
UnityEngine.Debug.Log($"Original [{replacementMethod.DeclaringType.Name}.{replacementMethod.Name}]: {HookUtils.HexToString(_replacementPtr.ToPointer(), 64, -16)}");
if(proxyMethod != null)
UnityEngine.Debug.Log($"Original [{proxyMethod.DeclaringType.Name}.{proxyMethod.Name}]: {HookUtils.HexToString(_proxyPtr.ToPointer(), 64, -16)}");
#endif
CreateCodePatcher();
_codePatcher.ApplyPatch();
#if ENABLE_HOOK_DEBUG
UnityEngine.Debug.Log($"New [{targetMethod.DeclaringType.Name}.{targetMethod.Name}]: {HookUtils.HexToString(_targetPtr.ToPointer(), 64, -16)}");
UnityEngine.Debug.Log($"New [{replacementMethod.DeclaringType.Name}.{replacementMethod.Name}]: {HookUtils.HexToString(_replacementPtr.ToPointer(), 64, -16)}");
if(proxyMethod != null)
UnityEngine.Debug.Log($"New [{proxyMethod.DeclaringType.Name}.{proxyMethod.Name}]: {HookUtils.HexToString(_proxyPtr.ToPointer(), 64, -16)}");
#endif
}
}
isHooked = true;
}
private void CheckMethod()
{
if (targetMethod == null || replacementMethod == null)
throw new Exception("MethodHook:targetMethod and replacementMethod and proxyMethod can not be null");
string methodName = $"{targetMethod.DeclaringType.Name}.{targetMethod.Name}";
if (targetMethod.IsAbstract)
throw new Exception($"WRANING: you can not hook abstract method [{methodName}]");
#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
int minMethodBodySize = 10;
{
if ((targetMethod.MethodImplementationFlags & MethodImplAttributes.InternalCall) != MethodImplAttributes.InternalCall)
{
int codeSize = targetMethod.GetMethodBody().GetILAsByteArray().Length; // GetMethodBody can not call on il2cpp
if (codeSize < minMethodBodySize)
UnityEngine.Debug.LogWarning($"WRANING: you can not hook method [{methodName}], cause its method body is too short({codeSize}), will random crash on IL2CPP release mode");
}
}
if(proxyMethod != null)
{
methodName = $"{proxyMethod.DeclaringType.Name}.{proxyMethod.Name}";
int codeSize = proxyMethod.GetMethodBody().GetILAsByteArray().Length;
if (codeSize < minMethodBodySize)
UnityEngine.Debug.LogWarning($"WRANING: size of method body[{methodName}] is too short({codeSize}), will random crash on IL2CPP release mode, please fill some dummy code inside");
if ((proxyMethod.MethodImplementationFlags & MethodImplAttributes.NoOptimization) != MethodImplAttributes.NoOptimization)
throw new Exception($"WRANING: method [{methodName}] must has a Attribute `MethodImpl(MethodImplOptions.NoOptimization)` to prevent code call to this optimized by compiler(pass args by shared stack)");
}
#endif
}
private void CreateCodePatcher()
{
long addrOffset = Math.Abs(_targetPtr.ToInt64() - _replacementPtr.ToInt64());
if (_proxyPtr != IntPtr.Zero)
addrOffset = Math.Max(addrOffset, Math.Abs(_targetPtr.ToInt64() - _proxyPtr.ToInt64()));
if (LDasm.IsARM())
{
if (IntPtr.Size == 8)
{
if (addrOffset <= CodePatcher_arm64_near.MaxJmpOffset)
_codePatcher = new CodePatcher_arm64_near(_targetPtr, _replacementPtr, _proxyPtr);
else
{
UnityEngine.Debug.Log($"[MonoHook] {targetMethod.DeclaringType.Name}.{targetMethod.Name}: address offset {addrOffset / (1024 * 1024)}MB exceeds ±128MB, use arm64 far jump");
_codePatcher = new CodePatcher_arm64_far(_targetPtr, _replacementPtr, _proxyPtr);
}
}
else if (addrOffset < ((1 << 25) - 1))
_codePatcher = new CodePatcher_arm32_near(_targetPtr, _replacementPtr, _proxyPtr);
else if (addrOffset < ((1 << 27) - 1))
_codePatcher = new CodePatcher_arm32_far(_targetPtr, _replacementPtr, _proxyPtr);
else
throw new Exception("address of target method and replacement method are too far, can not hook");
}
else
{
if (IntPtr.Size == 8)
{
if (addrOffset < 0x7fffffff) // 2G
_codePatcher = new CodePatcher_x64_near(_targetPtr, _replacementPtr, _proxyPtr);
else
_codePatcher = new CodePatcher_x64_far(_targetPtr, _replacementPtr, _proxyPtr);
}
else
_codePatcher = new CodePatcher_x86(_targetPtr, _replacementPtr, _proxyPtr);
}
}
/// <summary>
/// 获取对应函数jit后的native code的地址
/// </summary>
private bool GetFunctionAddr()
{
_targetPtr = GetFunctionAddr(targetMethod);
_replacementPtr = GetFunctionAddr(replacementMethod);
_proxyPtr = GetFunctionAddr(proxyMethod);
if (_targetPtr == IntPtr.Zero || _replacementPtr == IntPtr.Zero)
return false;
if (proxyMethod != null && _proxyPtr == null)
return false;
if (_replacementPtr == _targetPtr)
{
throw new Exception($"the addresses of target method {targetMethod.Name} and replacement method {replacementMethod.Name} can not be same");
}
if (LDasm.IsThumb(_targetPtr) || LDasm.IsThumb(_replacementPtr))
{
throw new Exception("does not support thumb arch");
}
return true;
}
[StructLayout(LayoutKind.Sequential, Pack = 1)] // 好像在 IL2CPP 里无效
private struct __ForCopy
{
public long __dummy;
public MethodBase method;
}
/// <summary>
/// 获取方法指令地址
/// </summary>
/// <param name="method"></param>
/// <returns></returns>
private IntPtr GetFunctionAddr(MethodBase method)
{
if (method == null)
return IntPtr.Zero;
if (!LDasm.IsIL2CPP())
return method.MethodHandle.GetFunctionPointer();
else
{
/*
// System.Reflection.MonoMethod
typedef struct Il2CppReflectionMethod
{
Il2CppObject object;
const MethodInfo *method;
Il2CppString *name;
Il2CppReflectionType *reftype;
} Il2CppReflectionMethod;
typedef Il2CppClass Il2CppVTable;
typedef struct Il2CppObject
{
union
{
Il2CppClass *klass;
Il2CppVTable *vtable;
};
MonitorData *monitor;
} Il2CppObject;
typedef struct MethodInfo
{
Il2CppMethodPointer methodPointer; // this is the pointer to native code of method
InvokerMethod invoker_method;
const char* name;
Il2CppClass *klass;
const Il2CppType *return_type;
const ParameterInfo* parameters;
// ...
}
*/
__ForCopy __forCopy = new __ForCopy() { method = method };
long* ptr = &__forCopy.__dummy;
ptr++; // addr of _forCopy.method
IntPtr methodAddr = IntPtr.Zero;
if (sizeof(IntPtr) == 8)
{
long methodDataAddr = *(long*)ptr;
byte* ptrData = (byte*)methodDataAddr + sizeof(IntPtr) * 2; // offset of Il2CppReflectionMethod::const MethodInfo *method;
long methodPtr = 0;
methodPtr = *(long*)ptrData;
methodAddr = new IntPtr(*(long*)methodPtr); // MethodInfo::Il2CppMethodPointer methodPointer;
}
else
{
int methodDataAddr = *(int*)ptr;
byte* ptrData = (byte*)methodDataAddr + sizeof(IntPtr) * 2; // offset of Il2CppReflectionMethod::const MethodInfo *method;
int methodPtr = 0;
methodPtr = *(int*)ptrData;
methodAddr = new IntPtr(*(int*)methodPtr);
}
return methodAddr;
}
}
#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
private void OnEditorUpdate()
{
if (s_fi_GUISkin_current.GetValue(null) != null)
{
try
{
DoInstall();
}
finally
{
EditorApplication.update -= OnEditorUpdate;
}
}
}
#endif
#endregion
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: bd0b8071cf434d6498160259e3829980
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1c3bdcb0d35a8834aadbee0e5e02a093
guid: 16b9dc031f67b4fe5ad79c230f75768c
folderAsset: yes
DefaultImporter:
externalObjects: {}
+23
View File
@@ -0,0 +1,23 @@
//
// Utils.cpp
// MonoHookUtils_OSX
//
// Created by Misaka-Mikoto on 2022/8/31.
//
#include <stdio.h>
#include <stdint.h>
#include <pthread.h>
#include <string.h>
#include <libkern/OSCacheControl.h>
extern "C"{
void* memcpy_jit(void* dst, void* src, int32_t size)
{
pthread_jit_write_protect_np(0);
void* ret = memcpy(dst, src, size);
pthread_jit_write_protect_np(1);
sys_icache_invalidate (dst, size);
return ret;
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ca69cf4ffd628394a9dd1ef1c56f7f20
guid: 56b28b5583a184c669dcb968d175544c
PluginImporter:
externalObjects: {}
serializedVersion: 2
@@ -7,7 +7,7 @@ PluginImporter:
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 1
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
@@ -42,7 +42,7 @@ PluginImporter:
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
OS: OSX
- first:
Standalone: Linux64
second:
@@ -54,7 +54,7 @@ PluginImporter:
second:
enabled: 0
settings:
CPU: None
CPU: ARM64
- first:
Standalone: Win
second:
@@ -67,12 +67,6 @@ PluginImporter:
enabled: 0
settings:
CPU: None
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
iPhone: iOS
second:
@@ -0,0 +1,4 @@
#!/bin/bash
clang -shared -undefined dynamic_lookup -o libMonoHookUtils_OSX.dylib Utils.cpp
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 641944d55f4cbc4449c3f8b3fcd4d7e5
guid: 69eeb734e262a0a4fbe0887249198f73
DefaultImporter:
externalObjects: {}
userData:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 68f56e29afb52164b85f220d1033b461
guid: 7adba4475cf0bdc4fa7995c0d748f480
folderAsset: yes
DefaultImporter:
externalObjects: {}
@@ -0,0 +1,81 @@
fileFormatVersion: 2
guid: e092a73910a69894daea44290d7292f6
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 1
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 1
Exclude WebGL: 1
Exclude Win: 1
Exclude Win64: 1
Exclude iOS: 1
- first:
Android: Android
second:
enabled: 0
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: ARM64
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: x86
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: x86_64
- first:
iPhone: iOS
second:
enabled: 0
settings:
AddToEmbeddedBinaries: false
CPU: AnyCPU
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 31f6a810e38e66f4c832b135770a04bb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,81 @@
fileFormatVersion: 2
guid: 4adb23596911347faa69537b900c9f5e
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 1
Exclude WebGL: 1
Exclude Win: 1
Exclude Win64: 1
Exclude iOS: 1
- first:
Android: Android
second:
enabled: 0
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
- first:
iPhone: iOS
second:
enabled: 0
settings:
AddToEmbeddedBinaries: false
CPU: AnyCPU
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:
-46
View File
@@ -1,46 +0,0 @@
using HybridCLR.Editor.Meta;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace HybridCLR.Editor.AOT
{
public class GenericReferenceWriter
{
public void Write(List<GenericClass> types, List<GenericMethod> methods, string outputFile)
{
string parentDir = Directory.GetParent(outputFile).FullName;
Directory.CreateDirectory(parentDir);
List<string> codes = new List<string>();
codes.Add("public class AOTGenericReferences : UnityEngine.MonoBehaviour");
codes.Add("{");
foreach(var type in types)
{
codes.Add($"\t//{type.Type}");
}
codes.Add("\tpublic void RefMethods()");
codes.Add("\t{");
foreach(var method in methods)
{
codes.Add($"\t\t// {method.Method}");
}
codes.Add("\t}");
codes.Add("}");
var utf8WithoutBOM = new System.Text.UTF8Encoding(false);
File.WriteAllText(outputFile, string.Join("\n", codes), utf8WithoutBOM);
Debug.Log($"[GenericReferenceWriter] write {outputFile}");
}
}
}
@@ -0,0 +1,102 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.Settings;
using HybridCLR.Utils;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Callbacks;
using UnityEngine;
namespace HybridCLR.BuildProcessors
{
public static class AddLil2cppSourceCodeToXcodeproj2022OrNewer
{
#if UNITY_2022 && (UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS)
[PostProcessBuild]
#endif
public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
{
if (!HybridCLRSettings.instance.enable)
return;
string pbxprojFile = XcodeProjectFileUtil.GetXcodeProjectFile(pathToBuiltProject);
RemoveExternalLibil2cppOption(pbxprojFile);
CopyLibil2cppToXcodeProj(pathToBuiltProject);
}
private static string TryRemoveDunplicateShellScriptSegment(string pbxprojFile, string pbxprojContent)
{
// will appear duplicated Shell Script segment when append to existed xcode project.
// This is unity bug.
// we remove duplicated Shell Script to avoid build error.
string copyFileComment = @"/\* CopyFiles \*/,\s+([A-Z0-9]{24}) /\* ShellScript \*/,\s+([A-Z0-9]{24}) /\* ShellScript \*/,";
var m = Regex.Match(pbxprojContent, copyFileComment, RegexOptions.Multiline);
if (!m.Success)
{
return pbxprojContent;
}
if (m.Groups[1].Value != m.Groups[2].Value)
{
throw new BuildFailedException($"find invalid /* ShellScript */ segment");
}
int startIndexOfDupShellScript = m.Groups[2].Index;
int endIndexOfDupShellScript = pbxprojContent.IndexOf(",", startIndexOfDupShellScript);
pbxprojContent = pbxprojContent.Remove(startIndexOfDupShellScript, endIndexOfDupShellScript + 1 - startIndexOfDupShellScript);
Debug.LogWarning($"[AddLil2cppSourceCodeToXcodeproj] remove duplicated '/* ShellScript */' from file '{pbxprojFile}'");
return pbxprojContent;
}
private static void RemoveExternalLibil2cppOption(string pbxprojFile)
{
string pbxprojContent = File.ReadAllText(pbxprojFile, Encoding.UTF8);
string removeBuildOption = @"--external-lib-il2-cpp=\""$PROJECT_DIR/Libraries/libil2cpp.a\""";
if (pbxprojContent.Contains(removeBuildOption))
{
pbxprojContent = pbxprojContent.Replace(removeBuildOption, "");
Debug.Log($"[AddLil2cppSourceCodeToXcodeproj] remove il2cpp build option '{removeBuildOption}' from file '{pbxprojFile}'");
}
else
{
Debug.LogWarning($"[AddLil2cppSourceCodeToXcodeproj] project.pbxproj remove building option:'{removeBuildOption}' fail. This may occur when 'Append' to existing xcode project in building");
}
pbxprojContent = TryRemoveDunplicateShellScriptSegment(pbxprojFile, pbxprojContent);
File.WriteAllText(pbxprojFile, pbxprojContent, Encoding.UTF8);
}
private static void CopyLibil2cppToXcodeProj(string pathToBuiltProject)
{
string srcLibil2cppDir = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp";
string destLibil2cppDir = $"{pathToBuiltProject}/Il2CppOutputProject/IL2CPP/libil2cpp";
DirectoryUtil.RemoveDir(destLibil2cppDir);
DirectoryUtil.CopyDir(srcLibil2cppDir, destLibil2cppDir, true);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a4ce072f7e4a17248a3d9ebfd011356b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,54 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.Settings;
using HybridCLR.Utils;
using System.IO;
using System.Text;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Callbacks;
using UnityEngine;
namespace HybridCLR.BuildProcessors
{
public static class AddLil2cppSourceCodeToXcodeproj2023OrNewer
{
#if UNITY_2023_1_OR_NEWER && (UNITY_IOS || UNITY_TVOS || UNITY_VISIONOS)
[PostProcessBuild]
#endif
public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
{
if (!HybridCLRSettings.instance.enable)
return;
CopyLibil2cppToXcodeProj(pathToBuiltProject);
}
private static void CopyLibil2cppToXcodeProj(string pathToBuiltProject)
{
string srcLibil2cppDir = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp";
string destLibil2cppDir = $"{pathToBuiltProject}/Il2CppOutputProject/IL2CPP/libil2cpp";
DirectoryUtil.RemoveDir(destLibil2cppDir);
DirectoryUtil.CopyDir(srcLibil2cppDir, destLibil2cppDir, true);
}
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2fa46135129b046a28014d58fdfd18ca
+74 -18
View File
@@ -1,28 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.Settings;
using System;
using System.IO;
using System.Text.RegularExpressions;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEngine;
namespace HybridCLR.Editor.BuildProcessors
namespace HybridCLR.BuildProcessors
{
internal class CheckSettings : IPreprocessBuildWithReport
{
public int callbackOrder => 0;
public static bool DisableMethodBridgeDevelopmentFlagChecking { get; set; }
public void OnPreprocessBuild(BuildReport report)
{
#if !UNITY_2020_1_OR_NEWER || !UNITY_IOS
if (!SettingsUtil.Enable)
HybridCLRSettings globalSettings = SettingsUtil.HybridCLRSettings;
if (!globalSettings.enable || globalSettings.useGlobalIl2cpp)
{
string oldIl2cppPath = Environment.GetEnvironmentVariable("UNITY_IL2CPP_PATH");
if (!string.IsNullOrEmpty(oldIl2cppPath))
{
Environment.SetEnvironmentVariable("UNITY_IL2CPP_PATH", "");
Debug.Log($"[CheckSettings] 清除 UNITY_IL2CPP_PATH, 旧值为:'{oldIl2cppPath}'");
Debug.Log($"[CheckSettings] clean process environment variable: UNITY_IL2CPP_PATH, old vlaue:'{oldIl2cppPath}'");
}
}
else
@@ -31,32 +53,66 @@ namespace HybridCLR.Editor.BuildProcessors
if (curIl2cppPath != SettingsUtil.LocalIl2CppDir)
{
Environment.SetEnvironmentVariable("UNITY_IL2CPP_PATH", SettingsUtil.LocalIl2CppDir);
Debug.Log($"[CheckSettings] UNITY_IL2CPP_PATH 当前值为:'{curIl2cppPath}',更新为:'{SettingsUtil.LocalIl2CppDir}'");
Debug.Log($"[CheckSettings] UNITY_IL2CPP_PATH old value:'{curIl2cppPath}', new value:'{SettingsUtil.LocalIl2CppDir}'");
}
}
#endif
if (!SettingsUtil.Enable)
if (!globalSettings.enable)
{
return;
}
if (UnityEditor.PlayerSettings.gcIncremental)
BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
#if UNITY_6000_0_OR_NEWER
NamedBuildTarget namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
ScriptingImplementation curScriptingImplementation = PlayerSettings.GetScriptingBackend(namedBuildTarget);
#else
ScriptingImplementation curScriptingImplementation = PlayerSettings.GetScriptingBackend(buildTargetGroup);
#endif
ScriptingImplementation targetScriptingImplementation = ScriptingImplementation.IL2CPP;
if (curScriptingImplementation != targetScriptingImplementation)
{
Debug.LogError($"[CheckSettings] HybridCLR不支持增量式GC,已经自动将该选项关闭");
UnityEditor.PlayerSettings.gcIncremental = false;
Debug.LogError($"[CheckSettings] current ScriptingBackend:{curScriptingImplementation},have been switched to:{targetScriptingImplementation} automatically");
#if UNITY_6000_0_OR_NEWER
PlayerSettings.SetScriptingBackend(namedBuildTarget, targetScriptingImplementation);
#else
PlayerSettings.SetScriptingBackend(buildTargetGroup, targetScriptingImplementation);
#endif
}
var installer = new Installer.InstallerController();
if (!installer.HasInstalledHybridCLR())
{
throw new Exception($"你没有初始化HybridCLR,请通过菜单'HybridCLR/Installer'安装");
throw new BuildFailedException($"You have not initialized HybridCLR, please install it via menu 'HybridCLR/Installer'");
}
HybridCLRGlobalSettings gs = SettingsUtil.GlobalSettings;
if (installer.PackageVersion != installer.InstalledLibil2cppVersion)
{
throw new BuildFailedException($"You must run `HybridCLR/Installer` after upgrading package");
}
HybridCLRSettings gs = SettingsUtil.HybridCLRSettings;
if (((gs.hotUpdateAssemblies?.Length + gs.hotUpdateAssemblyDefinitions?.Length) ?? 0) == 0)
{
throw new Exception($"GlobalSettings中未配置热更新dll");
Debug.LogWarning("[CheckSettings] No hot update modules configured in HybridCLRSettings");
}
if (!DisableMethodBridgeDevelopmentFlagChecking)
{
string methodBridgeFile = $"{SettingsUtil.GeneratedCppDir}/MethodBridge.inc";
var match = Regex.Match(File.ReadAllText(methodBridgeFile), @"// DEVELOPMENT=(\d)");
if (match.Success)
{
int developmentFlagInMethodBridge = int.Parse(match.Groups[1].Value);
int developmentFlagInEditorSettings = EditorUserBuildSettings.development ? 1 : 0;
if (developmentFlagInMethodBridge != developmentFlagInEditorSettings)
{
Debug.LogError($"[CheckSettings] MethodBridge.inc DEVELOPMENT flag:{developmentFlagInMethodBridge} is inconsistent with EditorUserBuildSettings.development:{developmentFlagInEditorSettings}. Please run 'HybridCLR/Generate/All' before building.");
}
}
else
{
Debug.LogError("[CheckSettings] MethodBridge.inc DEVELOPMENT flag not found. Please run 'HybridCLR/Generate/All' before building.");
}
}
}
}
}
@@ -1,62 +1,101 @@
using System;
using System.Collections.Generic;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.Utils;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEditor.Il2Cpp;
using UnityEditor.UnityLinker;
using UnityEngine;
namespace HybridCLR.Editor.BuildProcessors
{
internal class CopyStrippedAOTAssemblies : IPostprocessBuildWithReport
#if !UNITY_2021_1_OR_NEWER
, IIl2CppProcessor
using UnityEditor.Il2Cpp;
#endif
namespace HybridCLR.BuildProcessors
{
internal class CopyStrippedAOTAssemblies : IPostprocessBuildWithReport, IPreprocessBuildWithReport
{
public int callbackOrder => 0;
#if UNITY_2021_1_OR_NEWER
public static string GetStripAssembliesDir2021(BuildTarget target)
{
string projectDir = SettingsUtil.ProjectDir;
#if UNITY_STANDALONE_WIN
switch (target)
{
case BuildTarget.StandaloneWindows:
case BuildTarget.StandaloneWindows64:
return $"{projectDir}/Library/Bee/artifacts/WinPlayerBuildProgram/ManagedStripped";
#elif UNITY_ANDROID
case BuildTarget.StandaloneLinux64:
return $"{projectDir}/Library/Bee/artifacts/LinuxPlayerBuildProgram/ManagedStripped";
case BuildTarget.WSAPlayer:
return $"{projectDir}/Library/Bee/artifacts/UWPPlayerBuildProgram/ManagedStripped";
case BuildTarget.Android:
return $"{projectDir}/Library/Bee/artifacts/Android/ManagedStripped";
#elif UNITY_IOS
return $"{projectDir}/Temp/StagingArea/Data/Managed/tempStrip";
#elif UNITY_WEBGL
#if TUANJIE_2022_3_OR_NEWER
case BuildTarget.HMIAndroid:
return $"{projectDir}/Library/Bee/artifacts/HMIAndroid/ManagedStripped";
#endif
case BuildTarget.iOS:
#if UNITY_TVOS
case BuildTarget.tvOS:
#endif
return $"{projectDir}/Library/Bee/artifacts/iOS/ManagedStripped";
#if UNITY_VISIONOS
case BuildTarget.VisionOS:
#if UNITY_6000_0_OR_NEWER
return $"{projectDir}/Library/Bee/artifacts/VisionOS/ManagedStripped";
#else
return $"{projectDir}/Library/Bee/artifacts/iOS/ManagedStripped";
#endif
#endif
case BuildTarget.WebGL:
return $"{projectDir}/Library/Bee/artifacts/WebGL/ManagedStripped";
#elif UNITY_EDITOR_OSX
case BuildTarget.StandaloneOSX:
return $"{projectDir}/Library/Bee/artifacts/MacStandalonePlayerBuildProgram/ManagedStripped";
#else
throw new NotSupportedException("GetOriginBuildStripAssembliesDir");
case BuildTarget.PS4:
return $"{projectDir}/Library/Bee/artifacts/PS4PlayerBuildProgram/ManagedStripped";
case BuildTarget.PS5:
return $"{projectDir}/Library/Bee/artifacts/PS5PlayerBuildProgram/ManagedStripped";
case BuildTarget.GameCoreXboxOne:
case BuildTarget.GameCoreXboxSeries:
return $"{projectDir}/Library/Bee/artifacts/GameCorePlayerBuildProgram/ManagedStripped";
#if UNITY_WEIXINMINIGAME
case BuildTarget.WeixinMiniGame:
return $"{projectDir}/Library/Bee/artifacts/WeixinMiniGame/ManagedStripped";
#endif
}
#else
private string GetStripAssembliesDir2020(BuildTarget target)
{
string subPath = target == BuildTarget.Android ?
"assets/bin/Data/Managed" :
"Data/Managed/";
return $"{SettingsUtil.ProjectDir}/Temp/StagingArea/{subPath}";
}
public void OnBeforeConvertRun(BuildReport report, Il2CppBuildPipelineData data)
{
// 此回调只在 2020中调用
CopyStripDlls(GetStripAssembliesDir2020(data.target), data.target);
}
#if UNITY_OPENHARMONY
case BuildTarget.OpenHarmony:
return $"{projectDir}/Library/Bee/artifacts/OpenHarmonyPlayerBuildProgram/ManagedStripped";
#endif
default: return "";
}
}
public static void CopyStripDlls(string srcStripDllPath, BuildTarget target)
{
if (!SettingsUtil.Enable)
{
Debug.Log($"[CopyStrippedAOTAssemblies] disabled");
return;
}
Debug.Log($"[CopyStrippedAOTAssemblies] CopyScripDlls. src:{srcStripDllPath} target:{target}");
var dstPath = SettingsUtil.GetAssembliesPostIl2CppStripDir(target);
@@ -73,10 +112,19 @@ namespace HybridCLR.Editor.BuildProcessors
public void OnPostprocessBuild(BuildReport report)
{
#if UNITY_2021_1_OR_NEWER && !UNITY_IOS
BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
CopyStripDlls(GetStripAssembliesDir2021(target), target);
#endif
BuildTarget target = report.summary.platform;
string srcStripDllPath = GetStripAssembliesDir2021(target);
if (!string.IsNullOrEmpty(srcStripDllPath) && Directory.Exists(srcStripDllPath))
{
CopyStripDlls(srcStripDllPath, target);
}
}
public void OnPreprocessBuild(BuildReport report)
{
BuildTarget target = report.summary.platform;
var dstPath = SettingsUtil.GetAssembliesPostIl2CppStripDir(target);
DirectoryUtil.RecreateDir(dstPath);
}
}
}
@@ -1,16 +1,37 @@
using System;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.Utils;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEditor;
using UnityEditor.Build;
using UnityEngine;
namespace HybridCLR.Editor.BuildProcessors
namespace HybridCLR.BuildProcessors
{
/// <summary>
/// 将热更新dll从Build过程中过滤,防止打包到主工程中
/// Filter hot update assemblies from build process to prevent them from being packaged into the main project
/// </summary>
internal class FilterHotFixAssemblies : IFilterBuildAssemblies
{
@@ -23,30 +44,41 @@ namespace HybridCLR.Editor.BuildProcessors
Debug.Log($"[FilterHotFixAssemblies] disabled");
return assemblies;
}
List<string> allHotUpdateDllFiles = SettingsUtil.HotUpdateAssemblyFiles;
List<string> allHotUpdateDllNames = SettingsUtil.HotUpdateAssemblyNamesExcludePreserved;
// 检查是否重复填写
var hotUpdateDllSet = new HashSet<string>();
foreach(var hotUpdateDll in allHotUpdateDllFiles)
foreach (var hotUpdateDll in allHotUpdateDllNames)
{
if (string.IsNullOrWhiteSpace(hotUpdateDll))
{
throw new BuildFailedException($"hot update assembly name cann't be empty");
}
if (!hotUpdateDllSet.Add(hotUpdateDll))
{
throw new Exception($"热更新 assembly:{hotUpdateDll} 在列表中重复,请除去重复条目");
throw new BuildFailedException($"hot update assembly:{hotUpdateDll} is duplicated");
}
}
// 检查是否填写了正确的dll名称
foreach (var hotUpdateDll in allHotUpdateDllFiles)
var assResolver = MetaUtil.CreateHotUpdateAssemblyResolver(EditorUserBuildSettings.activeBuildTarget, allHotUpdateDllNames);
foreach (var hotUpdateDllName in allHotUpdateDllNames)
{
if (assemblies.All(ass => !ass.EndsWith(hotUpdateDll)))
if (assemblies.Select(Path.GetFileNameWithoutExtension).All(ass => ass != hotUpdateDllName)
&& string.IsNullOrEmpty(assResolver.ResolveAssembly(hotUpdateDllName, false)))
{
throw new Exception($"热更新 assembly:{hotUpdateDll} 不存在,请检查拼写错误");
throw new BuildFailedException($"hot update assembly:{hotUpdateDllName} doesn't exist");
}
Debug.Log($"[FilterHotFixAssemblies] 过滤热更新assembly:{hotUpdateDll}");
}
// 将热更dll从打包列表中移除
return assemblies.Where(ass => allHotUpdateDllFiles.All(dll => !ass.EndsWith(dll, StringComparison.OrdinalIgnoreCase))).ToArray();
return assemblies.Where(ass =>
{
string assName = Path.GetFileNameWithoutExtension(ass);
bool reserved = allHotUpdateDllNames.All(dll => !assName.Equals(dll, StringComparison.Ordinal));
if (!reserved)
{
Debug.Log($"[FilterHotFixAssemblies] filter assembly:{assName}");
}
return reserved;
}).ToArray();
}
}
}
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d796fc01daee1964586621890988a5ae
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,85 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using MonoHook;
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Runtime.CompilerServices;
using UnityEditor;
using UnityEngine;
namespace HybridCLR.BuildProcessors.Hooks
{
#if UNITY_2021_1_OR_NEWER && !UNITY_2023_1_OR_NEWER
[InitializeOnLoad]
public class CopyStrippedAOTAssembliesHook
{
private static MethodHook _hook;
static CopyStrippedAOTAssembliesHook()
{
if (_hook == null)
{
Type type = typeof(UnityEditor.EditorApplication).Assembly.GetType("UnityEditorInternal.AssemblyStripper");
MethodInfo miTarget = type.GetMethod("StripAssembliesTo", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
MethodInfo miReplacement = new StripAssembliesDel(OverrideStripAssembliesTo).Method;
MethodInfo miProxy = new StripAssembliesDel(StripAssembliesToProxy).Method;
_hook = new MethodHook(miTarget, miReplacement, miProxy);
_hook.Install();
}
}
private delegate bool StripAssembliesDel(string outputFolder, out string output, out string error, IEnumerable<string> linkXmlFiles, object runInformation);
private static bool OverrideStripAssembliesTo(string outputFolder, out string output, out string error, IEnumerable<string> linkXmlFiles, object runInformation)
{
bool result = StripAssembliesToProxy(outputFolder, out output, out error, linkXmlFiles, runInformation);
if (!result)
{
return false;
}
UnityEngine.Debug.Log($"== StripAssembliesTo outputDir:{outputFolder}");
string outputStrippedDir = HybridCLR.SettingsUtil.GetAssembliesPostIl2CppStripDir(EditorUserBuildSettings.activeBuildTarget);
Directory.CreateDirectory(outputStrippedDir);
foreach (var aotDll in Directory.GetFiles(outputFolder, "*.dll"))
{
string dstFile = $"{outputStrippedDir}/{Path.GetFileName(aotDll)}";
Debug.Log($"[RunAssemblyStripper] copy aot dll {aotDll} -> {dstFile}");
File.Copy(aotDll, dstFile, true);
}
return result;
}
[MethodImpl(MethodImplOptions.NoOptimization)]
private static bool StripAssembliesToProxy(string outputFolder, out string output, out string error, IEnumerable<string> linkXmlFiles, object runInformation)
{
Debug.LogError("== StripAssembliesToProxy ==");
output = "";
error = "";
return true;
}
}
#endif
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cf42c4f20b8a1b94baa04a1a5c6b8beb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,70 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using MonoHook;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using UnityEditor;
using UnityEngine;
namespace HybridCLR.BuildProcessors.Hooks
{
[InitializeOnLoad]
public class GetIl2CppFolderHook
{
private static MethodHook _hook;
static GetIl2CppFolderHook()
{
if (_hook == null)
{
Type type = typeof(UnityEditor.EditorApplication).Assembly.GetType("UnityEditorInternal.IL2CPPUtils");
MethodInfo miTarget = type.GetMethod("GetIl2CppFolder", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public, null,
new Type[] { typeof(bool).MakeByRefType() }, null);
MethodInfo miReplacement = new StripAssembliesDel(OverrideMethod).Method;
MethodInfo miProxy = new StripAssembliesDel(PlaceHolderMethod).Method;
_hook = new MethodHook(miTarget, miReplacement, miProxy);
_hook.Install();
}
}
private delegate string StripAssembliesDel(out bool isDevelopmentLocation);
private static string OverrideMethod(out bool isDevelopmentLocation)
{
//Debug.Log("[GetIl2CppFolderHook] OverrideMethod");
string result = PlaceHolderMethod(out isDevelopmentLocation);
isDevelopmentLocation = false;
return result;
}
[MethodImpl(MethodImplOptions.NoOptimization)]
private static string PlaceHolderMethod(out bool isDevelopmentLocation)
{
Debug.LogError("[GetIl2CppFolderHook] PlaceHolderMethod");
isDevelopmentLocation = false;
return null;
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 96c2bc28db69e1644892219abef3d4b5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,90 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using MonoHook;
using System;
using System.IO;
using System.Reflection;
using System.Runtime.CompilerServices;
using UnityEditor;
using UnityEngine;
namespace HybridCLR.BuildProcessors.Hooks
{
[InitializeOnLoad]
public class PatchScriptingAssembliesJsonHook
{
private static MethodHook _hook;
static PatchScriptingAssembliesJsonHook()
{
if (_hook == null)
{
Type type = typeof(UnityEditor.EditorApplication);
MethodInfo miTarget = type.GetMethod("BuildMainWindowTitle", BindingFlags.Static | BindingFlags.NonPublic);
MethodInfo miReplacement = new Func<string>(BuildMainWindowTitle).Method;
MethodInfo miProxy = new Func<string>(BuildMainWindowTitleProxy).Method;
#if UNITY_2021_1_OR_NEWER && (UNITY_WEBGL || UNITY_WEIXINMINIGAME)
_hook = new MethodHook(miTarget, miReplacement, miProxy);
_hook.Install();
#endif
}
}
private static string BuildMainWindowTitle()
{
var cacheDir = $"{Application.dataPath}/../Library/PlayerDataCache";
if (Directory.Exists(cacheDir))
{
foreach (var tempJsonPath in Directory.GetDirectories(cacheDir, "*", SearchOption.TopDirectoryOnly))
{
string dirName = Path.GetFileName(tempJsonPath);
#if UNITY_WEIXINMINIGAME
if (!dirName.Contains("WeixinMiniGame"))
{
continue;
}
#else
if (!dirName.Contains("WebGL"))
{
continue;
}
#endif
var patcher = new PatchScriptingAssemblyList();
patcher.PathScriptingAssembilesFile(tempJsonPath);
}
}
string newTitle = BuildMainWindowTitleProxy();
return newTitle;
}
[MethodImpl(MethodImplOptions.NoOptimization)]
private static string BuildMainWindowTitleProxy()
{
// Padding added only to satisfy MonoHook minimum code length requirements
UnityEngine.Debug.Log(12345.ToString());
return string.Empty;
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cc89a9041ab48ac41975fbd1e00b9b98
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,34 +1,51 @@
using HybridCLR.Editor.UnityBinFileReader;
using System;
using System.Collections.Generic;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEditor;
using UnityEditor.Android;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEditor.Il2Cpp;
using UnityEditor.UnityLinker;
using UnityEngine;
using UnityFS;
namespace HybridCLR.Editor.BuildProcessors
namespace HybridCLR.BuildProcessors
{
public class PatchScriptingAssemblyList :
#if UNITY_ANDROID
IPostGenerateGradleAndroidProject,
#elif UNITY_OPENHARMONY
UnityEditor.OpenHarmony.IPostGenerateOpenHarmonyProject,
#endif
IPostprocessBuildWithReport
#if UNITY_PS5
, IUnityLinkerProcessor
#endif
{
public int callbackOrder => 0;
public void OnPostGenerateGradleAndroidProject(string path)
{
// 如果直接打包apk,没有机会在PostprocessBuild中修改ScriptingAssemblies.json。
// 因此需要在这个时机处理
// Unity有bug,偶然情况下会传入apk的路径,导致替换失败
// When building apk directly there is no chance to patch ScriptingAssemblies.json in PostprocessBuild.
// Therefore patch it at this stage
// Unity bug: sometimes an apk path is passed in and replacement fails
if (Directory.Exists(path))
{
PathScriptingAssembilesFile(path);
@@ -39,17 +56,37 @@ namespace HybridCLR.Editor.BuildProcessors
}
}
#if UNITY_OPENHARMONY
public void OnPostGenerateOpenHarmonyProject(string path)
{
OnPostGenerateGradleAndroidProject(path);
}
#endif
public void OnPostprocessBuild(BuildReport report)
{
// 如果target为Android,由于已经在OnPostGenerateGradelAndroidProject中处理过,
// 这里不再重复处理
#if !UNITY_ANDROID
// For Android targets this was already handled in OnPostGenerateGradleAndroidProject,
// so skip duplicate processing here
#if !UNITY_ANDROID && !UNITY_WEBGL && !UNITY_OPENHARMONY
PathScriptingAssembilesFile(report.summary.outputPath);
#endif
}
private void PathScriptingAssembilesFile(string path)
#if UNITY_PS5
/// <summary>
/// For Package build mode, patch .json at this stage; PC Hosted and GP5 modes are unaffected
/// </summary>
public string GenerateAdditionalLinkXmlFile(UnityEditor.Build.Reporting.BuildReport report, UnityEditor.UnityLinker.UnityLinkerBuildPipelineData data)
{
string path = $"{SettingsUtil.ProjectDir}/Library/PlayerDataCache/PS5/Data";
PathScriptingAssembilesFile(path);
return null;
}
#endif
public void PathScriptingAssembilesFile(string path)
{
if (!SettingsUtil.Enable)
{
@@ -62,26 +99,24 @@ namespace HybridCLR.Editor.BuildProcessors
path = Path.GetDirectoryName(path);
Debug.Log($"[PatchScriptingAssemblyList] get path parent:{path}");
}
#if UNITY_2020_1_OR_NEWER
AddHotFixAssembliesToScriptingAssembliesJson(path);
#else
AddHotFixAssembliesToBinFile(path);
#endif
}
private const string scriptingAssembliesJsonFile = "ScriptingAssemblies.json";
private void AddHotFixAssembliesToScriptingAssembliesJson(string path)
{
Debug.Log($"[PatchScriptingAssemblyList]. path:{path}");
/*
* ScriptingAssemblies.json 文件中记录了所有的dll名称,此列表在游戏启动时自动加载,
* 不在此列表中的dll在资源反序列化时无法被找到其类型
* 因此 OnFilterAssemblies 中移除的条目需要再加回来
* ScriptingAssemblies.json lists all dll names that are loaded automatically at startup;
* dlls missing from this list cannot resolve types during asset deserialization
* therefore entries removed by OnFilterAssemblies must be added back
*/
string[] jsonFiles = Directory.GetFiles(path, SettingsUtil.ScriptingAssembliesJsonFile, SearchOption.AllDirectories);
string[] jsonFiles = Directory.GetFiles(path, scriptingAssembliesJsonFile, SearchOption.AllDirectories);
if (jsonFiles.Length == 0)
{
Debug.LogError($"can not find file {SettingsUtil.ScriptingAssembliesJsonFile}");
Debug.LogWarning($"can not find file {scriptingAssembliesJsonFile}");
return;
}
@@ -89,60 +124,9 @@ namespace HybridCLR.Editor.BuildProcessors
{
var patcher = new ScriptingAssembliesJsonPatcher();
patcher.Load(file);
patcher.AddScriptingAssemblies(SettingsUtil.HotUpdateAssemblyFiles);
patcher.AddScriptingAssemblies(SettingsUtil.HotUpdateAssemblyFilesIncludePreserved);
patcher.Save(file);
}
}
private void AddHotFixAssembliesToBinFile(string path)
{
if (AddHotFixAssembliesToGlobalgamemanagers(path))
{
return;
}
if (AddHotFixAssembliesTodataunity3d(path))
{
return;
}
Debug.LogError($"[PatchScriptingAssemblyList] can not find file '{SettingsUtil.GlobalgamemanagersBinFile}' or '{SettingsUtil.Dataunity3dBinFile}' in '{path}'");
}
private bool AddHotFixAssembliesToGlobalgamemanagers(string path)
{
string[] binFiles = Directory.GetFiles(path, SettingsUtil.GlobalgamemanagersBinFile, SearchOption.AllDirectories);
if (binFiles.Length == 0)
{
return false;
}
foreach (string binPath in binFiles)
{
var binFile = new UnityBinFile();
binFile.Load(binPath);
binFile.AddScriptingAssemblies(SettingsUtil.HotUpdateAssemblyFiles);
binFile.Save(binPath);
Debug.Log($"[PatchScriptingAssemblyList] patch {binPath}");
}
return true;
}
private bool AddHotFixAssembliesTodataunity3d(string path)
{
string[] binFiles = Directory.GetFiles(path, SettingsUtil.Dataunity3dBinFile, SearchOption.AllDirectories);
if (binFiles.Length == 0)
{
return false;
}
foreach (string binPath in binFiles)
{
var patcher = new Dataunity3dPatcher();
patcher.ApplyPatch(binPath, SettingsUtil.HotUpdateAssemblyFiles);
Debug.Log($"[PatchScriptingAssemblyList] patch {binPath}");
}
return true;
}
}
}
@@ -1,12 +1,29 @@
using System;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace UnityFS
namespace HybridCLR.BuildProcessors
{
public class ScriptingAssembliesJsonPatcher
{
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ce487ea0948f9a841a034185c1d536ee
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,71 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using dnlib.DotNet;
using dnlib.DotNet.Writer;
using System.IO;
namespace HybridCLR.CodeGen.AOT
{
public class AOTAssemblyMetadataStripper
{
public static byte[] Strip(byte[] assemblyBytes)
{
var context = ModuleDef.CreateModuleContext();
var readerOption = new ModuleCreationOptions(context)
{
Runtime = CLRRuntimeReaderKind.Mono
};
var mod = ModuleDefMD.Load(assemblyBytes, readerOption);
// remove all resources
mod.Resources.Clear();
foreach (var type in mod.GetTypes())
{
if (type.HasGenericParameters)
{
continue;
}
foreach (var method in type.Methods)
{
if (!method.HasBody || method.HasGenericParameters)
{
continue;
}
method.Body = null;
}
}
var writer = new System.IO.MemoryStream();
var options = new ModuleWriterOptions(mod);
options.MetadataOptions.Flags |= MetadataFlags.PreserveRids;
mod.Write(writer, options);
writer.Flush();
return writer.ToArray();
}
public static void Strip(string originalAssemblyPath, string strippedAssemblyPath)
{
byte[] originDllBytes = System.IO.File.ReadAllBytes(originalAssemblyPath);
byte[] strippedDllBytes = Strip(originDllBytes);
UnityEngine.Debug.Log($"aot dll:{originalAssemblyPath}, length: {originDllBytes.Length} -> {strippedDllBytes.Length}, stripping rate:{(originDllBytes.Length - strippedDllBytes.Length) / (double)originDllBytes.Length} ");
Directory.CreateDirectory(System.IO.Path.GetDirectoryName(strippedAssemblyPath));
System.IO.File.WriteAllBytes(strippedAssemblyPath, strippedDllBytes);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7e9e6a048682dcb4fab806251411f29f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,159 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using HybridCLR.CppCodeGen;
using HybridCLR.Meta;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
namespace HybridCLR.CodeGen.AOT
{
public class AOTGenericReferenceWriter
{
private static readonly Dictionary<Type, string> _typeNameMapping = new Dictionary<Type, string>
{
{typeof(bool), "bool" },
{typeof(byte), "byte" },
{typeof(sbyte), "sbyte" },
{typeof(short), "short" },
{typeof(ushort), "ushort" },
{typeof(int), "int" },
{typeof(uint), "uint" },
{typeof(long), "long" },
{typeof(ulong), "ulong" },
{typeof(float), "float" },
{typeof(double), "double" },
{typeof(object), "object" },
{typeof(string), "string" },
};
private readonly Dictionary<string, string> _typeSimpleNameMapping = new Dictionary<string, string>();
private readonly Regex _systemTypePattern;
private readonly Regex _genericPattern = new Regex(@"`\d+");
public AOTGenericReferenceWriter()
{
foreach (var e in _typeNameMapping)
{
_typeSimpleNameMapping.Add(e.Key.FullName, e.Value);
}
_systemTypePattern = new Regex(string.Join("|", _typeSimpleNameMapping.Keys.Select(k => $@"\b{Regex.Escape(k)}\b")));
}
public string PrettifyTypeSig(string typeSig)
{
string s = _genericPattern.Replace(typeSig, "").Replace('/', '.');
return _systemTypePattern.Replace(s, m => _typeSimpleNameMapping[m.Groups[0].Value]);
}
public string PrettifyMethodSig(string methodSig)
{
string s = PrettifyTypeSig(methodSig).Replace("::", ".");
if (s.Contains(".ctor("))
{
s = "new " + s.Replace(".ctor(", "(");
}
return s;
}
public void Write(List<GenericClass> types, List<GenericMethod> methods, string outputFile)
{
string parentDir = Directory.GetParent(outputFile).FullName;
Directory.CreateDirectory(parentDir);
var cw = new CodeWriter();
cw.WriteLine("using System.Collections.Generic;");
cw.WriteLine("public class AOTGenericReferences : UnityEngine.MonoBehaviour");
cw.WriteLine("{");
cw.IncreaseIndent();
cw.WriteLine();
cw.WriteLine("// {{ AOT assemblies");
cw.WriteLine("public static readonly IReadOnlyList<string> PatchedAOTAssemblyList = new List<string>");
cw.WriteLine("{");
cw.IncreaseIndent();
List<dnlib.DotNet.ModuleDef> modules = new HashSet<dnlib.DotNet.ModuleDef>(
types.Select(t => t.Type.Module).Concat(methods.Select(m => m.Method.Module))).ToList();
modules.Sort((a, b) => a.Name.CompareTo(b.Name));
foreach (dnlib.DotNet.ModuleDef module in modules)
{
cw.WriteLine($"\"{module.Name}\",");
}
cw.DecreaseIndent();
cw.WriteLine("};");
cw.WriteLine("// }}");
cw.WriteLine();
cw.WriteLine("// {{ constraint implement type");
cw.WriteLine("// }} ");
cw.WriteLine();
cw.WriteLine("// {{ AOT generic types");
List<string> typeNames = types.Select(t => PrettifyTypeSig(t.ToTypeSig().ToString())).ToList();
typeNames.Sort(string.CompareOrdinal);
foreach (var typeName in typeNames)
{
cw.WriteLine($"// {typeName}");
}
cw.WriteLine("// }}");
cw.WriteLine();
cw.WriteLine("public void RefMethods()");
cw.WriteLine("{");
cw.IncreaseIndent();
List<(string, string, string)> methodTypeAndNames = methods.Select(m =>
(PrettifyTypeSig(m.Method.DeclaringType.ToString()), PrettifyMethodSig(m.Method.Name), PrettifyMethodSig(m.ToMethodSpec().ToString())))
.ToList();
methodTypeAndNames.Sort((a, b) =>
{
int c = String.Compare(a.Item1, b.Item1, StringComparison.Ordinal);
if (c != 0)
{
return c;
}
c = String.Compare(a.Item2, b.Item2, StringComparison.Ordinal);
if (c != 0)
{
return c;
}
return String.Compare(a.Item3, b.Item3, StringComparison.Ordinal);
});
foreach (var method in methodTypeAndNames)
{
cw.WriteLine($"// {PrettifyMethodSig(method.Item3)}");
}
cw.DecreaseIndent();
cw.WriteLine("}");
cw.DecreaseIndent();
cw.WriteLine("}");
cw.Save(outputFile);
}
}
}
@@ -1,28 +1,49 @@
using dnlib.DotNet;
using HybridCLR.Editor.Meta;
using System;
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using dnlib.DotNet;
using HybridCLR.Meta;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace HybridCLR.Editor.AOT
namespace HybridCLR.CodeGen.AOT
{
public class Analyzer
public class AOTReferenceAnalyzer
{
public class Options
{
public AssemblyReferenceDeepCollector Collector { get; set; }
public int MaxIterationCount { get; set; }
public bool ComputeAotAssembly { get; set; }
}
private readonly int _maxInterationCount;
private readonly AssemblyReferenceDeepCollector _assemblyCollector;
private readonly bool _computeAotAssembly;
private readonly HashSet<GenericClass> _genericTypes = new HashSet<GenericClass>();
private readonly HashSet<GenericMethod> _genericMethods = new HashSet<GenericMethod>();
@@ -37,10 +58,17 @@ namespace HybridCLR.Editor.AOT
private readonly HashSet<string> _hotUpdateAssemblyFiles;
public Analyzer(Options options)
public ConstraintContext ConstraintContext { get; } = new ConstraintContext();
public List<GenericClass> AotGenericTypes { get; } = new List<GenericClass>();
public List<GenericMethod> AotGenericMethods { get; } = new List<GenericMethod>();
public AOTReferenceAnalyzer(Options options)
{
_assemblyCollector = options.Collector;
_maxInterationCount = options.MaxIterationCount;
_computeAotAssembly = options.ComputeAotAssembly;
_methodReferenceAnalyzer = new MethodReferenceAnalyzer(this.OnNewMethod);
_hotUpdateAssemblyFiles = new HashSet<string>(options.Collector.GetRootAssemblyNames().Select(assName => assName + ".dll"));
}
@@ -52,24 +80,34 @@ namespace HybridCLR.Editor.AOT
return;
}
gc = gc.ToGenericShare();
if (_genericTypes.Add(gc) && NeedWalk(gc.Type))
if (_genericTypes.Add(gc) && NeedWalk(null, gc.Type))
{
WalkType(gc);
}
}
private bool NeedWalk(TypeDef type)
private bool NeedWalk(MethodDef callFrom, TypeDef type)
{
return _hotUpdateAssemblyFiles.Contains(type.Module.Name);
return _hotUpdateAssemblyFiles.Contains(type.Module.Name) || callFrom == null || callFrom.HasGenericParameters;
}
private void OnNewMethod(GenericMethod method)
private bool IsAotType(TypeDef type)
{
if(method == null)
return _computeAotAssembly || !_hotUpdateAssemblyFiles.Contains(type.Module.Name);
}
private bool IsAotGenericMethod(MethodDef method)
{
return IsAotType(method.DeclaringType) && method.HasGenericParameters;
}
private void OnNewMethod(MethodDef methodDef, List<TypeSig> klassGenericInst, List<TypeSig> methodGenericInst, GenericMethod method)
{
if (method == null)
{
return;
}
if (_genericMethods.Add(method) && NeedWalk(method.Method.DeclaringType))
if (NeedWalk(methodDef, method.Method.DeclaringType) && _genericMethods.Add(method))
{
_newMethods.Add(method);
}
@@ -85,7 +123,7 @@ namespace HybridCLR.Editor.AOT
{
return;
}
if (_genericMethods.Add(method) && NeedWalk(method.Method.DeclaringType))
if (NeedWalk(null, method.Method.DeclaringType) && _genericMethods.Add(method))
{
_newMethods.Add(method);
}
@@ -129,8 +167,8 @@ namespace HybridCLR.Editor.AOT
private void Prepare()
{
// 将所有非泛型函数全部加入函数列表,同时立马walk这些method。
// 后续迭代中将只遍历MethodSpec
// Add all non-generic methods to the list and walk them immediately.
// Later iterations only walk MethodSpec entries
foreach (var ass in _assemblyCollector.GetLoadedModulesOfRootAssemblies())
{
foreach (TypeDef typeDef in ass.GetTypes())
@@ -141,9 +179,9 @@ namespace HybridCLR.Editor.AOT
for (uint rid = 1, n = ass.Metadata.TablesStream.TypeSpecTable.Rows; rid <= n; rid++)
{
var ts = ass.ResolveTypeSpec(rid);
if (!ts.ContainsGenericParameter)
var cs = GenericClass.ResolveClass(ts, null)?.ToGenericShare();
if (cs != null)
{
var cs = GenericClass.ResolveClass(ts, null)?.ToGenericShare();
TryAddAndWalkGenericType(cs);
}
}
@@ -151,10 +189,6 @@ namespace HybridCLR.Editor.AOT
for (uint rid = 1, n = ass.Metadata.TablesStream.MethodSpecTable.Rows; rid <= n; rid++)
{
var ms = ass.ResolveMethodSpec(rid);
if (ms.DeclaringType.ContainsGenericParameter || ms.GenericInstMethodSig.ContainsGenericParameter)
{
continue;
}
var gm = GenericMethod.ResolveMethod(ms, null)?.ToGenericShare();
TryAddMethodNotWalkType(gm);
}
@@ -179,10 +213,36 @@ namespace HybridCLR.Editor.AOT
}
}
private bool IsNotShareableAOTGenericType(TypeDef typeDef)
{
if (!IsAotType(typeDef))
{
return false;
}
return typeDef.GenericParameters.Any(c => !c.HasReferenceTypeConstraint);
}
private bool IsNotShareableAOTGenericMethod(MethodDef method)
{
if (!IsAotGenericMethod(method))
{
return false;
}
return method.GenericParameters.Concat(method.DeclaringType.GenericParameters).Any(c => !c.HasReferenceTypeConstraint);
}
private void FilterAOTGenericTypeAndMethods()
{
ConstraintContext cc = this.ConstraintContext;
AotGenericTypes.AddRange(_genericTypes.Where(type => IsNotShareableAOTGenericType(type.Type)).Select(gc => cc.ApplyConstraints(gc)));
AotGenericMethods.AddRange(_genericMethods.Where(method => IsNotShareableAOTGenericMethod(method.Method)).Select(gm => cc.ApplyConstraints(gm)));
}
public void Run()
{
Prepare();
RecursiveCollect();
FilterAOTGenericTypeAndMethods();
}
}
}
+90
View File
@@ -0,0 +1,90 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using dnlib.DotNet;
using HybridCLR.Meta;
using HybridCLR.Utils;
using System.Collections.Generic;
namespace HybridCLR.CodeGen.AOT
{
public class ConstraintContext
{
public class ImplType
{
public TypeSig BaseType { get; }
public List<TypeSig> Interfaces { get; }
public bool ValueType { get; }
private readonly int _hash;
public ImplType(TypeSig baseType, List<TypeSig> interfaces, bool valueType)
{
BaseType = baseType;
Interfaces = interfaces;
ValueType = valueType;
_hash = ComputHash();
}
public override bool Equals(object obj)
{
ImplType o = (ImplType)obj;
return MetaUtil.EqualsTypeSig(this.BaseType, o.BaseType)
&& MetaUtil.EqualsTypeSigArray(this.Interfaces, o.Interfaces)
&& this.ValueType == o.ValueType;
}
public override int GetHashCode()
{
return _hash;
}
private int ComputHash()
{
int hash = 0;
if (BaseType != null)
{
hash = HashUtil.CombineHash(hash, TypeEqualityComparer.Instance.GetHashCode(BaseType));
}
if (Interfaces.Count > 0)
{
hash = HashUtil.CombineHash(hash, HashUtil.ComputHash(Interfaces));
}
return hash;
}
}
public HashSet<ImplType> ImplTypes { get; } = new HashSet<ImplType>();
public GenericClass ApplyConstraints(GenericClass gc)
{
return gc;
}
public GenericMethod ApplyConstraints(GenericMethod gm)
{
return gm;
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 812d81a75b690394bbe16ef5f0bcbc46
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+94
View File
@@ -0,0 +1,94 @@
// Copyright 2026 Code Philosophy
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using System;
using System.Collections.Generic;
using System.Text;
namespace HybridCLR.CppCodeGen
{
public class CodeWriter
{
private readonly List<string> _lines = new List<string>();
private readonly int _indentSize;
private readonly char _indentChar;
private int _indentLevel = 0;
private string _indent = string.Empty;
public CodeWriter(int indentSize = 4, char indentChar = ' ')
{
if (indentSize < 0)
{
throw new ArgumentOutOfRangeException(nameof(indentSize));
}
_indentSize = indentSize;
_indentChar = indentChar;
}
public int IndentLevel => _indentLevel;
public void IncreaseIndent()
{
_indentLevel++;
_indent = new string(_indentChar, _indentLevel * _indentSize);
}
public void DecreaseIndent()
{
if (_indentLevel <= 0)
{
throw new InvalidOperationException("Indent level cannot be negative");
}
_indentLevel--;
_indent = _indentLevel == 0 ? string.Empty : new string(_indentChar, _indentLevel * _indentSize);
}
public void ResetIndent()
{
_indentLevel = 0;
_indent = string.Empty;
}
public void WriteLine(string line)
{
_lines.Add($"{_indent}{line}");
}
public void WriteLine()
{
_lines.Add(string.Empty);
}
public string GetContent(string newLine = "\n")
{
return string.Join(newLine, _lines);
}
public void Save(string filePath)
{
System.IO.File.WriteAllText(filePath, GetContent() + "\n", new UTF8Encoding(false));
UnityEngine.Debug.Log($"write file to {filePath}");
}
}
}

Some files were not shown because too many files have changed in this diff Show More