6 files changed, 185 insertions, 69 deletions
diff --git a/.idea/.idea.Q1/.idea/.gitignore b/.idea/.idea.Q1/.idea/.gitignore
deleted file mode 100644
index 842bf41..0000000
--- a/.idea/.idea.Q1/.idea/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/contentModel.xml
-/projectSettingsUpdater.xml
-/.idea.Q1.iml
-/modules.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/.idea.Q1/.idea/ANTLRv4ToolGrammarProperties.xml b/.idea/.idea.Q1/.idea/ANTLRv4ToolGrammarProperties.xml
deleted file mode 100644
index bb8d49b..0000000
--- a/.idea/.idea.Q1/.idea/ANTLRv4ToolGrammarProperties.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ANTLRv4ToolGrammarProperties">
-    <option name="perGrammarGenerationSettings">
-      <list>
-        <PerGrammarGenerationSettings>
-          <option name="fileName" value="$PROJECT_DIR$/Assembler/cgrammar.g4" />
-          <option name="autoGen" value="true" />
-          <option name="outputDir" value="" />
-          <option name="libDir" value="" />
-          <option name="encoding" value="" />
-          <option name="pkg" value="" />
-          <option name="language" value="CSharp" />
-          <option name="generateListener" value="false" />
-          <option name="generateVisitor" value="true" />
-        </PerGrammarGenerationSettings>
-        <PerGrammarGenerationSettings>
-          <option name="fileName" value="$PROJECT_DIR$/Assembler/CGrammar.g4" />
-          <option name="autoGen" value="true" />
-          <option name="outputDir" value="" />
-          <option name="libDir" value="" />
-          <option name="encoding" value="" />
-          <option name="pkg" value="" />
-          <option name="language" value="CSharp" />
-          <option name="generateListener" value="false" />
-          <option name="generateVisitor" value="true" />
-        </PerGrammarGenerationSettings>
-        <PerGrammarGenerationSettings>
-          <option name="fileName" value="$PROJECT_DIR$/Compiler/CGrammar.g4" />
-          <option name="autoGen" value="true" />
-          <option name="outputDir" value="" />
-          <option name="libDir" value="" />
-          <option name="encoding" value="" />
-          <option name="pkg" value="" />
-          <option name="language" value="CSharp" />
-          <option name="generateListener" value="false" />
-          <option name="generateVisitor" value="true" />
-        </PerGrammarGenerationSettings>
-      </list>
-    </option>
-  </component>
-</project>
-\ No newline at end of file
diff --git a/.idea/.idea.Q1/.idea/encodings.xml b/.idea/.idea.Q1/.idea/encodings.xml
deleted file mode 100644
index df87cf9..0000000
--- a/.idea/.idea.Q1/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>
-\ No newline at end of file
diff --git a/.idea/.idea.Q1/.idea/misc.xml b/.idea/.idea.Q1/.idea/misc.xml
deleted file mode 100644
index 5207dea..0000000
--- a/.idea/.idea.Q1/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MaterialThemeProjectNewConfig">
-    <option name="metadata">
-      <MTProjectMetadataState>
-        <option name="userId" value="2ed817c6:198067820d1:-7fff" />
-      </MTProjectMetadataState>
-    </option>
-  </component>
-</project>
-\ No newline at end of file
diff --git a/.idea/.idea.Q1/.idea/vcs.xml b/.idea/.idea.Q1/.idea/vcs.xml
index 35eb1dd..8306744 100644
--- a/.idea/.idea.Q1/.idea/vcs.xml
+++ b/.idea/.idea.Q1/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
 \ No newline at end of file
diff --git a/.idea/.idea.Q1/.idea/workspace.xml b/.idea/.idea.Q1/.idea/workspace.xml
new file mode 100644
index 0000000..0fc9e8c
--- /dev/null
+++ b/.idea/.idea.Q1/.idea/workspace.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>Assembler/Assembler.csproj</projectFile>
+    <projectFile>Compiler/Compiler.csproj</projectFile>
+    <projectFile>Emulator/Q1Emu.csproj</projectFile>
+    <projectFile>Orchestrator/Orchestrator.csproj</projectFile>
+    <projectFile>RegionVisualiser/RegionVisualiser.csproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="ddc73dac-c4df-4474-b8cc-b4477de808d4" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/AddressingMode.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/AddressingModes.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/Chip.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/ChipLayout.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/IInstruction.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Arch/InstructionSet.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/GlobalUsings.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/IAddressable.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.core/Memory.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.tests/Core/AddressingModesTests.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.tests/Core/InstructionsTests.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Q1.tests/Q1.tests.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Chip8Emu2/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Chip8Emu2/.idea/.name" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Chip8Emu2/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Chip8Emu2/.idea/indexLayout.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Chip8Emu2/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/ANTLRv4ToolGrammarProperties.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/misc.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Q1/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1Emu/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1Emu/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1Emu/.idea/indexLayout.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1Emu/.idea/misc.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Q1Emu/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/Assembler.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/Assembler.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/Extensions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/GlobalUsings.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/Options.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assembler/Program.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler.Testing/Compiler.Testing.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler.Testing/SanityTests.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler.Testing/TestingHelpers.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CGrammar.g4" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CType.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CommentCompilationMode.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Compiler.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CompilerException.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CompilerExtensions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/CompilerOptions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Context.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/FunctionReference.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Optimizer.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/PreprocessingCharStream.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Preprocessor.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Program.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/Target.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/VariableReference.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammar.interp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammar.tokens" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarBaseVisitor.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarLexer.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarLexer.interp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarLexer.tokens" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarParser.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/gen/CGrammarVisitor.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Constants.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Definitions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Expressions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/FlowControl.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Main.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Operations.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Compiler/visitors/Targets.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Assembler/Disassembler.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/Bus.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/BusDevice.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/DisplayDevice.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/GraphicsDevice.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/HIDDevice.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/Q1Cpu.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/Q1CpuAddressingModes.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/Q1CpuInstructions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Chip/RamDevice.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Content/Content.mgcb" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/DisplayEngine.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Emulator.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Extensions.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/GlobalUsings.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Icon.bmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Icon.ico" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Make.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Options.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Program.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Emulator/Q1Layout.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Orchestrator/Orchestrator.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Orchestrator/Program.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Q1.sln" beforeDir="false" afterPath="$PROJECT_DIR$/Q1.sln" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/_old/hello_world.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/_old/hello_world.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/_old/manual.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/_old/write_display_direct.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/_old/write_display_direct.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/font.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/hello_c.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/hello_c.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/hello_c.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/hid.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/logictest.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/logictest.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/logictest.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/paint.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/paint.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/paint.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/screen.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/std.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/typewriter.asm" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/typewriter.c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROMs/typewriter.q1" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/BoxDrawer.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/Program.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/Region.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/RegionVisualiser.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Q1.core/Q1.core.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/SizeFormatter.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RegionVisualiser/output.txt" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "git-widget-placeholder": "stability-rewrite",
+    "node.js.selected.package.tslint": "(autodetect)"
+  }
+}]]></component>
+  <component name="TaskManager">
+    <servers />
+  </component>
+  <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="stability-rewrite" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="XDebuggerManager">
+    <pin-to-top-manager>
+      <pinned-members>
+        <PinnedItemInfo parentTag="Type#Q1.Compiler.Context" memberName="LoopBodyBranch" />
+      </pinned-members>
+    </pin-to-top-manager>
+  </component>
+</project>
+\ No newline at end of file