Move CPUs from Emulation.Common to Emulation.Cores

BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj

@@ -45,43 +45,6 @@
     <Compile Include="..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
-    <Compile Include="CPUs\68000\Diassembler.cs" />
-    <Compile Include="CPUs\68000\Instructions\BitArithemetic.cs" />
-    <Compile Include="CPUs\68000\Instructions\DataMovement.cs" />
-    <Compile Include="CPUs\68000\Instructions\IntegerMath.cs" />
-    <Compile Include="CPUs\68000\Instructions\ProgramFlow.cs" />
-    <Compile Include="CPUs\68000\Instructions\Supervisor.cs" />
-    <Compile Include="CPUs\68000\MC68000.cs" />
-    <Compile Include="CPUs\68000\Memory.cs" />
-    <Compile Include="CPUs\68000\OpcodeTable.cs" />
-    <Compile Include="CPUs\68000\Tables.cs" />
-    <Compile Include="CPUs\CP1610\CP1610.cs" />
-    <Compile Include="CPUs\CP1610\Disassembler.cs" />
-    <Compile Include="CPUs\CP1610\Execute.cs" />
-    <Compile Include="CPUs\HuC6280\Disassembler.cs" />
-    <Compile Include="CPUs\HuC6280\Execute.cs" />
-    <Compile Include="CPUs\HuC6280\HuC6280.cs" />
-    <Compile Include="CPUs\MOS 6502X\Disassembler.cs" />
-    <Compile Include="CPUs\MOS 6502X\Execute.cs" />
-    <Compile Include="CPUs\MOS 6502X\MOS6502X.cs" />
-    <Compile Include="CPUs\MOS 6502X\MOS6502XDouble.cs" />
-    <Compile Include="CPUs\MOS 6502X\MOS6502XNative.cs" />
-    <Compile Include="CPUs\x86\Disassembler.cs" />
-    <Compile Include="CPUs\x86\Execute.cs" />
-    <Compile Include="CPUs\x86\Timing.cs" />
-    <Compile Include="CPUs\x86\x86.cs" />
-    <Compile Include="CPUs\Z80-GB\Execute.cs" />
-    <Compile Include="CPUs\Z80-GB\Interrupts.cs" />
-    <Compile Include="CPUs\Z80-GB\NewDisassembler.cs" />
-    <Compile Include="CPUs\Z80-GB\Registers.cs" />
-    <Compile Include="CPUs\Z80-GB\Tables.cs" />
-    <Compile Include="CPUs\Z80-GB\Z80.cs" />
-    <Compile Include="CPUs\Z80\Disassembler.cs" />
-    <Compile Include="CPUs\Z80\Execute.cs" />
-    <Compile Include="CPUs\Z80\Interrupts.cs" />
-    <Compile Include="CPUs\Z80\Registers.cs" />
-    <Compile Include="CPUs\Z80\Tables.cs" />
-    <Compile Include="CPUs\Z80\Z80A.cs" />
     <Compile Include="Database\CRC32.cs" />
     <Compile Include="Database\Database.cs" />
     <Compile Include="Database\FirmwareDatabase.cs" />

BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj

@@ -437,6 +437,43 @@
     <Compile Include="Consoles\Sony\PSP\PSP.cs" />
     <Compile Include="Consoles\Sony\PSX\LibMednahawkDll.cs" />
     <Compile Include="Consoles\Sony\PSX\Octoshock.cs" />
