More namespace refactoring for instructions

jnosek · Jul 7, 2017 · 00b3398 · 00b3398
1 parent ec2ff22
commit 00b3398
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 97 deletions.
diff --git a/AGC/AGC.csproj b/AGC/AGC.csproj
@@ -37,27 +37,27 @@
     <!-- A reference to the entire .NET Framework is automatically included -->
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Architecture\ExtraQuarterCode4.cs" />
-    <Compile Include="Architecture\Instructions\Compliment.cs" />
-    <Compile Include="Architecture\Instructions\DoubleClearAndSubtract.cs" />
-    <Compile Include="Architecture\Instructions\DoubleCompliment.cs" />
+    <Compile Include="Instructions\QuarterCodes\ExtraQuarterCode4.cs" />
+    <Compile Include="Instructions\Compliment.cs" />
+    <Compile Include="Instructions\DoubleClearAndSubtract.cs" />
+    <Compile Include="Instructions\DoubleCompliment.cs" />
     <Compile Include="Math\DoublePrecision.cs" />
-    <Compile Include="Architecture\QuarterCodeInstructionList.cs" />
+    <Compile Include="Instructions\QuarterCodes\QuarterCodeInstructionList.cs" />
     <Compile Include="Core\FixedMemory.cs" />
-    <Compile Include="Architecture\Instructions\DoubleClearAndAdd.cs" />
-    <Compile Include="Architecture\ExtraQuarterCode3.cs" />
+    <Compile Include="Instructions\DoubleClearAndAdd.cs" />
+    <Compile Include="Instructions\QuarterCodes\ExtraQuarterCode3.cs" />
     <Compile Include="Registers\ErasableBankRegister.cs" />
     <Compile Include="Registers\FullRegister.cs" />
     <Compile Include="Core\MemoryBankOffset.cs" />
     <Compile Include="Core\OnesCompliment.cs" />
     <Compile Include="Math\SinglePrecision.cs" />
-    <Compile Include="Architecture\Instructions\BranchZeroOrMinusToFixed.cs" />
-    <Compile Include="Architecture\Instructions\ClearAndAdd.cs" />
-    <Compile Include="Architecture\Instructions\ClearAndSubtract.cs" />
-    <Compile Include="Architecture\Instructions\CountCompareAndSkip.cs" />
-    <Compile Include="Architecture\Instructions\DoubleAddToStorage.cs" />
-    <Compile Include="Architecture\QuarterCode5.cs" />
-    <Compile Include="Architecture\Instructions\TransferToStorage.cs" />
+    <Compile Include="Instructions\BranchZeroOrMinusToFixed.cs" />
+    <Compile Include="Instructions\ClearAndAdd.cs" />
+    <Compile Include="Instructions\ClearAndSubtract.cs" />
+    <Compile Include="Instructions\CountCompareAndSkip.cs" />
+    <Compile Include="Instructions\DoubleAddToStorage.cs" />
+    <Compile Include="Instructions\QuarterCodes\QuarterCode5.cs" />
+    <Compile Include="Instructions\TransferToStorage.cs" />
     <Compile Include="Registers\CycleRightRegister.cs" />
     <Compile Include="Core\IWord.cs" />
     <Compile Include="Core\MemoryWord.cs" />
@@ -66,15 +66,15 @@
     <Compile Include="Computer.cs" />
     <Compile Include="ExtraCodeInstructionSet.cs" />
     <Compile Include="InstructionSet.cs" />
-    <Compile Include="Architecture\Instructions\Add.cs" />
-    <Compile Include="Architecture\Instructions\AddToStorage.cs" />
-    <Compile Include="Architecture\IInstruction.cs" />
-    <Compile Include="Architecture\InstructionList.cs" />
-    <Compile Include="Architecture\Instructions\Augment.cs" />
-    <Compile Include="Architecture\Instructions\BranchZeroToFixed.cs" />
-    <Compile Include="Architecture\ExtraQuarterCode2.cs" />
-    <Compile Include="Architecture\QuarterCode2.cs" />
-    <Compile Include="Architecture\Instructions\TransferControl.cs" />
+    <Compile Include="Instructions\Add.cs" />
+    <Compile Include="Instructions\AddToStorage.cs" />
+    <Compile Include="Instructions\IInstruction.cs" />
+    <Compile Include="Instructions\InstructionList.cs" />
+    <Compile Include="Instructions\Augment.cs" />
+    <Compile Include="Instructions\BranchZeroToFixed.cs" />
+    <Compile Include="Instructions\QuarterCodes\ExtraQuarterCode2.cs" />
+    <Compile Include="Instructions\QuarterCodes\QuarterCode2.cs" />
+    <Compile Include="Instructions\TransferControl.cs" />
     <Compile Include="MemoryMap.cs" />
     <Compile Include="Processor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/AGC/ExtraCodeInstructionSet.cs b/AGC/ExtraCodeInstructionSet.cs
