diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efcb3a1..b17baf0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ All notable version changes will be recorded in this file. *** +### [v3.23.7] revision + +**Improve**: + - `GNU Arm Toolchain`: Support new mcpu: `cortex-m52, cortex-m55, cortex-m85`. + - `unify_builder`: Optimize builder speed. + +*** + ### [v3.23.6] revision **Fix**: diff --git a/package.json b/package.json index cdc8079c..dadde8b5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "homepage": "https://em-ide.com", "license": "MIT", "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V", - "version": "3.23.6", + "version": "3.23.7", "preview": false, "engines": { "vscode": "^1.67.0" diff --git a/res/data/models/arm.gcc.model.json b/res/data/models/arm.gcc.model.json index fe3968f9..7dee94c6 100644 --- a/res/data/models/arm.gcc.model.json +++ b/res/data/models/arm.gcc.model.json @@ -50,6 +50,15 @@ "cortex-m7": "-mfloat-abi=soft", "cortex-m7-sp": "-mfloat-abi=${$float-abi-type}", "cortex-m7-dp": "-mfloat-abi=${$float-abi-type}", + "cortex-m52" : "-mfloat-abi=soft", + "cortex-m52-sp" : "-mfloat-abi=${$float-abi-type}", + "cortex-m52-dp" : "-mfloat-abi=${$float-abi-type}", + "cortex-m55" : "-mfloat-abi=soft", + "cortex-m55-sp" : "-mfloat-abi=${$float-abi-type}", + "cortex-m55-dp" : "-mfloat-abi=${$float-abi-type}", + "cortex-m85" : "-mfloat-abi=soft", + "cortex-m85-sp" : "-mfloat-abi=${$float-abi-type}", + "cortex-m85-dp" : "-mfloat-abi=${$float-abi-type}", "cortex-r4": "-mfloat-abi=soft", "cortex-r4-sp": "-mfloat-abi=${$float-abi-type}", "cortex-r4-dp": "-mfloat-abi=${$float-abi-type}", @@ -96,6 +105,15 @@ "cortex-m7": "", "cortex-m7-sp": "-mfpu=fpv5-sp-d16", "cortex-m7-dp": "-mfpu=fpv5-d16", + "cortex-m52" : "", + "cortex-m52-sp" : "-mfpu=fpv5-sp-d16", + "cortex-m52-dp" : "-mfpu=fpv5-d16", + "cortex-m55" : "", + "cortex-m55-sp" : "-mfpu=fpv5-sp-d16", + "cortex-m55-dp" : "-mfpu=fpv5-d16", + "cortex-m85" : "", + "cortex-m85-sp" : "-mfpu=fpv5-sp-d16", + "cortex-m85-dp" : "-mfpu=fpv5-d16", "cortex-r4": "", "cortex-r4-sp": "-mfpu=vfpv3xd", "cortex-r4-dp": "-mfpu=vfpv3-d16", @@ -134,15 +152,24 @@ "cortex-m0+.small-multiply": "-mcpu=cortex-m0plus.small-multiply", "cortex-m23": "-mcpu=cortex-m23", "cortex-m3": "-mcpu=cortex-m3", - "cortex-m33": "-mcpu=cortex-m33", - "cortex-m33-sp": "-mcpu=cortex-m33", - "cortex-m35p": "-mcpu=cortex-m35p", - "cortex-m35p-sp": "-mcpu=cortex-m35p", + "cortex-m33" : "-mcpu=cortex-m33${$arch-extensions}", + "cortex-m33-sp" : "-mcpu=cortex-m33${$arch-extensions}", + "cortex-m35p" : "-mcpu=cortex-m35p${$arch-extensions}", + "cortex-m35p-sp": "-mcpu=cortex-m35p${$arch-extensions}", "cortex-m4": "-mcpu=cortex-m4", "cortex-m4-sp": "-mcpu=cortex-m4", "cortex-m7": "-mcpu=cortex-m7", "cortex-m7-sp": "-mcpu=cortex-m7", "cortex-m7-dp": "-mcpu=cortex-m7", + "cortex-m52" : "-mcpu=cortex-m52${$arch-extensions}", + "cortex-m52-sp" : "-mcpu=cortex-m52${$arch-extensions}", + "cortex-m52-dp" : "-mcpu=cortex-m52${$arch-extensions}", + "cortex-m55" : "-mcpu=cortex-m55${$arch-extensions}", + "cortex-m55-sp" : "-mcpu=cortex-m55${$arch-extensions}", + "cortex-m55-dp" : "-mcpu=cortex-m55${$arch-extensions}", + "cortex-m85" : "-mcpu=cortex-m85${$arch-extensions}", + "cortex-m85-sp" : "-mcpu=cortex-m85${$arch-extensions}", + "cortex-m85-dp" : "-mcpu=cortex-m85${$arch-extensions}", "cortex-r4": "-mcpu=cortex-r4", "cortex-r4-sp": "-mcpu=cortex-r4", "cortex-r4-dp": "-mcpu=cortex-r4", diff --git a/res/tools/darwin/unify_builder/arm64/Microsoft.Data.Sqlite.dll b/res/tools/darwin/unify_builder/arm64/Microsoft.Data.Sqlite.dll new file mode 100644 index 00000000..b38befe0 Binary files /dev/null and b/res/tools/darwin/unify_builder/arm64/Microsoft.Data.Sqlite.dll differ diff --git a/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.batteries_v2.dll b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.batteries_v2.dll new file mode 100644 index 00000000..53e53eb0 Binary files /dev/null and b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.batteries_v2.dll differ diff --git a/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.core.dll b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.core.dll new file mode 100644 index 00000000..1eb96e66 Binary files /dev/null and b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.core.dll differ diff --git a/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.provider.e_sqlite3.dll b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.provider.e_sqlite3.dll new file mode 100644 index 00000000..a06a7826 Binary files /dev/null and b/res/tools/darwin/unify_builder/arm64/SQLitePCLRaw.provider.e_sqlite3.dll differ diff --git a/res/tools/darwin/unify_builder/arm64/libe_sqlite3.dylib b/res/tools/darwin/unify_builder/arm64/libe_sqlite3.dylib new file mode 100644 index 00000000..05932eba Binary files /dev/null and b/res/tools/darwin/unify_builder/arm64/libe_sqlite3.dylib differ diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json b/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json index c2555f1a..b251f143 100644 --- a/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json +++ b/res/tools/darwin/unify_builder/arm64/unify_builder.deps.json @@ -7,12 +7,14 @@ "targets": { ".NETCoreApp,Version=v6.0": {}, ".NETCoreApp,Version=v6.0/osx-arm64": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "dependencies": { "CommandLineParser": "2.9.1", "ConsoleTableExt": "3.1.9", "DotNet.Glob": "3.1.3", + "Microsoft.Data.Sqlite": "9.0.7", "Newtonsoft.Json": "13.0.1", + "SQLitePCLRaw.core": "2.1.11", "System.Text.Encoding.CodePages": "6.0.0" }, "runtime": { @@ -43,6 +45,24 @@ } } }, + "Microsoft.Data.Sqlite/9.0.7": { + "dependencies": { + "Microsoft.Data.Sqlite.Core": "9.0.7", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.10", + "SQLitePCLRaw.core": "2.1.11" + } + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/Microsoft.Data.Sqlite.dll": { + "assemblyVersion": "9.0.7.0", + "fileVersion": "9.0.725.31607" + } + } + }, "Newtonsoft.Json/13.0.1": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { @@ -51,6 +71,48 @@ } } }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.10", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.10" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "SQLitePCLRaw.core/2.1.11": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.core.dll": { + "assemblyVersion": "2.1.11.2622", + "fileVersion": "2.1.11.2622" + } + } + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "native": { + "runtimes/osx-arm64/native/libe_sqlite3.dylib": { + "fileVersion": "0.0.0.0" + } + } + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "System.Memory/4.5.3": {}, "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Text.Encoding.CodePages/6.0.0": { "dependencies": { @@ -60,7 +122,7 @@ } }, "libraries": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "type": "project", "serviceable": false, "sha512": "" @@ -86,6 +148,20 @@ "path": "dotnet.glob/3.1.3", "hashPath": "dotnet.glob.3.1.3.nupkg.sha512" }, + "Microsoft.Data.Sqlite/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zPyE8rASXQALTOHI/flV1YzCErlnuDm9Wv7jxYhC1KkheWBMJRJ95Yl8ZqXPa/8R16DJ3IZn8KnOVcqs3bYBmA==", + "path": "microsoft.data.sqlite/9.0.7", + "hashPath": "microsoft.data.sqlite.9.0.7.nupkg.sha512" + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-yjlU0Wu0tAexFPlo/bbkYFMWyEkVHqr5AONyh91YJ4KH+hys+eAzHQxd14aZwtQOgpJ5s9r3QL9+tVJww8w69Q==", + "path": "microsoft.data.sqlite.core/9.0.7", + "hashPath": "microsoft.data.sqlite.core.9.0.7.nupkg.sha512" + }, "Newtonsoft.Json/13.0.1": { "type": "package", "serviceable": true, @@ -93,6 +169,41 @@ "path": "newtonsoft.json/13.0.1", "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UxWuisvZ3uVcVOLJQv7urM/JiQH+v3TmaJc1BLKl5Dxfm/nTzTUrqswCqg/INiYLi61AXnHo1M1JPmPqqLnAdg==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.11": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA==", + "path": "sqlitepclraw.core/2.1.11", + "hashPath": "sqlitepclraw.core.2.1.11.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mAr69tDbnf3QJpRy2nJz8Qdpebdil00fvycyByR58Cn9eARvR+UiG2Vzsp+4q1tV3ikwiYIjlXCQFc12GfebbA==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uZVTi02C1SxqzgT0HqTWatIbWGb40iIkfc3FpFCpE/r7g6K0PqzDUeefL6P6HPhDtc6BacN3yQysfzP7ks+wSQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, diff --git a/res/tools/darwin/unify_builder/arm64/unify_builder.dll b/res/tools/darwin/unify_builder/arm64/unify_builder.dll index c4b75c0a..429f02cc 100644 Binary files a/res/tools/darwin/unify_builder/arm64/unify_builder.dll and b/res/tools/darwin/unify_builder/arm64/unify_builder.dll differ diff --git a/res/tools/darwin/unify_builder/x86_64/Microsoft.Data.Sqlite.dll b/res/tools/darwin/unify_builder/x86_64/Microsoft.Data.Sqlite.dll new file mode 100644 index 00000000..b38befe0 Binary files /dev/null and b/res/tools/darwin/unify_builder/x86_64/Microsoft.Data.Sqlite.dll differ diff --git a/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.batteries_v2.dll b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.batteries_v2.dll new file mode 100644 index 00000000..53e53eb0 Binary files /dev/null and b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.batteries_v2.dll differ diff --git a/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.core.dll b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.core.dll new file mode 100644 index 00000000..1eb96e66 Binary files /dev/null and b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.core.dll differ diff --git a/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.provider.e_sqlite3.dll b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.provider.e_sqlite3.dll new file mode 100644 index 00000000..a06a7826 Binary files /dev/null and b/res/tools/darwin/unify_builder/x86_64/SQLitePCLRaw.provider.e_sqlite3.dll differ diff --git a/res/tools/darwin/unify_builder/x86_64/libe_sqlite3.dylib b/res/tools/darwin/unify_builder/x86_64/libe_sqlite3.dylib new file mode 100644 index 00000000..0cd9a576 Binary files /dev/null and b/res/tools/darwin/unify_builder/x86_64/libe_sqlite3.dylib differ diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json b/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json index fcb4bfbd..9fd08148 100644 --- a/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json +++ b/res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json @@ -7,12 +7,14 @@ "targets": { ".NETCoreApp,Version=v6.0": {}, ".NETCoreApp,Version=v6.0/osx-x64": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "dependencies": { "CommandLineParser": "2.9.1", "ConsoleTableExt": "3.1.9", "DotNet.Glob": "3.1.3", + "Microsoft.Data.Sqlite": "9.0.7", "Newtonsoft.Json": "13.0.1", + "SQLitePCLRaw.core": "2.1.11", "System.Text.Encoding.CodePages": "6.0.0" }, "runtime": { @@ -43,6 +45,24 @@ } } }, + "Microsoft.Data.Sqlite/9.0.7": { + "dependencies": { + "Microsoft.Data.Sqlite.Core": "9.0.7", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.10", + "SQLitePCLRaw.core": "2.1.11" + } + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/Microsoft.Data.Sqlite.dll": { + "assemblyVersion": "9.0.7.0", + "fileVersion": "9.0.725.31607" + } + } + }, "Newtonsoft.Json/13.0.1": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { @@ -51,6 +71,48 @@ } } }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.10", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.10" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "SQLitePCLRaw.core/2.1.11": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.core.dll": { + "assemblyVersion": "2.1.11.2622", + "fileVersion": "2.1.11.2622" + } + } + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "native": { + "runtimes/osx-x64/native/libe_sqlite3.dylib": { + "fileVersion": "0.0.0.0" + } + } + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "System.Memory/4.5.3": {}, "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Text.Encoding.CodePages/6.0.0": { "dependencies": { @@ -60,7 +122,7 @@ } }, "libraries": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "type": "project", "serviceable": false, "sha512": "" @@ -86,6 +148,20 @@ "path": "dotnet.glob/3.1.3", "hashPath": "dotnet.glob.3.1.3.nupkg.sha512" }, + "Microsoft.Data.Sqlite/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zPyE8rASXQALTOHI/flV1YzCErlnuDm9Wv7jxYhC1KkheWBMJRJ95Yl8ZqXPa/8R16DJ3IZn8KnOVcqs3bYBmA==", + "path": "microsoft.data.sqlite/9.0.7", + "hashPath": "microsoft.data.sqlite.9.0.7.nupkg.sha512" + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-yjlU0Wu0tAexFPlo/bbkYFMWyEkVHqr5AONyh91YJ4KH+hys+eAzHQxd14aZwtQOgpJ5s9r3QL9+tVJww8w69Q==", + "path": "microsoft.data.sqlite.core/9.0.7", + "hashPath": "microsoft.data.sqlite.core.9.0.7.nupkg.sha512" + }, "Newtonsoft.Json/13.0.1": { "type": "package", "serviceable": true, @@ -93,6 +169,41 @@ "path": "newtonsoft.json/13.0.1", "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UxWuisvZ3uVcVOLJQv7urM/JiQH+v3TmaJc1BLKl5Dxfm/nTzTUrqswCqg/INiYLi61AXnHo1M1JPmPqqLnAdg==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.11": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA==", + "path": "sqlitepclraw.core/2.1.11", + "hashPath": "sqlitepclraw.core.2.1.11.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mAr69tDbnf3QJpRy2nJz8Qdpebdil00fvycyByR58Cn9eARvR+UiG2Vzsp+4q1tV3ikwiYIjlXCQFc12GfebbA==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uZVTi02C1SxqzgT0HqTWatIbWGb40iIkfc3FpFCpE/r7g6K0PqzDUeefL6P6HPhDtc6BacN3yQysfzP7ks+wSQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, diff --git a/res/tools/darwin/unify_builder/x86_64/unify_builder.dll b/res/tools/darwin/unify_builder/x86_64/unify_builder.dll index 1a57f147..b2904f82 100644 Binary files a/res/tools/darwin/unify_builder/x86_64/unify_builder.dll and b/res/tools/darwin/unify_builder/x86_64/unify_builder.dll differ diff --git a/res/tools/linux/unify_builder/Microsoft.Data.Sqlite.dll b/res/tools/linux/unify_builder/Microsoft.Data.Sqlite.dll new file mode 100644 index 00000000..b38befe0 Binary files /dev/null and b/res/tools/linux/unify_builder/Microsoft.Data.Sqlite.dll differ diff --git a/res/tools/linux/unify_builder/SQLitePCLRaw.batteries_v2.dll b/res/tools/linux/unify_builder/SQLitePCLRaw.batteries_v2.dll new file mode 100644 index 00000000..53e53eb0 Binary files /dev/null and b/res/tools/linux/unify_builder/SQLitePCLRaw.batteries_v2.dll differ diff --git a/res/tools/linux/unify_builder/SQLitePCLRaw.core.dll b/res/tools/linux/unify_builder/SQLitePCLRaw.core.dll new file mode 100644 index 00000000..1eb96e66 Binary files /dev/null and b/res/tools/linux/unify_builder/SQLitePCLRaw.core.dll differ diff --git a/res/tools/linux/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll b/res/tools/linux/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll new file mode 100644 index 00000000..a06a7826 Binary files /dev/null and b/res/tools/linux/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll differ diff --git a/res/tools/linux/unify_builder/libe_sqlite3.so b/res/tools/linux/unify_builder/libe_sqlite3.so new file mode 100644 index 00000000..705798ad Binary files /dev/null and b/res/tools/linux/unify_builder/libe_sqlite3.so differ diff --git a/res/tools/linux/unify_builder/unify_builder.deps.json b/res/tools/linux/unify_builder/unify_builder.deps.json index 06e8441f..152b432c 100644 --- a/res/tools/linux/unify_builder/unify_builder.deps.json +++ b/res/tools/linux/unify_builder/unify_builder.deps.json @@ -7,12 +7,14 @@ "targets": { ".NETCoreApp,Version=v6.0": {}, ".NETCoreApp,Version=v6.0/linux-x64": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "dependencies": { "CommandLineParser": "2.9.1", "ConsoleTableExt": "3.1.9", "DotNet.Glob": "3.1.3", + "Microsoft.Data.Sqlite": "9.0.7", "Newtonsoft.Json": "13.0.1", + "SQLitePCLRaw.core": "2.1.11", "System.Text.Encoding.CodePages": "6.0.0" }, "runtime": { @@ -43,6 +45,24 @@ } } }, + "Microsoft.Data.Sqlite/9.0.7": { + "dependencies": { + "Microsoft.Data.Sqlite.Core": "9.0.7", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.10", + "SQLitePCLRaw.core": "2.1.11" + } + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/Microsoft.Data.Sqlite.dll": { + "assemblyVersion": "9.0.7.0", + "fileVersion": "9.0.725.31607" + } + } + }, "Newtonsoft.Json/13.0.1": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { @@ -51,6 +71,48 @@ } } }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.10", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.10" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "SQLitePCLRaw.core/2.1.11": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.core.dll": { + "assemblyVersion": "2.1.11.2622", + "fileVersion": "2.1.11.2622" + } + } + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "native": { + "runtimes/linux-x64/native/libe_sqlite3.so": { + "fileVersion": "0.0.0.0" + } + } + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "System.Memory/4.5.3": {}, "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Text.Encoding.CodePages/6.0.0": { "dependencies": { @@ -60,7 +122,7 @@ } }, "libraries": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "type": "project", "serviceable": false, "sha512": "" @@ -86,6 +148,20 @@ "path": "dotnet.glob/3.1.3", "hashPath": "dotnet.glob.3.1.3.nupkg.sha512" }, + "Microsoft.Data.Sqlite/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zPyE8rASXQALTOHI/flV1YzCErlnuDm9Wv7jxYhC1KkheWBMJRJ95Yl8ZqXPa/8R16DJ3IZn8KnOVcqs3bYBmA==", + "path": "microsoft.data.sqlite/9.0.7", + "hashPath": "microsoft.data.sqlite.9.0.7.nupkg.sha512" + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-yjlU0Wu0tAexFPlo/bbkYFMWyEkVHqr5AONyh91YJ4KH+hys+eAzHQxd14aZwtQOgpJ5s9r3QL9+tVJww8w69Q==", + "path": "microsoft.data.sqlite.core/9.0.7", + "hashPath": "microsoft.data.sqlite.core.9.0.7.nupkg.sha512" + }, "Newtonsoft.Json/13.0.1": { "type": "package", "serviceable": true, @@ -93,6 +169,41 @@ "path": "newtonsoft.json/13.0.1", "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UxWuisvZ3uVcVOLJQv7urM/JiQH+v3TmaJc1BLKl5Dxfm/nTzTUrqswCqg/INiYLi61AXnHo1M1JPmPqqLnAdg==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.11": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA==", + "path": "sqlitepclraw.core/2.1.11", + "hashPath": "sqlitepclraw.core.2.1.11.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mAr69tDbnf3QJpRy2nJz8Qdpebdil00fvycyByR58Cn9eARvR+UiG2Vzsp+4q1tV3ikwiYIjlXCQFc12GfebbA==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uZVTi02C1SxqzgT0HqTWatIbWGb40iIkfc3FpFCpE/r7g6K0PqzDUeefL6P6HPhDtc6BacN3yQysfzP7ks+wSQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, diff --git a/res/tools/linux/unify_builder/unify_builder.dll b/res/tools/linux/unify_builder/unify_builder.dll index 1a57f147..b2904f82 100644 Binary files a/res/tools/linux/unify_builder/unify_builder.dll and b/res/tools/linux/unify_builder/unify_builder.dll differ diff --git a/res/tools/win32/unify_builder/Microsoft.Data.Sqlite.dll b/res/tools/win32/unify_builder/Microsoft.Data.Sqlite.dll new file mode 100644 index 00000000..7a1b231f Binary files /dev/null and b/res/tools/win32/unify_builder/Microsoft.Data.Sqlite.dll differ diff --git a/res/tools/win32/unify_builder/SQLitePCLRaw.batteries_v2.dll b/res/tools/win32/unify_builder/SQLitePCLRaw.batteries_v2.dll new file mode 100644 index 00000000..1ff9df97 Binary files /dev/null and b/res/tools/win32/unify_builder/SQLitePCLRaw.batteries_v2.dll differ diff --git a/res/tools/win32/unify_builder/SQLitePCLRaw.core.dll b/res/tools/win32/unify_builder/SQLitePCLRaw.core.dll new file mode 100644 index 00000000..1a1913c2 Binary files /dev/null and b/res/tools/win32/unify_builder/SQLitePCLRaw.core.dll differ diff --git a/res/tools/win32/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll b/res/tools/win32/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll new file mode 100644 index 00000000..d39b5dc4 Binary files /dev/null and b/res/tools/win32/unify_builder/SQLitePCLRaw.provider.e_sqlite3.dll differ diff --git a/res/tools/win32/unify_builder/e_sqlite3.dll b/res/tools/win32/unify_builder/e_sqlite3.dll new file mode 100644 index 00000000..8c1c1d9e Binary files /dev/null and b/res/tools/win32/unify_builder/e_sqlite3.dll differ diff --git a/res/tools/win32/unify_builder/unify_builder.deps.json b/res/tools/win32/unify_builder/unify_builder.deps.json index 11e20889..4c698eb7 100644 --- a/res/tools/win32/unify_builder/unify_builder.deps.json +++ b/res/tools/win32/unify_builder/unify_builder.deps.json @@ -7,12 +7,14 @@ "targets": { ".NETCoreApp,Version=v6.0": {}, ".NETCoreApp,Version=v6.0/win-x64": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "dependencies": { "CommandLineParser": "2.9.1", "ConsoleTableExt": "3.1.9", "DotNet.Glob": "3.1.3", + "Microsoft.Data.Sqlite": "9.0.7", "Newtonsoft.Json": "13.0.1", + "SQLitePCLRaw.core": "2.1.11", "System.Text.Encoding.CodePages": "6.0.0" }, "runtime": { @@ -43,6 +45,24 @@ } } }, + "Microsoft.Data.Sqlite/9.0.7": { + "dependencies": { + "Microsoft.Data.Sqlite.Core": "9.0.7", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.10", + "SQLitePCLRaw.core": "2.1.11" + } + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/Microsoft.Data.Sqlite.dll": { + "assemblyVersion": "9.0.7.0", + "fileVersion": "9.0.725.31607" + } + } + }, "Newtonsoft.Json/13.0.1": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { @@ -51,6 +71,48 @@ } } }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.10", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.10" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "SQLitePCLRaw.core/2.1.11": { + "dependencies": { + "System.Memory": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/SQLitePCLRaw.core.dll": { + "assemblyVersion": "2.1.11.2622", + "fileVersion": "2.1.11.2622" + } + } + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "native": { + "runtimes/win-x64/native/e_sqlite3.dll": { + "fileVersion": "0.0.0.0" + } + } + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "dependencies": { + "SQLitePCLRaw.core": "2.1.11" + }, + "runtime": { + "lib/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll": { + "assemblyVersion": "2.1.10.2445", + "fileVersion": "2.1.10.2445" + } + } + }, + "System.Memory/4.5.3": {}, "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Text.Encoding.CodePages/6.0.0": { "dependencies": { @@ -60,7 +122,7 @@ } }, "libraries": { - "unify_builder/3.10.2": { + "unify_builder/3.10.3": { "type": "project", "serviceable": false, "sha512": "" @@ -86,6 +148,20 @@ "path": "dotnet.glob/3.1.3", "hashPath": "dotnet.glob.3.1.3.nupkg.sha512" }, + "Microsoft.Data.Sqlite/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zPyE8rASXQALTOHI/flV1YzCErlnuDm9Wv7jxYhC1KkheWBMJRJ95Yl8ZqXPa/8R16DJ3IZn8KnOVcqs3bYBmA==", + "path": "microsoft.data.sqlite/9.0.7", + "hashPath": "microsoft.data.sqlite.9.0.7.nupkg.sha512" + }, + "Microsoft.Data.Sqlite.Core/9.0.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-yjlU0Wu0tAexFPlo/bbkYFMWyEkVHqr5AONyh91YJ4KH+hys+eAzHQxd14aZwtQOgpJ5s9r3QL9+tVJww8w69Q==", + "path": "microsoft.data.sqlite.core/9.0.7", + "hashPath": "microsoft.data.sqlite.core.9.0.7.nupkg.sha512" + }, "Newtonsoft.Json/13.0.1": { "type": "package", "serviceable": true, @@ -93,6 +169,41 @@ "path": "newtonsoft.json/13.0.1", "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UxWuisvZ3uVcVOLJQv7urM/JiQH+v3TmaJc1BLKl5Dxfm/nTzTUrqswCqg/INiYLi61AXnHo1M1JPmPqqLnAdg==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.11": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA==", + "path": "sqlitepclraw.core/2.1.11", + "hashPath": "sqlitepclraw.core.2.1.11.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mAr69tDbnf3QJpRy2nJz8Qdpebdil00fvycyByR58Cn9eARvR+UiG2Vzsp+4q1tV3ikwiYIjlXCQFc12GfebbA==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uZVTi02C1SxqzgT0HqTWatIbWGb40iIkfc3FpFCpE/r7g6K0PqzDUeefL6P6HPhDtc6BacN3yQysfzP7ks+wSQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.10", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512" + }, + "System.Memory/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "path": "system.memory/4.5.3", + "hashPath": "system.memory.4.5.3.nupkg.sha512" + }, "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, diff --git a/res/tools/win32/unify_builder/unify_builder.dll b/res/tools/win32/unify_builder/unify_builder.dll index 4ea13247..cbc56d5d 100644 Binary files a/res/tools/win32/unify_builder/unify_builder.dll and b/res/tools/win32/unify_builder/unify_builder.dll differ diff --git a/res/tools/win32/unify_builder/unify_builder.exe b/res/tools/win32/unify_builder/unify_builder.exe index 3c5a0e09..694c7ec8 100644 Binary files a/res/tools/win32/unify_builder/unify_builder.exe and b/res/tools/win32/unify_builder/unify_builder.exe differ diff --git a/src/ArmCpuUtils.ts b/src/ArmCpuUtils.ts index f7b2e71b..dfbb1502 100644 --- a/src/ArmCpuUtils.ts +++ b/src/ArmCpuUtils.ts @@ -98,8 +98,8 @@ function __cde_extensions(): { name: string, description: string }[] { } /** - * 当使用 march 代替 mcpu 时,则无需指定 mfpu,而是通过添加 +<扩展名> 来增加扩展功能 - * 虽然 mcpu 也可以指定 +<扩展名>,但一般情况下我们不会这样使用,所以这里不考虑这种情况。 + * 使用 march 代替 mcpu 时,则无需指定 mfpu,而是通过添加 +<扩展名> 来增加扩展功能 + * 使用 mcpu 也可以指定 +<扩展名>,但一般情况下我们不会这样使用 * @param toolchain 可用值:'GCC', 'AC6' * @note 该函数返回的 arch 扩展的别名 'name' 字段默认是使用 GCC 的命名方式。 * 如果使用 AC6 的 armlink.exe, 则需要进行额外处理。 @@ -331,7 +331,7 @@ export function hasFpu(cpu: string, hasDp?: boolean) { return false; } } else { - const cortex_dp_mcus = ['m7', 'm52', 'm55', 'r4', 'r5', 'r7']; + const cortex_dp_mcus = ['m7', 'm52', 'm55', 'm85', 'r4', 'r5', 'r7']; const cortex_sp_mcus = ['m33', 'm4', 'm35p'].concat(cortex_dp_mcus); cpu = cpu.toLowerCase(); if (hasDp) { // check dp diff --git a/src/EIDEProjectExplorer.ts b/src/EIDEProjectExplorer.ts index ecacb334..1ec91d22 100644 --- a/src/EIDEProjectExplorer.ts +++ b/src/EIDEProjectExplorer.ts @@ -4015,11 +4015,6 @@ export class ProjectExplorer implements CustomConfigurationProvider { // .forEach(d => clangdCompileFlags.push(`-D${d}`)); // del repeat cfg['CompileFlags']['Add'] = ArrayDelRepetition(clangdCompileFlags); - - // 排除掉 clangd 不支持的参数 - const removeArgs = cfg['CompileFlags']['Remove']; - removeArgs.push(`-f*`); - cfg['CompileFlags']['Remove'] = ArrayDelRepetition(removeArgs); } // 其他不受 clangd 支持的编译器要自行设置 -I -D else if (toolchain.name == 'AC5' || toolchain.name == 'SDCC') { diff --git a/src/EIDEProjectModules.ts b/src/EIDEProjectModules.ts index c6e0c500..55ca42b1 100644 --- a/src/EIDEProjectModules.ts +++ b/src/EIDEProjectModules.ts @@ -1074,6 +1074,9 @@ export class GccCompileConfigModel extends ArmBaseCompileConfigModel { 'Cortex-M35P', 'Cortex-M4', 'Cortex-M7', + 'Cortex-M52', + 'Cortex-M55', + 'Cortex-M85', 'Cortex-R4', 'Cortex-R5', 'Cortex-R7',