+    <Compile Include="CPUs\68000\Diassembler.cs" />
+    <Compile Include="CPUs\68000\Instructions\BitArithemetic.cs" />
+    <Compile Include="CPUs\68000\Instructions\DataMovement.cs" />
+    <Compile Include="CPUs\68000\Instructions\IntegerMath.cs" />
+    <Compile Include="CPUs\68000\Instructions\ProgramFlow.cs" />
+    <Compile Include="CPUs\68000\Instructions\Supervisor.cs" />
+    <Compile Include="CPUs\68000\MC68000.cs" />
+    <Compile Include="CPUs\68000\Memory.cs" />
+    <Compile Include="CPUs\68000\OpcodeTable.cs" />
+    <Compile Include="CPUs\68000\Tables.cs" />
+    <Compile Include="CPUs\CP1610\CP1610.cs" />
+    <Compile Include="CPUs\CP1610\Disassembler.cs" />
+    <Compile Include="CPUs\CP1610\Execute.cs" />
+    <Compile Include="CPUs\HuC6280\Disassembler.cs" />
+    <Compile Include="CPUs\HuC6280\Execute.cs" />
+    <Compile Include="CPUs\HuC6280\HuC6280.cs" />
+    <Compile Include="CPUs\MOS 6502X\Disassembler.cs" />
+    <Compile Include="CPUs\MOS 6502X\Execute.cs" />
+    <Compile Include="CPUs\MOS 6502X\MOS6502X.cs" />
+    <Compile Include="CPUs\MOS 6502X\MOS6502XDouble.cs" />
+    <Compile Include="CPUs\MOS 6502X\MOS6502XNative.cs" />
+    <Compile Include="CPUs\x86\Disassembler.cs" />
+    <Compile Include="CPUs\x86\Execute.cs" />
+    <Compile Include="CPUs\x86\Timing.cs" />
+    <Compile Include="CPUs\x86\x86.cs" />
+    <Compile Include="CPUs\Z80-GB\Execute.cs" />
+    <Compile Include="CPUs\Z80-GB\Interrupts.cs" />
+    <Compile Include="CPUs\Z80-GB\NewDisassembler.cs" />
+    <Compile Include="CPUs\Z80-GB\Registers.cs" />
+    <Compile Include="CPUs\Z80-GB\Tables.cs" />
+    <Compile Include="CPUs\Z80-GB\Z80.cs" />
+    <Compile Include="CPUs\Z80\Disassembler.cs" />
+    <Compile Include="CPUs\Z80\Execute.cs" />
+    <Compile Include="CPUs\Z80\Interrupts.cs" />
+    <Compile Include="CPUs\Z80\Registers.cs" />
+    <Compile Include="CPUs\Z80\Tables.cs" />
+    <Compile Include="CPUs\Z80\Z80A.cs" />
     <Compile Include="LibRetro.cs" />
     <Compile Include="LibRetroEmulator.cs" />
     <Compile Include="Properties\svnrev.cs" />

