Make new projects and move files

BizHawk.sln

@@ -29,6 +29,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.DiscSyste
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.HawkCores", "src\BizHawk.Emulation.HawkCores\BizHawk.Emulation.HawkCores.csproj", "{DB17B4D3-3997-44F4-837E-09CE280D8D41}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.ManagedCores", "src\BizHawk.Emulation.ManagedCores\BizHawk.Emulation.ManagedCores.csproj", "{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.UnmanagedCores", "src\BizHawk.Emulation.UnmanagedCores\BizHawk.Emulation.UnmanagedCores.csproj", "{AFA21758-408A-429B-87AF-3D56DC87681F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.WboxCores", "src\BizHawk.Emulation.WboxCores\BizHawk.Emulation.WboxCores.csproj", "{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Common", "src\BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj", "{E1A23168-B571-411C-B360-2229E7225E0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
@@ -38,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B51F11
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Emulation", "Emulation", "{3627C08B-3E43-4224-9DA4-40BD69495FBC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Cores", "src\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.CoresBase", "src\BizHawk.Emulation.CoresBase\BizHawk.Emulation.CoresBase.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
 	EndProjectSection
@@ -107,6 +115,22 @@ Global
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -120,6 +144,10 @@ Global
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25} = {74391239-9BC1-40CE-A3D7-180737C5302A}
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{AFA21758-408A-429B-87AF-3D56DC87681F} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}

src/BizHawk.Client.Common/BizHawk.Client.Common.csproj

@@ -9,8 +9,11 @@
 		<Reference Include="NLua" HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll" Private="False" />
 		<PackageReference Include="SharpCompress" Version="0.24.0" />
 		<PackageReference Include="SharpZipLib" Version="1.1.0" />
-		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.HawkCores/BizHawk.Emulation.HawkCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.ManagedCores/BizHawk.Emulation.ManagedCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.UnmanagedCores/BizHawk.Emulation.UnmanagedCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.WboxCores/BizHawk.Emulation.WboxCores.csproj" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
 	</ItemGroup>

src/BizHawk.Emulation.Cores/Properties/Resources.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Reflection;
-
-using BizHawk.Common.IOExtensions;
-
-namespace BizHawk.Emulation.Cores.Properties {
-	internal static class Resources {
-		private static readonly Assembly Asm = typeof(Resources).Assembly;
-
-		/// <param name="embedPath">Dir separator is '<c>.</c>'. Path is relative to <c>&lt;NS></c>.</param>
-		private static byte[] ReadEmbeddedByteArray(string embedPath) => Asm.GetManifestResourceStream($"BizHawk.Emulation.Cores.Resources.{embedPath}").ReadAllBytes();
-
-		internal static readonly Lazy<byte[]> CPC_AMSDOS_0_5_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_AMSDOS_0.5.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_BASIC_1_0_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.0.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
-		internal static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
-		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
-		internal static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
-		internal static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
-		internal static readonly Lazy<byte[]> ZX_plus2_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2.rom.gz"));
-		internal static readonly Lazy<byte[]> ZX_plus2a_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2a.rom.gz"));
-	}
-}

src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../MainSlnCommon.props" />
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
+		<EmbeddedResource Include="Resources/**/*" />
+	</ItemGroup>
+</Project>

src/BizHawk.Emulation.CoresBase/CPUs/W65816/Disassembler.cs

@@ -17,7 +17,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Emulation.Cores.Components.W65816
 {
-	class W65816_DisassemblerService : IDisassemblable
+	public class W65816_DisassemblerService : IDisassemblable
 	{
 		public string Cpu { get; set; }
 

src/BizHawk.Emulation.CoresBase/Notes.txt

@@ -2,6 +2,8 @@
 BizHawk.Emulation Project Notes
 -------------------------------
 
+yo this document is real old --yoshi
+
 1) Please keep this project free of non-portable external references. 
    Windows.Forms should not be referenced, nor System.Windows.Drawing, nor XNA, nor SlimDX, etc.
    This project should be very close to vanilla C# consisting primarily of basic data manipulation.
@@ -10,10 +12,10 @@ BizHawk.Emulation Project Notes
    a separate project. That project does not yet exist at the time of this writing. If you are creating
    a debugger, please talk to me (vecna) and we'll figure out the right place to put it.
    
-3) The current plan is that all actual emulation cores go in this assembly.
+3) ~~The current plan is that all actual emulation cores go in this assembly.
    At least one reason for this is that .NET will not inline calls across assemblies.
    At this time, please do not separate emulation into multiple assemblies - this is negotiable, but
-   for now this is the plan.
+   for now this is the plan.~~ your plan is dumb, I'm splitting up the project --yoshi
 
 4) IEmulator exposes a DeterministicEmulation property. When enabled, a well-behaving core must
    use strictly deterministic (TAS-safe, not having de-syncs) emulation, regardless of the performance cost.
@@ -27,9 +29,9 @@ BizHawk.Emulation Project Notes
       
 5) Classes should default sealed. Make unsealed only if the class is _designed for inheritance_.
 
