Skip to content

Commit f49b4ae

Browse files
9ee19ee1
committed
Create namespace for X86
1 parent 5a48d2c commit f49b4ae

27 files changed

+52
-45
lines changed

‎CapstoneCMD/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Gee.External.Capstone;
22
using Gee.External.Capstone.Arm;
33
using Gee.External.Capstone.Arm64;
4+
using Gee.External.Capstone.X86;
45
using System;
56

67
namespace CapstoneCMD {

‎Gee.External.Capstone/CapstoneDisassembler.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Gee.External.Capstone.Arm64;
33
using System;
44
using System.Linq;
5+
using Gee.External.Capstone.X86;
56

67
namespace Gee.External.Capstone {
78
/// <summary>

‎Gee.External.Capstone/Gee.External.Capstone.csproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<Compile Include="CapstoneDisassembler.cs" />
112112
<Compile Include="CapstoneImport.cs" />
113113
<Compile Include="CapstoneProxyImport.cs" />
114-
<Compile Include="CapstoneX86Disassembler.cs" />
115114
<Compile Include="DisassembleArchitecture.cs" />
116115
<Compile Include="DisassembleErrorCode.cs" />
117116
<Compile Include="DisassembleMode.cs" />
@@ -157,33 +156,34 @@
157156
<Compile Include="SystemZ\NativeSystemZInstructionMemoryOperandValue.cs" />
158157
<Compile Include="SystemZ\NativeSystemZInstructionOperand.cs" />
159158
<Compile Include="SystemZ\NativeSystemZInstructionOperandValue.cs" />
160-
<Compile Include="NativeX86InstructionDetailExtension.cs" />
161-
<Compile Include="NativeX86InstructionMemoryOperandValue.cs" />
162-
<Compile Include="NativeX86InstructionMemoryOperandValueExtension.cs" />
163-
<Compile Include="NativeX86InstructionOperandExtension.cs" />
164-
<Compile Include="NativeX86InstructionOperandValue.cs" />
159+
<Compile Include="X86\CapstoneX86Disassembler.cs" />
160+
<Compile Include="X86\NativeX86InstructionDetail.cs" />
161+
<Compile Include="X86\NativeX86InstructionDetailExtension.cs" />
162+
<Compile Include="X86\NativeX86InstructionMemoryOperandValue.cs" />
163+
<Compile Include="X86\NativeX86InstructionMemoryOperandValueExtension.cs" />
164+
<Compile Include="X86\NativeX86InstructionOperand.cs" />
165+
<Compile Include="X86\NativeX86InstructionOperandExtension.cs" />
166+
<Compile Include="X86\NativeX86InstructionOperandValue.cs" />
167+
<Compile Include="X86\X86AvxBroadcast.cs" />
168+
<Compile Include="X86\X86AvxCodeCondition.cs" />
169+
<Compile Include="X86\X86AvxRoundingMode.cs" />
170+
<Compile Include="X86\X86Instruction.cs" />
171+
<Compile Include="X86\X86InstructionDetail.cs" />
172+
<Compile Include="X86\X86InstructionGroup.cs" />
173+
<Compile Include="X86\X86InstructionMemoryOperandValue.cs" />
174+
<Compile Include="X86\X86InstructionOperand.cs" />
175+
<Compile Include="X86\X86InstructionOperandType.cs" />
176+
<Compile Include="X86\X86Prefix.cs" />
177+
<Compile Include="X86\X86Register.cs" />
178+
<Compile Include="X86\X86SseCodeCondition.cs" />
165179
<Compile Include="XCore\NativeXCoreInstructionDetail.cs" />
166180
<Compile Include="XCore\NativeXCoreInstructionMemoryOperandValue.cs" />
167181
<Compile Include="XCore\NativeXCoreInstructionOperand.cs" />
168182
<Compile Include="XCore\NativeXCoreInstructionOperandValue.cs" />
169183
<Compile Include="Properties\AssemblyInfo.cs" />
170184
<Compile Include="SafeCapstoneHandle.cs" />
171-
<Compile Include="NativeX86InstructionDetail.cs" />
172-
<Compile Include="NativeX86InstructionOperand.cs" />
173185
<Compile Include="SafeNativeInstructionHandle.cs" />
174-
<Compile Include="X86AvxBroadcast.cs" />
175-
<Compile Include="X86AvxCodeCondition.cs" />
176-
<Compile Include="X86AvxRoundingMode.cs" />
177186
<Compile Include="IndependentInstructionDetail.cs" />
178-
<Compile Include="X86Instruction.cs" />
179-
<Compile Include="X86InstructionDetail.cs" />
180-
<Compile Include="X86InstructionGroup.cs" />
181-
<Compile Include="X86InstructionMemoryOperandValue.cs" />
182-
<Compile Include="X86InstructionOperand.cs" />
183-
<Compile Include="X86InstructionOperandType.cs" />
184-
<Compile Include="X86Prefix.cs" />
185-
<Compile Include="X86Register.cs" />
186-
<Compile Include="X86SseCodeCondition.cs" />
187187
</ItemGroup>
188188
<ItemGroup />
189189
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Gee.External.Capstone/NativeArchitectureInstructionDetail.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
using System.Runtime.InteropServices;
2-
using Gee.External.Capstone.Arm;
1+
using Gee.External.Capstone.Arm;
32
using Gee.External.Capstone.Arm64;
43
using Gee.External.Capstone.Mips;
54
using Gee.External.Capstone.PowerPc;
65
using Gee.External.Capstone.Sparc;
76
using Gee.External.Capstone.SystemZ;
7+
using Gee.External.Capstone.X86;
88
using Gee.External.Capstone.XCore;
9+
using System;
10+
using System.Runtime.InteropServices;
911

1012
namespace Gee.External.Capstone {
1113
/// <summary>
1214
/// Native Architecture Dependent Instruction Detail.
1315
/// </summary>
16+
[Obsolete("Deprecated.")]
1417
[StructLayout(LayoutKind.Explicit)]
1518
public struct NativeArchitectureInstructionDetail {
1619
/// <summary>

‎Gee.External.Capstone/NativeIndependentInstructionDetailExtension.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Gee.External.Capstone.Arm64;
33
using System;
44
using System.Linq;
5+
using Gee.External.Capstone.X86;
56

67
namespace Gee.External.Capstone {
78
/// <summary>

‎Gee.External.Capstone/NativeInstruction.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Runtime.InteropServices;
33
using Gee.External.Capstone.Arm;
44
using Gee.External.Capstone.Arm64;
5+
using Gee.External.Capstone.X86;
56

67
namespace Gee.External.Capstone {
78
/// <summary>

‎Gee.External.Capstone/NativeInstructionExtension.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Gee.External.Capstone.Arm;
22
using Gee.External.Capstone.Arm64;
3+
using Gee.External.Capstone.X86;
34

45
namespace Gee.External.Capstone {
56
/// <summary>

Gee.External.Capstone/CapstoneX86Disassembler.cs renamed to Gee.External.Capstone/X86/CapstoneX86Disassembler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Gee.External.Capstone {
1+
namespace Gee.External.Capstone.X86 {
22
/// <summary>
33
/// Capstone X86 Disassembler.
44
/// </summary>

Gee.External.Capstone/NativeX86InstructionDetail.cs renamed to Gee.External.Capstone/X86/NativeX86InstructionDetail.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Runtime.InteropServices;
33

4-
namespace Gee.External.Capstone {
4+
namespace Gee.External.Capstone.X86 {
55
/// <summary>
66
/// Native X86 Instruction Detail.
77
/// </summary>

Gee.External.Capstone/NativeX86InstructionDetailExtension.cs renamed to Gee.External.Capstone/X86/NativeX86InstructionDetailExtension.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using Gee.External.Capstone.Arm64;
2-
using System;
1+
using System;
32
using System.Linq;
43

5-
namespace Gee.External.Capstone {
4+
namespace Gee.External.Capstone.X86 {
65
/// <summary>
76
/// Native X86 Instruction Detail Extension.
87
/// </summary>
@@ -23,7 +22,7 @@ public static X86InstructionDetail AsX86InstructionDetail(this NativeX86Instruct
2322
@object.AvxRoundingMode = @this.ManagedAvxRoundingMode;
2423
@object.Displacement = @this.Displacement;
2524
@object.ModRm = @this.ModRm;
26-
@object.Operands = @this.ManagedOperands.Select(m => m.AsX86InstructionOperand()).ToArray();
25+
@object.Operands = @this.ManagedOperands.Select(m => NativeX86InstructionOperandExtension.AsX86InstructionOperand(m)).ToArray();
2726
@object.OperationCode = @this.ManagedOperationCode;
2827
@object.Prefix = @this.ManagedPrefix.Select(m => (X86Prefix) Convert.ToInt32(m)).ToArray();
2928
@object.Rex = @this.Rex;

0 commit comments

Comments
 (0)