@@ -1,10 +1,4 @@
-using Apollo.Virtual.AGC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Apollo.Virtual.AGC.Architecture;
-using Apollo.Virtual.AGC.Architecture.Instructions;
+using Apollo.Virtual.AGC.Instructions;
 
 namespace Apollo.Virtual.AGC
 {

diff --git a/AGC/InstructionSet.cs b/AGC/InstructionSet.cs
@@ -1,10 +1,4 @@
-using Apollo.Virtual.AGC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Apollo.Virtual.AGC.Architecture;
-using Apollo.Virtual.AGC.Architecture.Instructions;
+using Apollo.Virtual.AGC.Instructions;
 
 namespace Apollo.Virtual.AGC
 {

diff --git a/AGC/Architecture/Instructions/Add.cs → AGC/Instructions/Add.cs b/AGC/Architecture/Instructions/Add.cs → AGC/Instructions/Add.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// AD - 0110

diff --git a/...Architecture/Instructions/AddToStorage.cs → AGC/Instructions/AddToStorage.cs b/...Architecture/Instructions/AddToStorage.cs → AGC/Instructions/AddToStorage.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// ADS - 0010 11

diff --git a/AGC/Architecture/Instructions/Augment.cs → AGC/Instructions/Augment.cs b/AGC/Architecture/Instructions/Augment.cs → AGC/Instructions/Augment.cs
@@ -1,7 +1,7 @@
 using Apollo.Virtual.AGC.Core;
 using Apollo.Virtual.AGC.Math;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// AUG - EX 0010 10

diff --git a/.../Instructions/BranchZeroOrMinusToFixed.cs → AGC/Instructions/BranchZeroOrMinusToFixed.cs b/.../Instructions/BranchZeroOrMinusToFixed.cs → AGC/Instructions/BranchZeroOrMinusToFixed.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// BZMF - EX 0110

diff --git a/...tecture/Instructions/BranchZeroToFixed.cs → AGC/Instructions/BranchZeroToFixed.cs b/...tecture/Instructions/BranchZeroToFixed.cs → AGC/Instructions/BranchZeroToFixed.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// BZF - EX 0001

diff --git a/AGC/Architecture/Instructions/ClearAndAdd.cs → AGC/Instructions/ClearAndAdd.cs b/AGC/Architecture/Instructions/ClearAndAdd.cs → AGC/Instructions/ClearAndAdd.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// CA - 0011

diff --git a/...itecture/Instructions/ClearAndSubtract.cs → AGC/Instructions/ClearAndSubtract.cs b/...itecture/Instructions/ClearAndSubtract.cs → AGC/Instructions/ClearAndSubtract.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// CS - 0100

diff --git a/AGC/Architecture/Instructions/Compliment.cs → AGC/Instructions/Compliment.cs b/AGC/Architecture/Instructions/Compliment.cs → AGC/Instructions/Compliment.cs
diff --git a/...cture/Instructions/CountCompareAndSkip.cs → AGC/Instructions/CountCompareAndSkip.cs b/...cture/Instructions/CountCompareAndSkip.cs → AGC/Instructions/CountCompareAndSkip.cs
@@ -1,7 +1,7 @@
 using Apollo.Virtual.AGC.Core;
 using Apollo.Virtual.AGC.Math;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// CCS - 0001

diff --git a/...ecture/Instructions/DoubleAddToStorage.cs → AGC/Instructions/DoubleAddToStorage.cs b/...ecture/Instructions/DoubleAddToStorage.cs → AGC/Instructions/DoubleAddToStorage.cs
@@ -1,7 +1,7 @@
 using Apollo.Virtual.AGC.Core;
 using Apollo.Virtual.AGC.Math;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// DAS - 0010 00

diff --git a/...tecture/Instructions/DoubleClearAndAdd.cs → AGC/Instructions/DoubleClearAndAdd.cs b/...tecture/Instructions/DoubleClearAndAdd.cs → AGC/Instructions/DoubleClearAndAdd.cs
@@ -1,4 +1,4 @@
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// DCA - EX 0011 00

diff --git a/...re/Instructions/DoubleClearAndSubtract.cs → AGC/Instructions/DoubleClearAndSubtract.cs b/...re/Instructions/DoubleClearAndSubtract.cs → AGC/Instructions/DoubleClearAndSubtract.cs
@@ -1,4 +1,4 @@
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// DCS - EX 0100 00

diff --git a/...itecture/Instructions/DoubleCompliment.cs → AGC/Instructions/DoubleCompliment.cs b/...itecture/Instructions/DoubleCompliment.cs → AGC/Instructions/DoubleCompliment.cs
diff --git a/AGC/Architecture/IInstruction.cs → AGC/Instructions/IInstruction.cs b/AGC/Architecture/IInstruction.cs → AGC/Instructions/IInstruction.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     interface IInstruction
     {

diff --git a/AGC/Architecture/InstructionList.cs → AGC/Instructions/InstructionList.cs b/AGC/Architecture/InstructionList.cs → AGC/Instructions/InstructionList.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     class InstructionList
     {

diff --git a/AGC/Architecture/ExtraQuarterCode2.cs → ...uctions/QuarterCodes/ExtraQuarterCode2.cs b/AGC/Architecture/ExtraQuarterCode2.cs → ...uctions/QuarterCodes/ExtraQuarterCode2.cs
@@ -1,11 +1,4 @@
-using Apollo.Virtual.AGC.Architecture.Instructions;
-using Apollo.Virtual.AGC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// EQC - EX 0010

diff --git a/AGC/Architecture/ExtraQuarterCode3.cs → ...uctions/QuarterCodes/ExtraQuarterCode3.cs b/AGC/Architecture/ExtraQuarterCode3.cs → ...uctions/QuarterCodes/ExtraQuarterCode3.cs
@@ -1,10 +1,4 @@
-using Apollo.Virtual.AGC.Architecture.Instructions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// EQC - 0011

diff --git a/AGC/Architecture/ExtraQuarterCode4.cs → ...uctions/QuarterCodes/ExtraQuarterCode4.cs b/AGC/Architecture/ExtraQuarterCode4.cs → ...uctions/QuarterCodes/ExtraQuarterCode4.cs
@@ -1,11 +1,4 @@
-using Apollo.Virtual.AGC.Architecture;
-using Apollo.Virtual.AGC.Architecture.Instructions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     class ExtraQuarterCode4 : QuarterCodeInstructionList
     {

diff --git a/AGC/Architecture/QuarterCode2.cs → ...Instructions/QuarterCodes/QuarterCode2.cs b/AGC/Architecture/QuarterCode2.cs → ...Instructions/QuarterCodes/QuarterCode2.cs
@@ -1,11 +1,4 @@
-using Apollo.Virtual.AGC.Architecture.Instructions;
-using Apollo.Virtual.AGC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// QC - 0010

diff --git a/AGC/Architecture/QuarterCode5.cs → ...Instructions/QuarterCodes/QuarterCode5.cs b/AGC/Architecture/QuarterCode5.cs → ...Instructions/QuarterCodes/QuarterCode5.cs
@@ -1,11 +1,4 @@
-using Apollo.Virtual.AGC.Architecture.Instructions;
-using Apollo.Virtual.AGC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// QC - 0101

diff --git a/...rchitecture/QuarterCodeInstructionList.cs → ...uarterCodes/QuarterCodeInstructionList.cs b/...rchitecture/QuarterCodeInstructionList.cs → ...uarterCodes/QuarterCodeInstructionList.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Apollo.Virtual.AGC.Architecture
+namespace Apollo.Virtual.AGC.Instructions
 {
     abstract class QuarterCodeInstructionList : InstructionList, IInstruction
     {

diff --git a/...hitecture/Instructions/TransferControl.cs → AGC/Instructions/TransferControl.cs b/...hitecture/Instructions/TransferControl.cs → AGC/Instructions/TransferControl.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// TC - 0000

diff --git a/...tecture/Instructions/TransferToStorage.cs → AGC/Instructions/TransferToStorage.cs b/...tecture/Instructions/TransferToStorage.cs → AGC/Instructions/TransferToStorage.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Apollo.Virtual.AGC.Architecture.Instructions
+namespace Apollo.Virtual.AGC.Instructions
 {
     /// <summary>
     /// TS - 0101 10