BizHawk.Emulation.Cores/CPUs/68000/Diassembler.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	public sealed class DisassemblyInfo
 	{

BizHawk.Emulation.Cores/CPUs/68000/Instructions/BitArithemetic.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Instructions/IntegerMath.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Instructions/ProgramFlow.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Instructions/Supervisor.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using System.IO;
 using System.Globalization;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	public sealed partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Memory.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/68000/Tables.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.M68000
+namespace BizHawk.Emulation.Cores.Components.M68000
 {
 	partial class MC68000
 	{

BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace BizHawk.Emulation.Common.Components.CP1610
+namespace BizHawk.Emulation.Cores.Components.CP1610
 {
 	public sealed partial class CP1610
 	{

BizHawk.Emulation.Cores/CPUs/CP1610/Disassembler.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.CP1610
+namespace BizHawk.Emulation.Cores.Components.CP1610
 {
 	public sealed partial class CP1610
 	{

BizHawk.Emulation.Cores/CPUs/CP1610/Execute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.CP1610
+namespace BizHawk.Emulation.Cores.Components.CP1610
 {
 	public sealed partial class CP1610
 	{

BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.H6280
+namespace BizHawk.Emulation.Cores.Components.H6280
 
 // Do not modify this file directly! This is GENERATED code.
 // Please open the CpuCoreGenerator solution and make your modifications there.

BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs

@@ -3,7 +3,7 @@ using System;
 // Do not modify this file directly! This is GENERATED code.
 // Please open the CpuCoreGenerator solution and make your modifications there.
 
-namespace BizHawk.Emulation.Common.Components.H6280
+namespace BizHawk.Emulation.Cores.Components.H6280
 {
     public partial class HuC6280
     {

BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs

@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.H6280
+namespace BizHawk.Emulation.Cores.Components.H6280
 {
 	public sealed partial class HuC6280
 	{

BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.M6502
+namespace BizHawk.Emulation.Cores.Components.M6502
 {
 	public partial class MOS6502X
 	{

BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs

@@ -3,7 +3,7 @@
 using System;
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.M6502
+namespace BizHawk.Emulation.Cores.Components.M6502
 {
 	public partial class MOS6502X
 	{

BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs

@@ -3,7 +3,7 @@ using System.IO;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.M6502
+namespace BizHawk.Emulation.Cores.Components.M6502
 {
 	public sealed partial class MOS6502X
 	{

BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XDouble.cs

@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.M6502
+namespace BizHawk.Emulation.Cores.Components.M6502
 {
 	/// <summary>
 	/// maintains a managed 6502X and an unmanaged 6502X, running them alongside and ensuring consistency

BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.Components.M6502
+namespace BizHawk.Emulation.Cores.Components.M6502
 {
 	public static class MOS6502X_DLL
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Disassembler.cs

@@ -12,7 +12,7 @@
 
 using System;
 
-namespace BizHawk.Emulation.Common.Components.Z80 
+namespace BizHawk.Emulation.Cores.Components.Z80 
 {
 	public class Disassembler
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.Z80
+namespace BizHawk.Emulation.Cores.Components.Z80
 {
 	public partial class Z80A
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Interrupts.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.Z80
+namespace BizHawk.Emulation.Cores.Components.Z80
 {
 	public partial class Z80A
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Registers.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using System;
 
-namespace BizHawk.Emulation.Common.Components.Z80
+namespace BizHawk.Emulation.Cores.Components.Z80
 {
 	public partial class Z80A
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Tables.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.Z80
+namespace BizHawk.Emulation.Cores.Components.Z80
 {
 	public partial class Z80A
 	{

BizHawk.Emulation.Cores/CPUs/Z80/Z80A.cs

@@ -5,7 +5,7 @@ using System.IO;
 // This Z80 emulator is a modified version of Ben Ryves 'Brazil' emulator.
 // It is MIT licensed.
 
-namespace BizHawk.Emulation.Common.Components.Z80
+namespace BizHawk.Emulation.Cores.Components.Z80
 {
 	/// <summary>
 	/// ZiLOG Z80A CPU Emulator

BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace BizHawk.Emulation.Common.Components.x86
+namespace BizHawk.Emulation.Cores.Components.x86
 {
 	public class DisassemblyInfo
 	{

BizHawk.Emulation.Cores/CPUs/x86/Execute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Common.Components.x86
+namespace BizHawk.Emulation.Cores.Components.x86
 {
 	public partial class x86<CpuType> where CpuType : struct, x86CpuType
 	{

BizHawk.Emulation.Cores/CPUs/x86/Timing.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Common.Components.x86
+namespace BizHawk.Emulation.Cores.Components.x86
 {
 	public partial class x86<CpuType> where CpuType : struct, x86CpuType
 	{

BizHawk.Emulation.Cores/CPUs/x86/x86.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.Emulation.Common.Components.x86
+namespace BizHawk.Emulation.Cores.Components.x86
 {
 	public interface x86CpuType { };
 	public struct Intel8086 : x86CpuType { };

BizHawk.Emulation.Cores/Calculator/TI83.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.Z80;
 
 //http://www.ticalc.org/pub/text/calcinfo/
 

BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs

@@ -1,5 +1,5 @@
 using System;
-using BizHawk.Emulation.Common.Components.M6502;
+using BizHawk.Emulation.Cores.Components.M6502;
 
 #if false
 

BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using BizHawk.Emulation.Common.Components.M6502;
+using BizHawk.Emulation.Cores.Components.M6502;
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64.Experimental
 {

BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 using BizHawk.Common;
-using BizHawk.Emulation.Common.Components.M6502;
+using BizHawk.Emulation.Cores.Components.M6502;
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64
 {

BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs

@@ -2,7 +2,7 @@
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.M6502;
+using BizHawk.Emulation.Cores.Components.M6502;
 
 
 namespace BizHawk.Emulation.Cores.Atari.Atari2600

BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs

@@ -5,7 +5,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.Components;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.Z80;
 
 namespace BizHawk.Emulation.Cores.ColecoVision
 {

BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs

@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.Z80;
 
 namespace BizHawk.Emulation.Cores.ColecoVision
 {

BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Collections.Generic;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.CP1610;
+using BizHawk.Emulation.Cores.Components.CP1610;
 
 namespace BizHawk.Emulation.Cores.Intellivision
 {

BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.M6502;
+using BizHawk.Emulation.Cores.Components.M6502;
 
 #pragma warning disable 162
 

BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs

@@ -6,7 +6,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.Components;
-using BizHawk.Emulation.Common.Components.H6280;
+using BizHawk.Emulation.Cores.Components.H6280;
 using BizHawk.Emulation.DiscSystem;
 
 namespace BizHawk.Emulation.Cores.PCEngine

BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs

@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.H6280;
+using BizHawk.Emulation.Cores.Components.H6280;
 
 namespace BizHawk.Emulation.Cores.PCEngine
 {

BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs

@@ -3,7 +3,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.H6280;
+using BizHawk.Emulation.Cores.Components.H6280;
 
 namespace BizHawk.Emulation.Cores.PCEngine
 {

BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs

@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.Components;
-using BizHawk.Emulation.Common.Components.M68000;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.M68000;
+using BizHawk.Emulation.Cores.Components.Z80;
 using Native68000;
 
 namespace BizHawk.Emulation.Cores.Sega.Genesis

BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs

@@ -6,7 +6,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.Components;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.Z80;
 
 /*****************************************************
 

BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs

@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.Z80;
+using BizHawk.Emulation.Cores.Components.Z80;
 
 
 namespace BizHawk.Emulation.Cores.Sega.MasterSystem