Merge pull request #35 from ZehMatt/refactor/assembler

Refactor assembler

bin/dotplugins/example/AssemblerTest.cs

@@ -11,7 +11,7 @@ public AssemblerTest()
     [Command("TestAssembler")]
     public void BasicAssembly(string[] args)
     {
-        nuint ip = Thread.Active.Nip;
+        nuint ip = Thread.Active != null ? Thread.Active.Nip : 0;
         using (var asm = new Assembler(ip))
         {
 #if _X64_
@@ -110,4 +110,5 @@ public void AssemblerWithLabels(string[] args)
 
         UI.Disassembly.Update();
     }
+
 }

src/.editorconfig

@@ -1,4 +1,29 @@
 [*.cs]
-
+indent_style = space
+indent_size = 4
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
 # CS1591: Missing XML comment for publicly visible type or member
 dotnet_diagnostic.CS1591.severity = suggestion
+
+[*.cpp]
+indent_style = space
+indent_size = 4
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.hpp]
+indent_style = space
+indent_size = 4
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.h]
+indent_style = space
+indent_size = 4
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true

src/Bindings/Bindings.vcxproj

@@ -171,10 +171,11 @@
     <ClCompile Include="Breakpoints.cpp" />
     <ClCompile Include="Commands.cpp" />
     <ClCompile Include="Debugger.cpp" />
-    <ClCompile Include="Decoder.cpp" />
-    <ClCompile Include="Encoder.cpp" />
     <ClCompile Include="Expressions.cpp" />
     <ClCompile Include="Instruction.cpp" />
+    <ClCompile Include="Instruction.Decoder.cpp" />
+    <ClCompile Include="Instruction.Encoder.cpp" />
+    <ClCompile Include="Instruction.Generator.cpp" />
     <ClCompile Include="Logging.cpp" />
     <ClCompile Include="Memory.cpp" />
     <ClCompile Include="Module.cpp" />
@@ -188,7 +189,10 @@
   <ItemGroup>
     <ClInclude Include="Decoder.Converter.hpp" />
     <ClInclude Include="Encoder.Converter.hpp" />
+    <ClInclude Include="Instruction.Decoder.hpp" />
     <ClInclude Include="Instruction.EFlags.hpp" />
+    <ClInclude Include="Instruction.Encoder.hpp" />
+    <ClInclude Include="Instruction.Generator.hpp" />
     <ClInclude Include="Instruction.hpp" />
     <ClInclude Include="Instruction.Meta.hpp" />
     <ClInclude Include="Instruction.Operand.hpp" />

src/Bindings/Bindings.vcxproj.filters

@@ -8,27 +8,31 @@
     <ClCompile Include="Memory.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="Instruction.cpp" />
-    <ClCompile Include="Decoder.cpp" />
     <ClCompile Include="Commands.cpp" />
     <ClCompile Include="Expressions.cpp" />
     <ClCompile Include="UI.cpp" />
     <ClCompile Include="Module.cpp" />
-    <ClCompile Include="Encoder.cpp" />
     <ClCompile Include="Symbols.cpp" />
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Process.cpp" />
+    <ClCompile Include="Instruction.Generator.cpp" />
+    <ClCompile Include="Instruction.Encoder.cpp" />
+    <ClCompile Include="Instruction.Decoder.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Instruction.hpp" />
     <ClInclude Include="Register.hpp" />
     <ClInclude Include="Mnemonic.hpp" />
     <ClInclude Include="Encoder.Converter.hpp" />
-    <ClInclude Include="Instruction.Meta.hpp" />
     <ClInclude Include="Instruction.Operand.hpp" />
     <ClInclude Include="Instruction.Operands.hpp" />
     <ClInclude Include="Instruction.EFlags.hpp" />
     <ClInclude Include="Symbols.hpp" />
     <ClInclude Include="Marshal.hpp" />
     <ClInclude Include="Decoder.Converter.hpp" />
+    <ClInclude Include="Instruction.Generator.hpp" />
+    <ClInclude Include="Instruction.Encoder.hpp" />
+    <ClInclude Include="Instruction.Decoder.hpp" />
+    <ClInclude Include="Instruction.Meta.hpp" />
   </ItemGroup>
 </Project>