-6) For GENERATED CPUs, DO NOT UPDATE THE GENERATED FILES DIRECTLY!!!!!!!!!!!!!!
+6) ~~For GENERATED CPUs, DO NOT UPDATE THE GENERATED FILES DIRECTLY!!!!!!!!!!!!!!
    Open the CpuCoreGenerator solution and make your changes there. Run the program to regenerate your cpus.
-   CpuCoreGenerator is a separate solution and it may not be obvious that it is there.
+   CpuCoreGenerator is a separate solution and it may not be obvious that it is there.~~ we ditched this a while ago --yoshi
 
 7) The new new plan is really for cores to be native. Which was actually the original plan.
    Note that native doesn't _necessarily_ mean C++.

src/BizHawk.Emulation.CoresBase/Properties/Resources.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+
+using BizHawk.Common.IOExtensions;
+
+namespace BizHawk.Emulation.Cores.Properties {
+	public static class Resources {
+		private static readonly Assembly Asm = typeof(Resources).Assembly;
+
+		/// <param name="embedPath">Dir separator is '<c>.</c>'. Path is relative to <c>&lt;NS></c>.</param>
+		private static byte[] ReadEmbeddedByteArray(string embedPath) => Asm.GetManifestResourceStream($"BizHawk.Emulation.Cores.Resources.{embedPath}").ReadAllBytes();
+
+		public static readonly Lazy<byte[]> CPC_AMSDOS_0_5_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_AMSDOS_0.5.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_BASIC_1_0_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.0.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
+		public static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
+		public static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
+		public static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
+		public static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
+		public static readonly Lazy<byte[]> ZX_plus2_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2.rom.gz"));
+		public static readonly Lazy<byte[]> ZX_plus2a_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2a.rom.gz"));
+	}
+}

src/BizHawk.Emulation.CoresBase/Sound/HuC6280PSG.cs

@@ -58,7 +58,7 @@ namespace BizHawk.Emulation.Cores.Components
 			}
 		}
 
-		internal void BeginFrame(long cycles)
+		public void BeginFrame(long cycles)
 		{
 			while (commands.Count > 0)
 			{
@@ -69,12 +69,12 @@ namespace BizHawk.Emulation.Cores.Components
 			frameStartTime = cycles;
 		}
 
-		internal void EndFrame(long cycles)
+		public void EndFrame(long cycles)
 		{
 			frameStopTime = cycles;
 		}
 
-		internal void WritePSG(byte register, byte value, long cycles)
+		public void WritePSG(byte register, byte value, long cycles)
 		{
 			commands.Enqueue(new QueuedCommand { Register = register, Value = value, Time = cycles - frameStartTime });
 		}
@@ -245,7 +245,7 @@ namespace BizHawk.Emulation.Cores.Components
 			}
 		}
 
-		internal void SyncState(Serializer ser)
+		public void SyncState(Serializer ser)
 		{
 			ser.BeginSection("PSG");
 			ser.Sync(nameof(MainVolumeLeft), ref MainVolumeLeft);