Merge branch 'stella' of github.com:SergioMartin86/BizHawk into stella

TASEmulators · Sep 10, 2024 · 8c10a0c · 8c10a0c
2 parents 6c87303 + 359a60f
commit 8c10a0c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+	"editor.insertSpaces": false,
+	"editor.tabSize": 4,
+	"search.exclude": {
+		"waterbox/**": true
+	}
+}
diff --git 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"; })
 ]
diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="SharpCompress" />
 		<PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" />
 		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
-		<PackageReference Include="System.CommandLine" PrivateAssets="all" />
+		<PackageReference Include="System.CommandLine" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 		<EmbeddedResource Include="Resources/**/*" />

diff --git 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;
 
@@ -8,7 +7,6 @@ namespace BizHawk.Emulation.Cores.Atari.Stella
 	public partial class Stella
 	{
 		internal IMemoryDomains MemoryDomains;
-		private readonly Dictionary<string, MemoryDomainByteArray> _byteArrayDomains = new Dictionary<string, MemoryDomainByteArray>();
 		private uint _cartMemSize;
 
 		private void SetupMemoryDomains()
@@ -56,9 +54,10 @@ private void SetupMemoryDomains()
 					1));
 			}
 
-			domains.Add(new MemoryDomainIntPtrMonitor("Main RAM", MemoryDomain.Endian.Little, mainRamAddress, 128, true, 1, _elf));
-
-			MemoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList());
+			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);
 		}
 	}

diff --git 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<Stella.A2600Settings, Stella.A2600SyncSettings>

diff --git 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<string> 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
 			{

diff --git 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.