fisk 2.0.0 → 2.3.1

data/lib/fisk/instructions/mov.rb

@@ -2,681 +2,649 @@
 
 class Fisk
   module Instructions
-    # Instruction MOV
-    forms = []
-    operands = []
-    encodings = []
+    # Instruction MOV: Move
+    MOV = Instruction.new("MOV", [
     # movb: r8, imm8
-    operands << OPERAND_TYPES[47]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[47],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC6, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC6, 0) +
+            add_modrm(buffer,
               3,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xB0, operands[0].value
-        add_immediate buffer, operands[1].value, 1
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xB0, operands[0].op_value) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movb: r8, r8
-    operands << OPERAND_TYPES[47]
-    operands << OPERAND_TYPES[3]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[47],
+        OPERAND_TYPES[3],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
+              operands[1].rex_value,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x88, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x88, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
+              operands[0].rex_value,
               0,
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8A, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8A, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movb: r8, m8
-    operands << OPERAND_TYPES[47]
-    operands << OPERAND_TYPES[4]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[47],
+        OPERAND_TYPES[4],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
-              (operands[1].value >> 3),
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8A, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value,
+              operands[1].rex_value,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8A, 0) +
+            add_modrm_reg_mem(buffer,
+              0,
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movw: r16, imm16
-    operands << OPERAND_TYPES[38]
-    operands << OPERAND_TYPES[6]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[38],
+        OPERAND_TYPES[6],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               3,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 2
-      end
-
-      def bytesize; 4; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 2) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xB8, operands[0].value
-        add_immediate buffer, operands[1].value, 2
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xB8, operands[0].op_value) +
+            add_immediate(buffer, operands[1].op_value, 2) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movw: r16, r16
-    operands << OPERAND_TYPES[38]
-    operands << OPERAND_TYPES[8]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[38],
+        OPERAND_TYPES[8],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
+              operands[1].rex_value,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
+              operands[0].rex_value,
               0,
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movw: r16, m16
-    operands << OPERAND_TYPES[38]
-    operands << OPERAND_TYPES[9]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[38],
+        OPERAND_TYPES[9],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
-              (operands[1].value >> 3),
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value,
+              operands[1].rex_value,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_mem(buffer,
+              0,
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movabs: eax, moffs32
-    operands << OPERAND_TYPES[48]
-    operands << OPERAND_TYPES[49]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_opcode buffer, 0xA1, 0
-        add_data_offset buffer, operands[1].value, 4
-      end
-
-      def bytesize; 1; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+      Form.new([
+        OPERAND_TYPES[48],
+        OPERAND_TYPES[49],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_opcode(buffer, 0xA1, 0) +
+            add_data_offset(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movl: r32, imm32
-    operands << OPERAND_TYPES[27]
-    operands << OPERAND_TYPES[11]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[27],
+        OPERAND_TYPES[11],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               3,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 4
-      end
-
-      def bytesize; 6; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xB8, operands[0].value
-        add_immediate buffer, operands[1].value, 4
-      end
-
-      def bytesize; 5; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xB8, operands[0].op_value) +
+            add_immediate(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movl: r32, r32
-    operands << OPERAND_TYPES[27]
-    operands << OPERAND_TYPES[13]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[27],
+        OPERAND_TYPES[13],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
+              operands[1].rex_value,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
+              operands[0].rex_value,
               0,
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movl: r32, m32
-    operands << OPERAND_TYPES[27]
-    operands << OPERAND_TYPES[14]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[27],
+        OPERAND_TYPES[14],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[0].value >> 3),
-              (operands[1].value >> 3),
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value,
+              operands[1].rex_value,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_mem(buffer,
+              0,
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movabs: rax, moffs64
-    operands << OPERAND_TYPES[50]
-    operands << OPERAND_TYPES[51]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[50],
+        OPERAND_TYPES[51],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              0)
-        add_opcode buffer, 0xA1, 0
-        add_data_offset buffer, operands[1].value, 8
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              0) +
+            add_opcode(buffer, 0xA1, 0) +
+            add_data_offset(buffer, operands[1].op_value, 8) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: r64, imm32
-    operands << OPERAND_TYPES[28]
-    operands << OPERAND_TYPES[11]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[28],
+        OPERAND_TYPES[11],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               3,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 4
-      end
-
-      def bytesize; 7; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: r64, imm64
-    operands << OPERAND_TYPES[28]
-    operands << OPERAND_TYPES[52]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[28],
+        OPERAND_TYPES[52],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xB8, operands[0].value
-        add_immediate buffer, operands[1].value, 8
-      end
-
-      def bytesize; 10; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xB8, operands[0].op_value) +
+            add_immediate(buffer, operands[1].op_value, 8) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: r64, r64
-    operands << OPERAND_TYPES[28]
-    operands << OPERAND_TYPES[17]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[28],
+        OPERAND_TYPES[17],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
-              (operands[1].value >> 3),
+              operands[1].rex_value,
               0,
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
-              (operands[0].value >> 3),
+              operands[0].rex_value,
               0,
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_reg(buffer,
               3,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: r64, m64
-    operands << OPERAND_TYPES[28]
-    operands << OPERAND_TYPES[18]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[28],
+        OPERAND_TYPES[18],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
-              (operands[0].value >> 3),
-              (operands[1].value >> 3),
-              (operands[1].value >> 3))
-        add_opcode buffer, 0x8B, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[0].value,
-              operands[1].value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].rex_value,
+              operands[1].rex_value,
+              operands[1].rex_value) +
+            add_opcode(buffer, 0x8B, 0) +
+            add_modrm_reg_mem(buffer,
+              0,
+              operands[0].op_value,
+              operands[1].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movb: m8, imm8
-    operands << OPERAND_TYPES[43]
-    operands << OPERAND_TYPES[1]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[43],
+        OPERAND_TYPES[1],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC6, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC6, 0) +
+            add_modrm(buffer,
               0,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 1
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 1) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movb: m8, r8
-    operands << OPERAND_TYPES[43]
-    operands << OPERAND_TYPES[3]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[43],
+        OPERAND_TYPES[3],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x88, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].rex_value,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x88, 0) +
+            add_modrm_mem_reg(buffer,
+              0,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movw: m16, imm16
-    operands << OPERAND_TYPES[45]
-    operands << OPERAND_TYPES[6]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[45],
+        OPERAND_TYPES[6],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
               0,
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               0,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 2
-      end
-
-      def bytesize; 4; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 2) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movw: m16, r16
-    operands << OPERAND_TYPES[45]
-    operands << OPERAND_TYPES[8]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_prefix buffer, operands, 0x66, false
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[45],
+        OPERAND_TYPES[8],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_prefix(buffer, operands, 0x66, false) +
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].rex_value,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_mem_reg(buffer,
+              0,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movl: m32, imm32
-    operands << OPERAND_TYPES[37]
-    operands << OPERAND_TYPES[11]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[37],
+        OPERAND_TYPES[11],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
               0,
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               0,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 4
-      end
-
-      def bytesize; 6; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movl: m32, r32
-    operands << OPERAND_TYPES[37]
-    operands << OPERAND_TYPES[13]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[37],
+        OPERAND_TYPES[13],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               false,
               0,
-              (operands[1].value >> 3),
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].rex_value,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_mem_reg(buffer,
+              0,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: m64, imm32
-    operands << OPERAND_TYPES[44]
-    operands << OPERAND_TYPES[11]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[44],
+        OPERAND_TYPES[11],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0xC7, 0
-        add_modrm(buffer, operands,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0xC7, 0) +
+            add_modrm(buffer,
               0,
               0,
-              operands[0].value)
-        add_immediate buffer, operands[1].value, 4
-      end
-
-      def bytesize; 7; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[0].op_value, operands) +
+            add_immediate(buffer, operands[1].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movq: m64, r64
-    operands << OPERAND_TYPES[44]
-    operands << OPERAND_TYPES[17]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[44],
+        OPERAND_TYPES[17],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
-              (operands[1].value >> 3),
-              (operands[0].value >> 3),
-              (operands[0].value >> 3))
-        add_opcode buffer, 0x89, 0
-        add_modrm(buffer, operands,
-              0,
-              operands[1].value,
-              operands[0].value)
-      end
-
-      def bytesize; 3; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+              operands[1].rex_value,
+              operands[0].rex_value,
+              operands[0].rex_value) +
+            add_opcode(buffer, 0x89, 0) +
+            add_modrm_mem_reg(buffer,
+              0,
+              operands[1].op_value,
+              operands[0].op_value, operands) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movabs: moffs32, eax
-    operands << OPERAND_TYPES[49]
-    operands << OPERAND_TYPES[33]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_opcode buffer, 0xA3, 0
-        add_data_offset buffer, operands[0].value, 4
-      end
-
-      def bytesize; 1; end
-    }.new
-    forms << Form.new(operands, encodings)
-    operands = []
-    encodings = []
+      Form.new([
+        OPERAND_TYPES[49],
+        OPERAND_TYPES[33],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_opcode(buffer, 0xA3, 0) +
+            add_data_offset(buffer, operands[0].op_value, 4) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
     # movabs: moffs64, rax
-    operands << OPERAND_TYPES[51]
-    operands << OPERAND_TYPES[34]
-    encodings << Class.new(Fisk::Encoding) {
-      def encode buffer, operands
-        add_rex(buffer, operands,
+      Form.new([
+        OPERAND_TYPES[51],
+        OPERAND_TYPES[34],
+      ].freeze, [
+        Class.new(Fisk::Encoding) {
+          def encode buffer, operands
+            add_rex(buffer, operands,
               true,
               1,
               0,
               0,
-              0)
-        add_opcode buffer, 0xA3, 0
-        add_data_offset buffer, operands[0].value, 8
-      end
-
-      def bytesize; 2; end
-    }.new
-    forms << Form.new(operands, encodings)
-    MOV = Instruction.new("MOV", forms)
+              0) +
+            add_opcode(buffer, 0xA3, 0) +
+            add_data_offset(buffer, operands[0].op_value, 8) +
+            0
+          end
+        }.new.freeze,
+      ].freeze).freeze,
+    ].freeze).freeze
   end
 end