From 44c73321eae6f22354044efd2a427e92a7f0698c Mon Sep 17 00:00:00 2001
From: bird_egop <sampletext32@bk.ru>
Date: Sun, 13 Apr 2025 04:13:44 +0300
Subject: [PATCH] move handlers to respective folders

---
 .../{ArithmeticImmediate => Adc}/AdcImmToRm32Handler.cs       | 2 +-
 .../AdcImmToRm32SignExtendedHandler.cs                        | 2 +-
 X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs     | 4 +++-
 .../{ArithmeticImmediate => Sbb}/SbbImmFromRm32Handler.cs     | 2 +-
 .../SbbImmFromRm32SignExtendedHandler.cs                      | 2 +-
 .../{ArithmeticImmediate => Sub}/SubImmFromRm32Handler.cs     | 2 +-
 .../SubImmFromRm32SignExtendedHandler.cs                      | 2 +-
 X86DisassemblerTests/HandlerSelectionTests.cs                 | 1 -
 8 files changed, 9 insertions(+), 8 deletions(-)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Adc}/AdcImmToRm32Handler.cs (97%)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Adc}/AdcImmToRm32SignExtendedHandler.cs (97%)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Sbb}/SbbImmFromRm32Handler.cs (97%)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Sbb}/SbbImmFromRm32SignExtendedHandler.cs (97%)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Sub}/SubImmFromRm32Handler.cs (97%)
 rename X86Disassembler/X86/Handlers/{ArithmeticImmediate => Sub}/SubImmFromRm32SignExtendedHandler.cs (97%)

diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs b/X86Disassembler/X86/Handlers/Adc/AdcImmToRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs
rename to X86Disassembler/X86/Handlers/Adc/AdcImmToRm32Handler.cs
index a85400b..52ec206 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Adc/AdcImmToRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Adc;
 
 /// <summary>
 /// Handler for ADC r/m32, imm32 instruction (0x81 /2)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/Adc/AdcImmToRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/Adc/AdcImmToRm32SignExtendedHandler.cs
index 876acf8..4bfca1a 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/Adc/AdcImmToRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Adc;
 
 /// <summary>
 /// Handler for ADC r/m32, imm8 (sign-extended) instruction (0x83 /2)
diff --git a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
index ca783d4..63df69d 100644
--- a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
+++ b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
@@ -1,6 +1,6 @@
+using X86Disassembler.X86.Handlers.Adc;
 using X86Disassembler.X86.Handlers.Add;
 using X86Disassembler.X86.Handlers.And;
-using X86Disassembler.X86.Handlers.ArithmeticImmediate;
 using X86Disassembler.X86.Handlers.ArithmeticUnary;
 using X86Disassembler.X86.Handlers.Call;
 using X86Disassembler.X86.Handlers.Cmp;
@@ -14,7 +14,9 @@ using X86Disassembler.X86.Handlers.Or;
 using X86Disassembler.X86.Handlers.Pop;
 using X86Disassembler.X86.Handlers.Push;
 using X86Disassembler.X86.Handlers.Ret;
+using X86Disassembler.X86.Handlers.Sbb;
 using X86Disassembler.X86.Handlers.String;
+using X86Disassembler.X86.Handlers.Sub;
 using X86Disassembler.X86.Handlers.Test;
 using X86Disassembler.X86.Handlers.Xchg;
 using X86Disassembler.X86.Handlers.Xor;
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs b/X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs
rename to X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32Handler.cs
index 764f2fa..809c6ee 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Sbb;
 
 /// <summary>
 /// Handler for SBB r/m32, imm32 instruction (0x81 /3)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32SignExtendedHandler.cs
index d3f0947..a8e1945 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Sbb;
 
 /// <summary>
 /// Handler for SBB r/m32, imm8 (sign-extended) instruction (0x83 /3)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs b/X86Disassembler/X86/Handlers/Sub/SubImmFromRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs
rename to X86Disassembler/X86/Handlers/Sub/SubImmFromRm32Handler.cs
index 5e0b2ac..ddb8494 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Sub/SubImmFromRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Sub;
 
 /// <summary>
 /// Handler for SUB r/m32, imm32 instruction (0x81 /5)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/Sub/SubImmFromRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/Sub/SubImmFromRm32SignExtendedHandler.cs
index 7305bae..23212d5 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/Sub/SubImmFromRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Sub;
 
 /// <summary>
 /// Handler for SUB r/m32, imm8 (sign-extended) instruction (0x83 /5)
diff --git a/X86DisassemblerTests/HandlerSelectionTests.cs b/X86DisassemblerTests/HandlerSelectionTests.cs
index 34a8ccc..26fdff2 100644
--- a/X86DisassemblerTests/HandlerSelectionTests.cs
+++ b/X86DisassemblerTests/HandlerSelectionTests.cs
@@ -4,7 +4,6 @@ using System;
 using Xunit;
 using X86Disassembler.X86;
 using X86Disassembler.X86.Handlers;
-using X86Disassembler.X86.Handlers.ArithmeticImmediate;
 using X86Disassembler.X86.Handlers.Inc;
 
 /// <summary>