From b8b7fabd3a8296aea295f7a1960df33d1dcf6b1f Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 8 Sep 2024 23:18:03 +1000 Subject: [PATCH 01/11] Nix expr: Regen NuGet lockfile --- Dist/deps.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dist/deps.nix b/Dist/deps.nix index 9f5b4718708..2c22c77d3ee 100644 --- a/Dist/deps.nix +++ b/Dist/deps.nix @@ -56,7 +56,7 @@ (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.38.0"; sha256 = "04sh7fzv7xhxxz2nb43arcs2ri9hb3acpb70kymbpagfmj8zf0kd"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.21.0"; sha256 = "0z24vczhivzszs28sw92kr9zlx3mxcic3lka8lig2zs6dl5591hg"; }) @@ -99,7 +99,7 @@ (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) @@ -113,4 +113,5 @@ (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; sha256 = "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"; }) (fetchNuGet { pname = "Vortice.MediaFoundation"; version = "2.4.2"; sha256 = "0nk8r564w8x791nqn5457jcq0gj7v6k5v1mziisqy4945byjxcdl"; }) (fetchNuGet { pname = "Vortice.XAudio2"; version = "2.4.2"; sha256 = "0iwnaa0jdl3782k9i9j2c0s7lyxjky1ph6i8dv12w3ym2p19h3qc"; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.1"; sha256 = "1f0wb6h3m9nfp2a4lzj01fsz68jw9mdp9xg9nyzb4lp57p5jzr1x"; }) ] From 2d938ae61d351ef07d0bdada0f32d139b37dc592 Mon Sep 17 00:00:00 2001 From: kalimag Date: Sun, 8 Sep 2024 14:02:20 +0200 Subject: [PATCH 02/11] Dispose input files in DiscoHawk --- .../DiscoHawkLogic/DiscoHawkLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs b/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs index 81c426fc4a4..82787a2e25b 100644 --- a/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs +++ b/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs @@ -257,12 +257,12 @@ public static bool HawkAndWriteFile(string inputPath, Action errorCallba { DiscMountJob job = new(inputPath, discInterface); job.Run(); - var disc = job.OUT_Disc; if (job.OUT_ErrorLevel) { errorCallback(job.OUT_Log); return false; } + using var disc = job.OUT_Disc; var (dir, baseName, _) = inputPath.SplitPathToDirFileAndExt(); var ext = hawkedFormat switch { From 09f037544f5e3f5d0dcb115764b4f1dc0fe21090 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 9 Sep 2024 00:24:39 +1000 Subject: [PATCH 03/11] Don't set `PrivateAssets="all"` for `System.CommandLine` package fixes d908d7718 --- src/BizHawk.Client.Common/BizHawk.Client.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj index e27697dfd1f..8a878ebfdec 100644 --- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -13,7 +13,7 @@ - + From ddb63e53368d7b31afe0d3e6ec7e9cfc5aaff9e2 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sun, 8 Sep 2024 17:19:12 +0200 Subject: [PATCH 04/11] Removing unnecessary files --- .vscode/launch.json | 25 ------------------------- .vscode/tasks.json | 24 ------------------------ 2 files changed, 49 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index b2acd4d794d..00000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": ".NET Launch (console)", - "type": "clr", - "request": "launch", - "preLaunchTask": "build", - "program": "${workspaceFolder}/output/EmuHawk.exe", - "args": [], - "cwd": "${workspaceFolder}/output", - "console": "externalTerminal", - "stopAtEntry": false - }, - { - "name": ".NET Attach", - "type": "clr", - "request": "attach", - "processId": "${command:pickProcess}" - } - ] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 1563eed509c..00000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "command": "dotnet", - "type": "shell", - "args": [ - "build", - // Ask dotnet build to generate full paths for file names. - "/property:GenerateFullPaths=true", - // Do not generate summary otherwise it leads to duplicate errors in Problems panel - "/consoleloggerparameters:NoSummary" - ], - "group": "build", - "presentation": { - "reveal": "silent" - }, - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file From f9610ed3afcc3687474aa4793182a7252048d2d7 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sun, 8 Sep 2024 19:44:23 +0200 Subject: [PATCH 05/11] Update src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs Co-authored-by: James Groom --- .../Consoles/Atari/Stella/Stella.IMemoryDomains.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs index bb9756f0de4..ee4069fbbe3 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs @@ -8,7 +8,6 @@ namespace BizHawk.Emulation.Cores.Atari.Stella public partial class Stella { internal IMemoryDomains MemoryDomains; - private readonly Dictionary _byteArrayDomains = new Dictionary(); private uint _cartMemSize; private void SetupMemoryDomains() From fc3498ab4ab898a0b1aba1a497bf1fd3ba9bf224 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sun, 8 Sep 2024 19:44:36 +0200 Subject: [PATCH 06/11] Update src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs Co-authored-by: James Groom --- .../Consoles/Atari/Stella/Stella.IMemoryDomains.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs index ee4069fbbe3..86b41361eec 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs @@ -57,7 +57,7 @@ private void SetupMemoryDomains() domains.Add(new MemoryDomainIntPtrMonitor("Main RAM", MemoryDomain.Endian.Little, mainRamAddress, 128, true, 1, _elf)); - MemoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList()); + MemoryDomains = new MemoryDomainList(domains) { MainMemory = mainRAM }; ((BasicServiceProvider)ServiceProvider).Register(MemoryDomains); } } From aa9b190b29fa0ce0eee1cfa122ee80ebebfadd4c Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Mon, 9 Sep 2024 05:39:47 +0200 Subject: [PATCH 07/11] Fix --- .../Consoles/Atari/Stella/Stella.IMemoryDomains.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs index 86b41361eec..2e45054862d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs @@ -55,8 +55,9 @@ private void SetupMemoryDomains() 1)); } - domains.Add(new MemoryDomainIntPtrMonitor("Main RAM", MemoryDomain.Endian.Little, mainRamAddress, 128, true, 1, _elf)); - + MemoryDomainIntPtrMonitor mainRAM = new("Main RAM", MemoryDomain.Endian.Little, mainRamAddress, 128, true, 1, _elf); + domains.Add(mainRAM); + MemoryDomains = new MemoryDomainList(domains) { MainMemory = mainRAM }; ((BasicServiceProvider)ServiceProvider).Register(MemoryDomains); } From 086ce8ab66bc8b35e2158f953c0fc2980e285faa Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Mon, 9 Sep 2024 05:40:54 +0200 Subject: [PATCH 08/11] Restoring vscode --- .vscode/launch.json | 25 +++++++++++++++++++++++++ .vscode/settings.json | 7 +++++++ .vscode/tasks.json | 24 ++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000..b2acd4d794d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Launch (console)", + "type": "clr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/output/EmuHawk.exe", + "args": [], + "cwd": "${workspaceFolder}/output", + "console": "externalTerminal", + "stopAtEntry": false + }, + { + "name": ".NET Attach", + "type": "clr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..844f5f1e614 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "editor.insertSpaces": false, + "editor.tabSize": 4, + "search.exclude": { + "waterbox/**": true + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000000..1563eed509c --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,24 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "shell", + "args": [ + "build", + // Ask dotnet build to generate full paths for file names. + "/property:GenerateFullPaths=true", + // Do not generate summary otherwise it leads to duplicate errors in Problems panel + "/consoleloggerparameters:NoSummary" + ], + "group": "build", + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file From 7ff299586b39f2214ad9f0b5ac17fe621c947e85 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Mon, 9 Sep 2024 05:45:30 +0200 Subject: [PATCH 09/11] Removing warning --- .../Consoles/Atari/Stella/Stella.IMemoryDomains.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs index 2e45054862d..0000036c9ea 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.IMemoryDomains.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using BizHawk.Emulation.Common; From 0bfac5023fb31061156cf79368902b4b2a846f96 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:38:10 +0200 Subject: [PATCH 10/11] Update waterbox readme --- waterbox/readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/waterbox/readme.txt b/waterbox/readme.txt index 18777746c88..d8096c0aea2 100644 --- a/waterbox/readme.txt +++ b/waterbox/readme.txt @@ -37,6 +37,7 @@ It consists of a modified musl libc, and build scripts to tie it all together. * waterbox/snes9x (required for Snes9x) * waterbox/gpgx/Genesis-Plus-GX (required for gpgx) * waterbox/uae/libretro-uae (required for puae) + * waterbox/stella/core (required for stella) * none of these submodules need to be cloned recursively 3. Consider whether it is time to update your build environment (i.e. sudo apt-get upgrade). Build environment tools are generally best kept at the latest version, to ensure top performance for our users. From 359a60fa567a445118912a953c6d4444cbad4eff Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 10 Sep 2024 21:49:49 +1000 Subject: [PATCH 11/11] Fix Stella's `[Core]` attr --- src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs index bc9c045ed6a..593c831af28 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs @@ -9,7 +9,11 @@ namespace BizHawk.Emulation.Cores.Atari.Stella { - [Core(CoreNames.Stella, "The Stella Team")] + [PortedCore( + name: CoreNames.Stella, + author: "The Stella Team", +// portedVersion: "", //TODO + portedUrl: "https://stella-emu.github.io")] [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISaveRam) })] public partial class Stella : IEmulator, IVideoProvider, IInputPollable, IRomInfo, IRegionable, ICreateGameDBEntries, ISettable