Incremental commit.

Author: 9ee1

Capstone.NET.sln.DotSettings

@@ -30,6 +30,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_OWNER_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXPRESSION/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">TOGETHER_SAME_LINE</s:String>
@@ -40,6 +41,8 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_USING_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_WHILE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">END_OF_LINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INT_ALIGN_BINARY_EXPRESSIONS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INT_ALIGN_NESTED_TERNARY/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INVOCABLE_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>

CapstoneCMD(NETCore)/Program.cs

@@ -275,12 +275,12 @@ private static void ShowArm64() {
                                     }
                                 }
                             }
-                            else if (operand.Type == Arm64OperandType.MrsRegister) {
-                                var mrsRegister = operand.MrsRegister;
+                            else if (operand.Type == Arm64OperandType.MrsSystemRegister) {
+                                var mrsRegister = operand.MrsSystemRegister;
                                 Console.WriteLine("\t\t\t MRS System Register = {0}", mrsRegister);
                             }
-                            else if (operand.Type == Arm64OperandType.MsrRegister) {
-                                var msrRegister = operand.MsrRegister;
+                            else if (operand.Type == Arm64OperandType.MsrSystemRegister) {
+                                var msrRegister = operand.MsrSystemRegister;
                                 Console.WriteLine("\t\t\t MSR System Register = {0}", msrRegister);
                             }
                             else if (operand.Type == Arm64OperandType.PStateField) {

Gee.External.Capstone/Arm/ArmInstructionDetailBuilder.cs

@@ -73,7 +73,7 @@ internal override void Build(CapstoneDisassembler disassembler, NativeInstructio
             this.CpsFlag = nativeInstructionDetail.CpsFlag;
             this.CpsMode = nativeInstructionDetail.CpsMode;
             this.IsUserMode = nativeInstructionDetail.IsUserMode;
-            this.MemoryBarrierOperation = nativeInstructionDetail.MemoryBarrier;
+            this.MemoryBarrierOperation = nativeInstructionDetail.MemoryBarrierOperation;
             this.Operands = ArmOperand.Create(disassembler, ref nativeInstructionDetail);
             this.UpdateFlags = nativeInstructionDetail.UpdateFlags;
             this.VectorDataType = nativeInstructionDetail.VectorDataType;

Gee.External.Capstone/Arm/ArmMemoryOperandValue.cs

@@ -37,25 +37,12 @@ public sealed class ArmMemoryOperandValue {
         /// <param name="nativeMemoryOperandValue">
         ///     A native ARM memory operand value.
         /// </param>
-        /// <returns>
-        ///     An ARM memory operand value.
-        /// </returns>
-        internal static ArmMemoryOperandValue Create(CapstoneDisassembler disassembler, ref NativeArmMemoryOperandValue nativeMemoryOperandValue) {
-            return new ArmMemoryOperandValueBuilder().Build(disassembler, ref nativeMemoryOperandValue).Create();
-        }
-
-        /// <summary>
-        ///     Create an ARM Memory Operand Value.
-        /// </summary>
-        /// <param name="builder">
-        ///     A builder to initialize the object with.
-        /// </param>
-        internal ArmMemoryOperandValue(ArmMemoryOperandValueBuilder builder) {
-            this.Base = builder.Base;
-            this.Displacement = builder.Displacement;
-            this.Index = builder.Index;
-            this.LeftShit = builder.LeftShit;
-            this.Scale = builder.Scale;
+        internal ArmMemoryOperandValue(CapstoneDisassembler disassembler, ref NativeArmMemoryOperandValue nativeMemoryOperandValue) {
+            this.Base = ArmRegister.TryCreate(disassembler, nativeMemoryOperandValue.Base);
+            this.Displacement = nativeMemoryOperandValue.Displacement;
+            this.Index = ArmRegister.TryCreate(disassembler, nativeMemoryOperandValue.Index);
+            this.LeftShit = nativeMemoryOperandValue.LeftShift;
+            this.Scale = nativeMemoryOperandValue.Scale;
         }
     }
 }