From 7393f132ab24b8a9b05376e30ce969a78a9c7432 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 22 Jan 2014 01:14:36 +0000 Subject: [PATCH] Move CPUs from Emulation.Common to Emulation.Cores --- .../BizHawk.Emulation.Common.csproj | 37 ------------------- .../BizHawk.Emulation.Cores.csproj | 37 +++++++++++++++++++ .../CPUs/68000/Diassembler.cs | 2 +- .../CPUs/68000/Instructions/BitArithemetic.cs | 2 +- .../CPUs/68000/Instructions/DataMovement.cs | 2 +- .../CPUs/68000/Instructions/IntegerMath.cs | 2 +- .../CPUs/68000/Instructions/ProgramFlow.cs | 2 +- .../CPUs/68000/Instructions/Supervisor.cs | 2 +- .../CPUs/68000/MC68000.cs | 2 +- .../CPUs/68000/Memory.cs | 2 +- .../CPUs/68000/OpcodeTable.cs | 2 +- .../CPUs/68000/Tables.cs | 2 +- .../CPUs/CP1610/CP1610.cs | 2 +- .../CPUs/CP1610/Disassembler.cs | 2 +- .../CPUs/CP1610/Execute.cs | 2 +- .../CPUs/HuC6280/Disassembler.cs | 2 +- .../CPUs/HuC6280/Execute.cs | 2 +- .../CPUs/HuC6280/HuC6280.cs | 2 +- .../CPUs/MOS 6502X/Disassembler.cs | 2 +- .../CPUs/MOS 6502X/Execute.cs | 2 +- .../CPUs/MOS 6502X/MOS6502X.cs | 2 +- .../CPUs/MOS 6502X/MOS6502XDouble.cs | 2 +- .../CPUs/MOS 6502X/MOS6502XNative.cs | 2 +- .../CPUs/MOS 6502X/MOS6502XNative/Execute.cpp | 0 .../MOS 6502X/MOS6502XNative/MOS6502X.cpp | 0 .../CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h | 0 .../MOS6502XNative/MOS6502XNative.sln | 0 .../MOS6502XNative/MOS6502XNative.vcxproj | 0 .../MOS6502XNative.vcxproj.filters | 0 .../MOS6502XNative.vcxproj.user | 0 .../CPUs/MOS 6502X/MOS6502XNative/UopEnum.h | 0 .../MOS 6502X/MOS6502XNative/UopTable.cpp | 0 .../CPUs/MOS 6502X/MOS6502XNative/ints.h | 0 .../CPUs/Z80-GB/Execute.cs | 0 .../CPUs/Z80-GB/Interrupts.cs | 0 .../CPUs/Z80-GB/NewDisassembler.cs | 0 .../CPUs/Z80-GB/Registers.cs | 0 .../CPUs/Z80-GB/Tables.cs | 0 .../CPUs/Z80-GB/Z80.cs | 0 .../CPUs/Z80/Disassembler.cs | 2 +- .../CPUs/Z80/Execute.cs | 2 +- .../CPUs/Z80/Interrupts.cs | 2 +- .../CPUs/Z80/Registers.cs | 2 +- .../CPUs/Z80/Tables.cs | 2 +- .../CPUs/Z80/Z80A.cs | 2 +- .../CPUs/x86/Disassembler.cs | 2 +- .../CPUs/x86/Execute.cs | 2 +- .../CPUs/x86/Timing.cs | 2 +- .../CPUs/x86/x86.cs | 2 +- BizHawk.Emulation.Cores/Calculator/TI83.cs | 2 +- .../Computers/Commodore64/Disk/VIC1541.cs | 2 +- .../Chips/Internals/Cpu.Internal.cs | 2 +- .../Computers/Commodore64/MOS/MOS6510.cs | 2 +- .../Consoles/Atari/2600/Atari2600.Core.cs | 2 +- .../Consoles/Coleco/ColecoVision.cs | 2 +- .../Consoles/Coleco/TMS9918A.cs | 2 +- .../Consoles/Intellivision/Intellivision.cs | 2 +- .../Consoles/Nintendo/NES/Core.cs | 2 +- .../Consoles/PC Engine/PCEngine.cs | 2 +- .../Consoles/PC Engine/VDC.cs | 2 +- .../Consoles/PC Engine/VPC.cs | 2 +- .../Consoles/Sega/Genesis/Genesis.cs | 4 +- .../Consoles/Sega/SMS/SMS.cs | 2 +- .../Consoles/Sega/SMS/VDP.cs | 2 +- 64 files changed, 84 insertions(+), 84 deletions(-) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Diassembler.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Instructions/BitArithemetic.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Instructions/DataMovement.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Instructions/IntegerMath.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Instructions/ProgramFlow.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Instructions/Supervisor.cs (94%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/MC68000.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Memory.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/OpcodeTable.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/68000/Tables.cs (93%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/CP1610/CP1610.cs (93%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/CP1610/Disassembler.cs (94%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/CP1610/Execute.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/HuC6280/Disassembler.cs (98%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/HuC6280/Execute.cs (97%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/HuC6280/HuC6280.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/Disassembler.cs (98%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/Execute.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502X.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XDouble.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/Execute.cpp (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.cpp (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.sln (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.filters (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.user (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/UopEnum.h (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/UopTable.cpp (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/MOS 6502X/MOS6502XNative/ints.h (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/Execute.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/Interrupts.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/NewDisassembler.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/Registers.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/Tables.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80-GB/Z80.cs (100%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Disassembler.cs (98%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Execute.cs (97%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Interrupts.cs (93%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Registers.cs (94%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Tables.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/Z80/Z80A.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/x86/Disassembler.cs (96%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/x86/Execute.cs (95%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/x86/Timing.cs (85%) rename {BizHawk.Emulation.Common => BizHawk.Emulation.Cores}/CPUs/x86/x86.cs (94%) diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index 22bdb5a470..0ce6bd9288 100644 --- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -45,43 +45,6 @@ VersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index 1ca6b88156..73deab0a6b 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -437,6 +437,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Emulation.Common/CPUs/68000/Diassembler.cs b/BizHawk.Emulation.Cores/CPUs/68000/Diassembler.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/68000/Diassembler.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Diassembler.cs index 0da11ee8bb..e3ea8d8146 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Diassembler.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Instructions/BitArithemetic.cs b/BizHawk.Emulation.Cores/CPUs/68000/Instructions/BitArithemetic.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/68000/Instructions/BitArithemetic.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Instructions/BitArithemetic.cs index 2f8c963996..4e93db95c0 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Instructions/BitArithemetic.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Instructions/DataMovement.cs b/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/68000/Instructions/DataMovement.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs index d55dba5f29..783bdd536b 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Instructions/DataMovement.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Instructions/IntegerMath.cs b/BizHawk.Emulation.Cores/CPUs/68000/Instructions/IntegerMath.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/68000/Instructions/IntegerMath.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Instructions/IntegerMath.cs index edf04691fa..2efc0f1f02 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Instructions/IntegerMath.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Instructions/ProgramFlow.cs b/BizHawk.Emulation.Cores/CPUs/68000/Instructions/ProgramFlow.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/68000/Instructions/ProgramFlow.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Instructions/ProgramFlow.cs index 4e9300be48..5f22f14619 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Instructions/ProgramFlow.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Instructions/Supervisor.cs b/BizHawk.Emulation.Cores/CPUs/68000/Instructions/Supervisor.cs similarity index 94% rename from BizHawk.Emulation.Common/CPUs/68000/Instructions/Supervisor.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Instructions/Supervisor.cs index 4e59b6c6a6..85eac8c18c 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Instructions/Supervisor.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/MC68000.cs b/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/68000/MC68000.cs rename to BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs index 44171c957a..b2eb45d44b 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/MC68000.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Memory.cs b/BizHawk.Emulation.Cores/CPUs/68000/Memory.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/68000/Memory.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Memory.cs index b065f2c430..eb5816595b 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Memory.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/OpcodeTable.cs b/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/68000/OpcodeTable.cs rename to BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs index 3e52b7bdd0..e1627a0487 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/OpcodeTable.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/68000/Tables.cs b/BizHawk.Emulation.Cores/CPUs/68000/Tables.cs similarity index 93% rename from BizHawk.Emulation.Common/CPUs/68000/Tables.cs rename to BizHawk.Emulation.Cores/CPUs/68000/Tables.cs index 9a602dd805..dc2c04a19e 100644 --- a/BizHawk.Emulation.Common/CPUs/68000/Tables.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/CP1610/CP1610.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs similarity index 93% rename from BizHawk.Emulation.Common/CPUs/CP1610/CP1610.cs rename to BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs index d5645840ad..8698e07e9d 100644 --- a/BizHawk.Emulation.Common/CPUs/CP1610/CP1610.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/CP1610/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/Disassembler.cs similarity index 94% rename from BizHawk.Emulation.Common/CPUs/CP1610/Disassembler.cs rename to BizHawk.Emulation.Cores/CPUs/CP1610/Disassembler.cs index c76df3f478..46bcf48a60 100644 --- a/BizHawk.Emulation.Common/CPUs/CP1610/Disassembler.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/CP1610/Execute.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/Execute.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/CP1610/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/CP1610/Execute.cs index 73e8c5b18a..226170e3db 100644 --- a/BizHawk.Emulation.Common/CPUs/CP1610/Execute.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/HuC6280/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs similarity index 98% rename from BizHawk.Emulation.Common/CPUs/HuC6280/Disassembler.cs rename to BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs index d0356ca4e2..baf165990d 100644 --- a/BizHawk.Emulation.Common/CPUs/HuC6280/Disassembler.cs +++ b/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. diff --git a/BizHawk.Emulation.Common/CPUs/HuC6280/Execute.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs similarity index 97% rename from BizHawk.Emulation.Common/CPUs/HuC6280/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs index d77be38d83..493c56795d 100644 --- a/BizHawk.Emulation.Common/CPUs/HuC6280/Execute.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/HuC6280/HuC6280.cs rename to BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs index 9dafaca5a6..a31c70a061 100644 --- a/BizHawk.Emulation.Common/CPUs/HuC6280/HuC6280.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs similarity index 98% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/Disassembler.cs rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs index 7e88f64dd5..1898937c0e 100644 --- a/BizHawk.Emulation.Common/CPUs/MOS 6502X/Disassembler.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/Execute.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs index f0954fd4ca..6868fe7409 100644 --- a/BizHawk.Emulation.Common/CPUs/MOS 6502X/Execute.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502X.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502X.cs rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs index 89dc29371f..8761f90c27 100644 --- a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502X.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XDouble.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XDouble.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XDouble.cs rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XDouble.cs index f9469469a0..cb524d864e 100644 --- a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XDouble.cs +++ b/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 { /// /// maintains a managed 6502X and an unmanaged 6502X, running them alongside and ensuring consistency diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative.cs rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative.cs index ca4cb32d68..e66012de60 100644 --- a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/Execute.cpp b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/Execute.cpp similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/Execute.cpp rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/Execute.cpp diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.cpp b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.cpp similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.cpp rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.cpp diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502X.h diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.sln b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.sln similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.sln rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.sln diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.filters b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.filters similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.filters rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.filters diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.user b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.user similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.user rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/MOS6502XNative.vcxproj.user diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/UopEnum.h b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/UopEnum.h similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/UopEnum.h rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/UopEnum.h diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/UopTable.cpp b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/UopTable.cpp similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/UopTable.cpp rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/UopTable.cpp diff --git a/BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/ints.h b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/ints.h similarity index 100% rename from BizHawk.Emulation.Common/CPUs/MOS 6502X/MOS6502XNative/ints.h rename to BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502XNative/ints.h diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/Execute.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/Execute.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/Execute.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/Interrupts.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/Interrupts.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/Interrupts.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/NewDisassembler.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/NewDisassembler.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/NewDisassembler.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/NewDisassembler.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/Registers.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/Registers.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/Registers.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/Registers.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/Tables.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/Tables.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/Tables.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/Tables.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80-GB/Z80.cs b/BizHawk.Emulation.Cores/CPUs/Z80-GB/Z80.cs similarity index 100% rename from BizHawk.Emulation.Common/CPUs/Z80-GB/Z80.cs rename to BizHawk.Emulation.Cores/CPUs/Z80-GB/Z80.cs diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Disassembler.cs similarity index 98% rename from BizHawk.Emulation.Common/CPUs/Z80/Disassembler.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Disassembler.cs index a39dbb5aae..e1b128ac62 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Disassembler.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Execute.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs similarity index 97% rename from BizHawk.Emulation.Common/CPUs/Z80/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs index 3f14e36e1a..ef4c0aa48c 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Execute.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Interrupts.cs similarity index 93% rename from BizHawk.Emulation.Common/CPUs/Z80/Interrupts.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Interrupts.cs index 1a94cf5f8b..738f1dad74 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Interrupts.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Registers.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Registers.cs similarity index 94% rename from BizHawk.Emulation.Common/CPUs/Z80/Registers.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Registers.cs index 0f3af6022d..7f00c1dece 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Registers.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Tables.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Tables.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/Z80/Tables.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Tables.cs index 417b3b78aa..a50e9a1aeb 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Tables.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/Z80/Z80A.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Z80A.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/Z80/Z80A.cs rename to BizHawk.Emulation.Cores/CPUs/Z80/Z80A.cs index 91e72cd257..7c51acc9d6 100644 --- a/BizHawk.Emulation.Common/CPUs/Z80/Z80A.cs +++ b/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 { /// /// ZiLOG Z80A CPU Emulator diff --git a/BizHawk.Emulation.Common/CPUs/x86/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs similarity index 96% rename from BizHawk.Emulation.Common/CPUs/x86/Disassembler.cs rename to BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs index 22d9a73b28..cfcef33a49 100644 --- a/BizHawk.Emulation.Common/CPUs/x86/Disassembler.cs +++ b/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 { diff --git a/BizHawk.Emulation.Common/CPUs/x86/Execute.cs b/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs similarity index 95% rename from BizHawk.Emulation.Common/CPUs/x86/Execute.cs rename to BizHawk.Emulation.Cores/CPUs/x86/Execute.cs index 62e1693b30..e0efe02999 100644 --- a/BizHawk.Emulation.Common/CPUs/x86/Execute.cs +++ b/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 where CpuType : struct, x86CpuType { diff --git a/BizHawk.Emulation.Common/CPUs/x86/Timing.cs b/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs similarity index 85% rename from BizHawk.Emulation.Common/CPUs/x86/Timing.cs rename to BizHawk.Emulation.Cores/CPUs/x86/Timing.cs index 2f62a98a8c..44dcf9e1af 100644 --- a/BizHawk.Emulation.Common/CPUs/x86/Timing.cs +++ b/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 where CpuType : struct, x86CpuType { diff --git a/BizHawk.Emulation.Common/CPUs/x86/x86.cs b/BizHawk.Emulation.Cores/CPUs/x86/x86.cs similarity index 94% rename from BizHawk.Emulation.Common/CPUs/x86/x86.cs rename to BizHawk.Emulation.Cores/CPUs/x86/x86.cs index 5c1b86265b..a966781142 100644 --- a/BizHawk.Emulation.Common/CPUs/x86/x86.cs +++ b/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 { }; diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs index 58fc6cb42c..9b9686a480 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.cs +++ b/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/ diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs index 3359da36d8..2634933696 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs +++ b/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 diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs index 60298404b3..0afad89dcf 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs index 9c9f0999a9..2307893061 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs index 2593d24f08..3198ca36bd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs +++ b/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 diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index 3c0a1d13a5..09541a4ef5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs index 82b3edea4b..96ba43346c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs index 52dfdf5fee..47294fcc8f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs index fbddc1e881..473780f23a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs +++ b/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 diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 213ba3c7d5..902a9be787 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/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 diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs index 83e58fbbdc..296072ce0c 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs index d9cf4299bb..3b621fed33 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs +++ b/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 { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs index a552733de7..4b09fb5d5c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs +++ b/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 diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 787d77038b..7084037676 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/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; /***************************************************** diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs index 0c24de2794..b639b7f7a4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs +++ b/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